зеркало из https://github.com/mozilla/gecko-dev.git
Used new NS_DECL_ISUPPORTS_INHERITED and NS_IMPL_ISUPPORTS_INHERITED macros.
This commit is contained in:
warren%netscape.com
Родитель
38a1b276d2
Коммит
54a4687221
|
|
@ -24,46 +24,11 @@
|
|||
#include "nsSupportsArrayEnumerator.h"
|
||||
#include "nsIEnumerator.h"
|
||||
|
||||
#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_INHERIT_QUERYINTERFACE1(nsSupportsArrayEnumerator, nsIRDFCursor)
|
||||
NS_INHERIT_ADDREF(nsSupportsArrayEnumerator)
|
||||
NS_INHERIT_RELEASE(nsSupportsArrayEnumerator)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void);
|
||||
|
|
@ -85,9 +50,7 @@ class NS_RDF nsRDFArrayAssertionCursor : public nsRDFArrayCursor,
|
|||
public nsIRDFAssertionCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayCursor, nsIRDFAssertionCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFArrayCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFArrayCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
@ -165,8 +128,6 @@ protected:
|
|||
class NS_RDF nsRDFArrayArcsCursor : public nsRDFArrayCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_ISUPPORTS(nsRDFArrayCursor)
|
||||
|
||||
// nsRDFArrayArcsCursor methods:
|
||||
nsRDFArrayArcsCursor(nsIRDFDataSource* aDataSource,
|
||||
nsIRDFNode* node,
|
||||
|
|
@ -197,9 +158,7 @@ class NS_RDF nsRDFArrayArcsOutCursor : public nsRDFArrayArcsCursor,
|
|||
public nsIRDFArcsOutCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayArcsCursor, nsIRDFArcsOutCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFArrayArcsCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFArrayArcsCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
@ -236,9 +195,7 @@ class NS_RDF nsRDFArrayArcsInCursor : public nsRDFArrayArcsCursor,
|
|||
public nsIRDFArcsInCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFArrayArcsCursor, nsIRDFArcsInCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFArrayArcsCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFArrayArcsCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
@ -297,9 +254,7 @@ class NS_RDF nsRDFEnumeratorAssertionCursor : public nsRDFEnumeratorCursor,
|
|||
public nsIRDFAssertionCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorCursor, nsIRDFAssertionCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFEnumeratorCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFEnumeratorCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
@ -337,8 +292,6 @@ protected:
|
|||
class NS_RDF nsRDFEnumeratorArcsCursor : public nsRDFEnumeratorCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_ISUPPORTS(nsRDFEnumeratorCursor)
|
||||
|
||||
// nsRDFEnumeratorArcsOutCursor methods:
|
||||
nsRDFEnumeratorArcsCursor(nsIRDFDataSource* aDataSource,
|
||||
nsIRDFNode* node,
|
||||
|
|
@ -369,9 +322,7 @@ class NS_RDF nsRDFEnumeratorArcsOutCursor : public nsRDFEnumeratorArcsCursor,
|
|||
public nsIRDFArcsOutCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorArcsCursor, nsIRDFArcsOutCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFEnumeratorArcsCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFEnumeratorArcsCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
@ -408,9 +359,7 @@ class NS_RDF nsRDFEnumeratorArcsInCursor : public nsRDFEnumeratorArcsCursor,
|
|||
public nsIRDFArcsInCursor
|
||||
{
|
||||
public:
|
||||
NS_INHERIT_QUERYINTERFACE1(nsRDFEnumeratorArcsCursor, nsIRDFArcsInCursor)
|
||||
NS_INHERIT_ADDREF(nsRDFEnumeratorArcsCursor)
|
||||
NS_INHERIT_RELEASE(nsRDFEnumeratorArcsCursor)
|
||||
NS_DECL_ISUPPORTS_INHERITED
|
||||
|
||||
// nsIRDFCursor methods:
|
||||
NS_IMETHOD Advance(void) {
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@ nsRDFArrayCursor::~nsRDFArrayCursor(void)
|
|||
NS_IF_RELEASE(mDataSource);
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFArrayCursor,
|
||||
nsSupportsArrayEnumerator,
|
||||
nsIRDFCursor);
|
||||
|
||||
NS_IMETHODIMP nsRDFArrayCursor::Advance(void)
|
||||
{
|
||||
nsresult rv = Next();
|
||||
|
|
@ -71,6 +75,10 @@ nsRDFArrayAssertionCursor::~nsRDFArrayAssertionCursor()
|
|||
NS_RELEASE(mPredicate);
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFArrayAssertionCursor,
|
||||
nsRDFArrayCursor,
|
||||
nsIRDFAssertionCursor);
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFArrayAssertionCursor::GetSubject(nsIRDFResource* *aSubject)
|
||||
{
|
||||
|
|
@ -233,6 +241,18 @@ nsRDFArrayArcsCursor::~nsRDFArrayArcsCursor()
|
|||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFArrayArcsOutCursor,
|
||||
nsRDFArrayArcsCursor,
|
||||
nsIRDFArcsOutCursor);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFArrayArcsInCursor,
|
||||
nsRDFArrayArcsCursor,
|
||||
nsIRDFArcsInCursor);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
nsRDFEnumeratorCursor::nsRDFEnumeratorCursor(nsIRDFDataSource* aDataSource,
|
||||
nsIEnumerator* valueEnumerator)
|
||||
: mDataSource(aDataSource), mEnum(valueEnumerator)
|
||||
|
|
@ -304,6 +324,10 @@ nsRDFEnumeratorAssertionCursor::~nsRDFEnumeratorAssertionCursor()
|
|||
NS_RELEASE(mPredicate);
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFEnumeratorAssertionCursor,
|
||||
nsRDFEnumeratorCursor,
|
||||
nsIRDFAssertionCursor);
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRDFEnumeratorAssertionCursor::GetSubject(nsIRDFResource* *aSubject)
|
||||
{
|
||||
|
|
@ -349,3 +373,16 @@ nsRDFEnumeratorArcsCursor::~nsRDFEnumeratorArcsCursor()
|
|||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFEnumeratorArcsOutCursor,
|
||||
nsRDFEnumeratorArcsCursor,
|
||||
nsIRDFArcsOutCursor);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
NS_IMPL_ISUPPORTS_INHERITED(nsRDFEnumeratorArcsInCursor,
|
||||
nsRDFEnumeratorArcsCursor,
|
||||
nsIRDFArcsInCursor);
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче