mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

A bunch of fixes for cursor stuff.

This commit is contained in:
warren%netscape.com 1999-02-19 05:27:22 +00:00
Родитель 504e65a475
Коммит 9dd643d067
2 изменённых файлов: 111 добавлений и 86 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

89
rdf/util/public/nsRDFCursorUtils.h
Просмотреть файл

@ -24,11 +24,46 @@
#include "nsSupportsArrayEnumerator.h"
#include "nsIEnumerator.h"
class nsRDFArrayCursor : public nsSupportsArrayEnumerator,
#define NS_INHERIT_QUERYINTERFACE1(FromClass, NewInterface) \
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) { \
if (!aInstancePtr) return NS_ERROR_NULL_POINTER; \
if (aIID.Equals(NewInterface::IID())) { \
*aInstancePtr = NS_STATIC_CAST(NewInterface*, this); \
AddRef(); \
return NS_OK; \
} \
return FromClass::QueryInterface(aIID, aInstancePtr); \
} \
#define NS_INHERIT_QUERYINTERFACE(FromClass) \
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr) { \
return FromClass::QueryInterface(aIID, aInstancePtr); \
} \
#define NS_INHERIT_ADDREF(FromClass) \
NS_IMETHOD_(nsrefcnt) AddRef(void) { \
return FromClass::AddRef(); \
} \
#define NS_INHERIT_RELEASE(FromClass) \
NS_IMETHOD_(nsrefcnt) Release(void) { \
return FromClass::Release(); \
} \
#define NS_INHERIT_ISUPPORTS(FromClass) \
NS_INHERIT_QUERYINTERFACE(FromClass) \
NS_INHERIT_ADDREF(FromClass) \
NS_INHERIT_RELEASE(FromClass) \
////////////////////////////////////////////////////////////////////////////////
class NS_RDF nsRDFArrayCursor : public nsSupportsArrayEnumerator,
public nsIRDFCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsSupportsArrayEnumerator, nsIRDFCursor)
NS_INHERIT_ADDREF(nsSupportsArrayEnumerator)
NS_INHERIT_RELEASE(nsSupportsArrayEnumerator)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void);
@ -46,11 +81,13 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFArrayAssertionCursor : public nsRDFArrayCursor,
class NS_RDF nsRDFArrayAssertionCursor : public nsRDFArrayCursor,
public nsIRDFAssertionCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayCursor, nsIRDFAssertionCursor)
NS_INHERIT_ADDREF(nsRDFArrayCursor)
NS_INHERIT_RELEASE(nsRDFArrayCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {
@ -85,7 +122,7 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFSingletonAssertionCursor : public nsIRDFAssertionCursor
class NS_RDF nsRDFSingletonAssertionCursor : public nsIRDFAssertionCursor
{
public:
NS_DECL_ISUPPORTS
@ -125,12 +162,12 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFArrayArcsCursor : public nsRDFArrayCursor
class NS_RDF nsRDFArrayArcsCursor : public nsRDFArrayCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_ISUPPORTS(nsRDFArrayCursor)
// nsRDFArrayArcsOutCursor methods:
// nsRDFArrayArcsCursor methods:
nsRDFArrayArcsCursor(nsIRDFDataSource* aDataSource,
nsIRDFNode* node,
nsIRDFResource* predicate,
@ -156,11 +193,13 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFArrayArcsOutCursor : public nsRDFArrayArcsCursor,
class NS_RDF nsRDFArrayArcsOutCursor : public nsRDFArrayArcsCursor,
public nsIRDFArcsOutCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayArcsCursor, nsIRDFArcsOutCursor)
NS_INHERIT_ADDREF(nsRDFArrayArcsCursor)
NS_INHERIT_RELEASE(nsRDFArrayArcsCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {
@ -193,11 +232,13 @@ public:
////////////////////////////////////////////////////////////////////////////////
class nsRDFArrayArcsInCursor : public nsRDFArrayArcsCursor,
class NS_RDF nsRDFArrayArcsInCursor : public nsRDFArrayArcsCursor,
public nsIRDFArcsInCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayArcsCursor, nsIRDFArcsInCursor)
NS_INHERIT_ADDREF(nsRDFArrayArcsCursor)
NS_INHERIT_RELEASE(nsRDFArrayArcsCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {
@ -230,7 +271,7 @@ public:
////////////////////////////////////////////////////////////////////////////////
class nsRDFEnumeratorCursor : public nsIRDFCursor
class NS_RDF nsRDFEnumeratorCursor : public nsIRDFCursor
{
public:
NS_DECL_ISUPPORTS
@ -252,11 +293,13 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFEnumeratorAssertionCursor : public nsRDFEnumeratorCursor,
class NS_RDF nsRDFEnumeratorAssertionCursor : public nsRDFEnumeratorCursor,
public nsIRDFAssertionCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorCursor, nsIRDFAssertionCursor)
NS_INHERIT_ADDREF(nsRDFEnumeratorCursor)
NS_INHERIT_RELEASE(nsRDFEnumeratorCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {
@ -291,10 +334,10 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFEnumeratorArcsCursor : public nsRDFEnumeratorCursor
class NS_RDF nsRDFEnumeratorArcsCursor : public nsRDFEnumeratorCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_ISUPPORTS(nsRDFEnumeratorCursor)
// nsRDFEnumeratorArcsOutCursor methods:
nsRDFEnumeratorArcsCursor(nsIRDFDataSource* aDataSource,
@ -322,11 +365,13 @@ protected:
////////////////////////////////////////////////////////////////////////////////
class nsRDFEnumeratorArcsOutCursor : public nsRDFEnumeratorArcsCursor,
class NS_RDF nsRDFEnumeratorArcsOutCursor : public nsRDFEnumeratorArcsCursor,
public nsIRDFArcsOutCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorArcsCursor, nsIRDFArcsOutCursor)
NS_INHERIT_ADDREF(nsRDFEnumeratorArcsCursor)
NS_INHERIT_RELEASE(nsRDFEnumeratorArcsCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {
@ -359,11 +404,13 @@ public:
////////////////////////////////////////////////////////////////////////////////
class nsRDFEnumeratorArcsInCursor : public nsRDFEnumeratorArcsCursor,
class NS_RDF nsRDFEnumeratorArcsInCursor : public nsRDFEnumeratorArcsCursor,
public nsIRDFArcsInCursor
{
public:
NS_DECL_ISUPPORTS
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorArcsCursor, nsIRDFArcsInCursor)
NS_INHERIT_ADDREF(nsRDFEnumeratorArcsCursor)
NS_INHERIT_RELEASE(nsRDFEnumeratorArcsCursor)
// nsIRDFCursor methods:
NS_IMETHOD Advance(void) {

94
rdf/util/src/nsRDFCursorUtils.cpp
Просмотреть файл

@ -32,30 +32,6 @@ nsRDFArrayCursor::~nsRDFArrayCursor(void)
NS_IF_RELEASE(mDataSource);
}
NS_IMPL_ADDREF(nsRDFArrayCursor);
NS_IMPL_RELEASE(nsRDFArrayCursor);
NS_IMETHODIMP
nsRDFArrayCursor::QueryInterface(REFNSIID iid, void** result)
{
if (!result)
return NS_ERROR_NULL_POINTER;
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
if (iid.Equals(nsIRDFCursor::IID()) ||
iid.Equals(kISupportsIID)) {
*result = NS_STATIC_CAST(nsIRDFCursor*, this);
AddRef();
return NS_OK;
}
else if (iid.Equals(nsIEnumerator::IID())) {
*result = NS_STATIC_CAST(nsIEnumerator*, this);
AddRef();
return NS_OK;
}
return NS_NOINTERFACE;
}
NS_IMETHODIMP nsRDFArrayCursor::Advance(void)
{
nsresult rv = Next();
@ -95,23 +71,6 @@ nsRDFArrayAssertionCursor::~nsRDFArrayAssertionCursor()
NS_RELEASE(mPredicate);
}
NS_IMPL_ADDREF(nsRDFArrayAssertionCursor);
NS_IMPL_RELEASE(nsRDFArrayAssertionCursor);
NS_IMETHODIMP
nsRDFArrayAssertionCursor::QueryInterface(REFNSIID iid, void** result)
{
if (!result)
return NS_ERROR_NULL_POINTER;
if (iid.Equals(nsIRDFAssertionCursor::IID())) {
*result = NS_STATIC_CAST(nsIRDFAssertionCursor*, this);
AddRef();
return NS_OK;
}
return nsRDFArrayCursor::QueryInterface(iid, result);
}
NS_IMETHODIMP
nsRDFArrayAssertionCursor::GetSubject(nsIRDFResource* *aSubject)
{
@ -256,6 +215,24 @@ NS_IMETHODIMP nsRDFSingletonAssertionCursor::GetTruthValue(PRBool *aTruthValue)
////////////////////////////////////////////////////////////////////////////////
nsRDFArrayArcsCursor::nsRDFArrayArcsCursor(nsIRDFDataSource* aDataSource,
nsIRDFNode* node,
nsIRDFResource* predicate,
nsISupportsArray* arcs)
: nsRDFArrayCursor(aDataSource, arcs), mNode(node), mPredicate(predicate)
{
NS_ADDREF(mNode);
NS_ADDREF(mPredicate);
}
nsRDFArrayArcsCursor::~nsRDFArrayArcsCursor()
{
NS_RELEASE(mNode);
NS_RELEASE(mPredicate);
}
////////////////////////////////////////////////////////////////////////////////
nsRDFEnumeratorCursor::nsRDFEnumeratorCursor(nsIRDFDataSource* aDataSource,
nsIEnumerator* valueEnumerator)
: mDataSource(aDataSource), mEnum(valueEnumerator)
@ -327,23 +304,6 @@ nsRDFEnumeratorAssertionCursor::~nsRDFEnumeratorAssertionCursor()
NS_RELEASE(mPredicate);
}
NS_IMPL_ADDREF(nsRDFEnumeratorAssertionCursor);
NS_IMPL_RELEASE(nsRDFEnumeratorAssertionCursor);
NS_IMETHODIMP
nsRDFEnumeratorAssertionCursor::QueryInterface(REFNSIID iid, void** result)
{
if (!result)
return NS_ERROR_NULL_POINTER;
if (iid.Equals(nsIRDFAssertionCursor::IID())) {
*result = NS_STATIC_CAST(nsIRDFAssertionCursor*, this);
AddRef();
return NS_OK;
}
return nsRDFEnumeratorCursor::QueryInterface(iid, result);
}
NS_IMETHODIMP
nsRDFEnumeratorAssertionCursor::GetSubject(nsIRDFResource* *aSubject)
{
@ -371,3 +331,21 @@ NS_IMETHODIMP nsRDFEnumeratorAssertionCursor::GetTruthValue(PRBool *aTruthValue)
}
////////////////////////////////////////////////////////////////////////////////
nsRDFEnumeratorArcsCursor::nsRDFEnumeratorArcsCursor(nsIRDFDataSource* aDataSource,
nsIRDFNode* node,
nsIRDFResource* predicate,
nsIEnumerator* arcs)
: nsRDFEnumeratorCursor(aDataSource, arcs), mNode(node), mPredicate(predicate)
{
NS_ADDREF(mNode);
NS_ADDREF(mPredicate);
}
nsRDFEnumeratorArcsCursor::~nsRDFEnumeratorArcsCursor()
{
NS_RELEASE(mNode);
NS_RELEASE(mPredicate);
}
////////////////////////////////////////////////////////////////////////////////