Bug 1118415 - Mark virtual overridden functions as MOZ_OVERRIDE in rdf; r=bsmedberg

This commit is contained in:
Ehsan Akhgari 2015-01-06 15:11:28 -05:00
parent 072e4a6b63
commit 08eb0b4c91
5 changed files with 73 additions and 73 deletions

View file

@ -108,20 +108,20 @@ public:
NS_DECL_NSIEXPATSINK NS_DECL_NSIEXPATSINK
// nsIContentSink // nsIContentSink
NS_IMETHOD WillParse(void); NS_IMETHOD WillParse(void) MOZ_OVERRIDE;
NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode); NS_IMETHOD WillBuildModel(nsDTDMode aDTDMode) MOZ_OVERRIDE;
NS_IMETHOD DidBuildModel(bool aTerminated); NS_IMETHOD DidBuildModel(bool aTerminated) MOZ_OVERRIDE;
NS_IMETHOD WillInterrupt(void); NS_IMETHOD WillInterrupt(void) MOZ_OVERRIDE;
NS_IMETHOD WillResume(void); NS_IMETHOD WillResume(void) MOZ_OVERRIDE;
NS_IMETHOD SetParser(nsParserBase* aParser); NS_IMETHOD SetParser(nsParserBase* aParser) MOZ_OVERRIDE;
virtual void FlushPendingNotifications(mozFlushType aType) { } virtual void FlushPendingNotifications(mozFlushType aType) MOZ_OVERRIDE { }
NS_IMETHOD SetDocumentCharset(nsACString& aCharset) { return NS_OK; } NS_IMETHOD SetDocumentCharset(nsACString& aCharset) MOZ_OVERRIDE { return NS_OK; }
virtual nsISupports *GetTarget() { return nullptr; } virtual nsISupports *GetTarget() MOZ_OVERRIDE { return nullptr; }
// nsIRDFContentSink // nsIRDFContentSink
NS_IMETHOD Init(nsIURI* aURL); NS_IMETHOD Init(nsIURI* aURL) MOZ_OVERRIDE;
NS_IMETHOD SetDataSource(nsIRDFDataSource* aDataSource); NS_IMETHOD SetDataSource(nsIRDFDataSource* aDataSource) MOZ_OVERRIDE;
NS_IMETHOD GetDataSource(nsIRDFDataSource*& aDataSource); NS_IMETHOD GetDataSource(nsIRDFDataSource*& aDataSource) MOZ_OVERRIDE;
// pseudo constants // pseudo constants
static int32_t gRefCnt; static int32_t gRefCnt;

View file

@ -530,7 +530,7 @@ public:
NS_DECL_NSIRDFNODE NS_DECL_NSIRDFNODE
// nsIRDFDate // nsIRDFDate
NS_IMETHOD GetValue(PRTime *value); NS_IMETHOD GetValue(PRTime *value) MOZ_OVERRIDE;
private: private:
virtual ~DateImpl(); virtual ~DateImpl();
@ -637,7 +637,7 @@ public:
NS_DECL_NSIRDFNODE NS_DECL_NSIRDFNODE
// nsIRDFInt // nsIRDFInt
NS_IMETHOD GetValue(int32_t *value); NS_IMETHOD GetValue(int32_t *value) MOZ_OVERRIDE;
private: private:
virtual ~IntImpl(); virtual ~IntImpl();

View file

@ -158,118 +158,118 @@ public:
nsIRDFDataSource) nsIRDFDataSource)
// nsIRDFDataSource // nsIRDFDataSource
NS_IMETHOD GetURI(char* *uri); NS_IMETHOD GetURI(char* *uri) MOZ_OVERRIDE;
NS_IMETHOD GetSource(nsIRDFResource* property, NS_IMETHOD GetSource(nsIRDFResource* property,
nsIRDFNode* target, nsIRDFNode* target,
bool tv, bool tv,
nsIRDFResource** source) { nsIRDFResource** source) MOZ_OVERRIDE {
return mInner->GetSource(property, target, tv, source); return mInner->GetSource(property, target, tv, source);
} }
NS_IMETHOD GetSources(nsIRDFResource* property, NS_IMETHOD GetSources(nsIRDFResource* property,
nsIRDFNode* target, nsIRDFNode* target,
bool tv, bool tv,
nsISimpleEnumerator** sources) { nsISimpleEnumerator** sources) MOZ_OVERRIDE {
return mInner->GetSources(property, target, tv, sources); return mInner->GetSources(property, target, tv, sources);
} }
NS_IMETHOD GetTarget(nsIRDFResource* source, NS_IMETHOD GetTarget(nsIRDFResource* source,
nsIRDFResource* property, nsIRDFResource* property,
bool tv, bool tv,
nsIRDFNode** target) { nsIRDFNode** target) MOZ_OVERRIDE {
return mInner->GetTarget(source, property, tv, target); return mInner->GetTarget(source, property, tv, target);
} }
NS_IMETHOD GetTargets(nsIRDFResource* source, NS_IMETHOD GetTargets(nsIRDFResource* source,
nsIRDFResource* property, nsIRDFResource* property,
bool tv, bool tv,
nsISimpleEnumerator** targets) { nsISimpleEnumerator** targets) MOZ_OVERRIDE {
return mInner->GetTargets(source, property, tv, targets); return mInner->GetTargets(source, property, tv, targets);
} }
NS_IMETHOD Assert(nsIRDFResource* aSource, NS_IMETHOD Assert(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget, nsIRDFNode* aTarget,
bool tv); bool tv) MOZ_OVERRIDE;
NS_IMETHOD Unassert(nsIRDFResource* source, NS_IMETHOD Unassert(nsIRDFResource* source,
nsIRDFResource* property, nsIRDFResource* property,
nsIRDFNode* target); nsIRDFNode* target) MOZ_OVERRIDE;
NS_IMETHOD Change(nsIRDFResource* aSource, NS_IMETHOD Change(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aOldTarget, nsIRDFNode* aOldTarget,
nsIRDFNode* aNewTarget); nsIRDFNode* aNewTarget) MOZ_OVERRIDE;
NS_IMETHOD Move(nsIRDFResource* aOldSource, NS_IMETHOD Move(nsIRDFResource* aOldSource,
nsIRDFResource* aNewSource, nsIRDFResource* aNewSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget); nsIRDFNode* aTarget) MOZ_OVERRIDE;
NS_IMETHOD HasAssertion(nsIRDFResource* source, NS_IMETHOD HasAssertion(nsIRDFResource* source,
nsIRDFResource* property, nsIRDFResource* property,
nsIRDFNode* target, nsIRDFNode* target,
bool tv, bool tv,
bool* hasAssertion) { bool* hasAssertion) MOZ_OVERRIDE {
return mInner->HasAssertion(source, property, target, tv, hasAssertion); return mInner->HasAssertion(source, property, target, tv, hasAssertion);
} }
NS_IMETHOD AddObserver(nsIRDFObserver* aObserver) { NS_IMETHOD AddObserver(nsIRDFObserver* aObserver) MOZ_OVERRIDE {
return mInner->AddObserver(aObserver); return mInner->AddObserver(aObserver);
} }
NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver) { NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver) MOZ_OVERRIDE {
return mInner->RemoveObserver(aObserver); return mInner->RemoveObserver(aObserver);
} }
NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, bool *_retval) { NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, bool *_retval) MOZ_OVERRIDE {
return mInner->HasArcIn(aNode, aArc, _retval); return mInner->HasArcIn(aNode, aArc, _retval);
} }
NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, bool *_retval) { NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, bool *_retval) MOZ_OVERRIDE {
return mInner->HasArcOut(aSource, aArc, _retval); return mInner->HasArcOut(aSource, aArc, _retval);
} }
NS_IMETHOD ArcLabelsIn(nsIRDFNode* node, NS_IMETHOD ArcLabelsIn(nsIRDFNode* node,
nsISimpleEnumerator** labels) { nsISimpleEnumerator** labels) MOZ_OVERRIDE {
return mInner->ArcLabelsIn(node, labels); return mInner->ArcLabelsIn(node, labels);
} }
NS_IMETHOD ArcLabelsOut(nsIRDFResource* source, NS_IMETHOD ArcLabelsOut(nsIRDFResource* source,
nsISimpleEnumerator** labels) { nsISimpleEnumerator** labels) MOZ_OVERRIDE {
return mInner->ArcLabelsOut(source, labels); return mInner->ArcLabelsOut(source, labels);
} }
NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) { NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) MOZ_OVERRIDE {
return mInner->GetAllResources(aResult); return mInner->GetAllResources(aResult);
} }
NS_IMETHOD GetAllCmds(nsIRDFResource* source, NS_IMETHOD GetAllCmds(nsIRDFResource* source,
nsISimpleEnumerator/*<nsIRDFResource>*/** commands) { nsISimpleEnumerator/*<nsIRDFResource>*/** commands) MOZ_OVERRIDE {
return mInner->GetAllCmds(source, commands); return mInner->GetAllCmds(source, commands);
} }
NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources, NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand, nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments, nsISupportsArray/*<nsIRDFResource>*/* aArguments,
bool* aResult) { bool* aResult) MOZ_OVERRIDE {
return mInner->IsCommandEnabled(aSources, aCommand, aArguments, aResult); return mInner->IsCommandEnabled(aSources, aCommand, aArguments, aResult);
} }
NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources, NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand, nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments) { nsISupportsArray/*<nsIRDFResource>*/* aArguments) MOZ_OVERRIDE {
// XXX Uh oh, this could cause problems wrt. the "dirty" flag // XXX Uh oh, this could cause problems wrt. the "dirty" flag
// if it changes the in-memory store's internal state. // if it changes the in-memory store's internal state.
return mInner->DoCommand(aSources, aCommand, aArguments); return mInner->DoCommand(aSources, aCommand, aArguments);
} }
NS_IMETHOD BeginUpdateBatch() { NS_IMETHOD BeginUpdateBatch() MOZ_OVERRIDE {
return mInner->BeginUpdateBatch(); return mInner->BeginUpdateBatch();
} }
NS_IMETHOD EndUpdateBatch() { NS_IMETHOD EndUpdateBatch() MOZ_OVERRIDE {
return mInner->EndUpdateBatch(); return mInner->EndUpdateBatch();
} }
@ -295,14 +295,14 @@ public:
NS_DECL_NSICHANNELEVENTSINK NS_DECL_NSICHANNELEVENTSINK
// rdfIDataSource // rdfIDataSource
NS_IMETHOD VisitAllSubjects(rdfITripleVisitor *aVisitor) { NS_IMETHOD VisitAllSubjects(rdfITripleVisitor *aVisitor) MOZ_OVERRIDE {
nsresult rv; nsresult rv;
nsCOMPtr<rdfIDataSource> rdfds = do_QueryInterface(mInner, &rv); nsCOMPtr<rdfIDataSource> rdfds = do_QueryInterface(mInner, &rv);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;
return rdfds->VisitAllSubjects(aVisitor); return rdfds->VisitAllSubjects(aVisitor);
} }
NS_IMETHOD VisitAllTriples(rdfITripleVisitor *aVisitor) { NS_IMETHOD VisitAllTriples(rdfITripleVisitor *aVisitor) MOZ_OVERRIDE {
nsresult rv; nsresult rv;
nsCOMPtr<rdfIDataSource> rdfds = do_QueryInterface(mInner, &rv); nsCOMPtr<rdfIDataSource> rdfds = do_QueryInterface(mInner, &rv);
if (NS_FAILED(rv)) return rv; if (NS_FAILED(rv)) return rv;

View file

@ -66,60 +66,60 @@ public:
// nsIRDFDataSource interface. Most of these are just delegated to // nsIRDFDataSource interface. Most of these are just delegated to
// the inner, in-memory datasource. // the inner, in-memory datasource.
NS_IMETHOD GetURI(char* *aURI); NS_IMETHOD GetURI(char* *aURI) MOZ_OVERRIDE;
NS_IMETHOD GetSource(nsIRDFResource* aProperty, NS_IMETHOD GetSource(nsIRDFResource* aProperty,
nsIRDFNode* aTarget, nsIRDFNode* aTarget,
bool aTruthValue, bool aTruthValue,
nsIRDFResource** aSource) { nsIRDFResource** aSource) MOZ_OVERRIDE {
return mInner->GetSource(aProperty, aTarget, aTruthValue, aSource); return mInner->GetSource(aProperty, aTarget, aTruthValue, aSource);
} }
NS_IMETHOD GetSources(nsIRDFResource* aProperty, NS_IMETHOD GetSources(nsIRDFResource* aProperty,
nsIRDFNode* aTarget, nsIRDFNode* aTarget,
bool aTruthValue, bool aTruthValue,
nsISimpleEnumerator** aSources) { nsISimpleEnumerator** aSources) MOZ_OVERRIDE {
return mInner->GetSources(aProperty, aTarget, aTruthValue, aSources); return mInner->GetSources(aProperty, aTarget, aTruthValue, aSources);
} }
NS_IMETHOD GetTarget(nsIRDFResource* aSource, NS_IMETHOD GetTarget(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
bool aTruthValue, bool aTruthValue,
nsIRDFNode** aTarget) { nsIRDFNode** aTarget) MOZ_OVERRIDE {
return mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget); return mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget);
} }
NS_IMETHOD GetTargets(nsIRDFResource* aSource, NS_IMETHOD GetTargets(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
bool aTruthValue, bool aTruthValue,
nsISimpleEnumerator** aTargets) { nsISimpleEnumerator** aTargets) MOZ_OVERRIDE {
return mInner->GetTargets(aSource, aProperty, aTruthValue, aTargets); return mInner->GetTargets(aSource, aProperty, aTruthValue, aTargets);
} }
NS_IMETHOD Assert(nsIRDFResource* aSource, NS_IMETHOD Assert(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget, nsIRDFNode* aTarget,
bool aTruthValue) { bool aTruthValue) MOZ_OVERRIDE {
return mInner->Assert(aSource, aProperty, aTarget, aTruthValue); return mInner->Assert(aSource, aProperty, aTarget, aTruthValue);
} }
NS_IMETHOD Unassert(nsIRDFResource* aSource, NS_IMETHOD Unassert(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget) { nsIRDFNode* aTarget) MOZ_OVERRIDE {
return mInner->Unassert(aSource, aProperty, aTarget); return mInner->Unassert(aSource, aProperty, aTarget);
} }
NS_IMETHOD Change(nsIRDFResource* aSource, NS_IMETHOD Change(nsIRDFResource* aSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aOldTarget, nsIRDFNode* aOldTarget,
nsIRDFNode* aNewTarget) { nsIRDFNode* aNewTarget) MOZ_OVERRIDE {
return mInner->Change(aSource, aProperty, aOldTarget, aNewTarget); return mInner->Change(aSource, aProperty, aOldTarget, aNewTarget);
} }
NS_IMETHOD Move(nsIRDFResource* aOldSource, NS_IMETHOD Move(nsIRDFResource* aOldSource,
nsIRDFResource* aNewSource, nsIRDFResource* aNewSource,
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget) { nsIRDFNode* aTarget) MOZ_OVERRIDE {
return mInner->Move(aOldSource, aNewSource, aProperty, aTarget); return mInner->Move(aOldSource, aNewSource, aProperty, aTarget);
} }
@ -127,65 +127,65 @@ public:
nsIRDFResource* aProperty, nsIRDFResource* aProperty,
nsIRDFNode* aTarget, nsIRDFNode* aTarget,
bool aTruthValue, bool aTruthValue,
bool* hasAssertion) { bool* hasAssertion) MOZ_OVERRIDE {
return mInner->HasAssertion(aSource, aProperty, aTarget, aTruthValue, hasAssertion); return mInner->HasAssertion(aSource, aProperty, aTarget, aTruthValue, hasAssertion);
} }
NS_IMETHOD AddObserver(nsIRDFObserver* aObserver) { NS_IMETHOD AddObserver(nsIRDFObserver* aObserver) MOZ_OVERRIDE {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver) { NS_IMETHOD RemoveObserver(nsIRDFObserver* aObserver) MOZ_OVERRIDE {
return NS_ERROR_NOT_IMPLEMENTED; return NS_ERROR_NOT_IMPLEMENTED;
} }
NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, bool *_retval) { NS_IMETHOD HasArcIn(nsIRDFNode *aNode, nsIRDFResource *aArc, bool *_retval) MOZ_OVERRIDE {
return mInner->HasArcIn(aNode, aArc, _retval); return mInner->HasArcIn(aNode, aArc, _retval);
} }
NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, bool *_retval) { NS_IMETHOD HasArcOut(nsIRDFResource *aSource, nsIRDFResource *aArc, bool *_retval) MOZ_OVERRIDE {
return mInner->HasArcOut(aSource, aArc, _retval); return mInner->HasArcOut(aSource, aArc, _retval);
} }
NS_IMETHOD ArcLabelsIn(nsIRDFNode* aNode, NS_IMETHOD ArcLabelsIn(nsIRDFNode* aNode,
nsISimpleEnumerator** aLabels) { nsISimpleEnumerator** aLabels) MOZ_OVERRIDE {
return mInner->ArcLabelsIn(aNode, aLabels); return mInner->ArcLabelsIn(aNode, aLabels);
} }
NS_IMETHOD ArcLabelsOut(nsIRDFResource* aSource, NS_IMETHOD ArcLabelsOut(nsIRDFResource* aSource,
nsISimpleEnumerator** aLabels) { nsISimpleEnumerator** aLabels) MOZ_OVERRIDE {
return mInner->ArcLabelsOut(aSource, aLabels); return mInner->ArcLabelsOut(aSource, aLabels);
} }
NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) { NS_IMETHOD GetAllResources(nsISimpleEnumerator** aResult) MOZ_OVERRIDE {
return mInner->GetAllResources(aResult); return mInner->GetAllResources(aResult);
} }
NS_IMETHOD GetAllCmds(nsIRDFResource* aSource, NS_IMETHOD GetAllCmds(nsIRDFResource* aSource,
nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands); nsISimpleEnumerator/*<nsIRDFResource>*/** aCommands) MOZ_OVERRIDE;
NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources, NS_IMETHOD IsCommandEnabled(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand, nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments, nsISupportsArray/*<nsIRDFResource>*/* aArguments,
bool* aResult); bool* aResult) MOZ_OVERRIDE;
NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources, NS_IMETHOD DoCommand(nsISupportsArray/*<nsIRDFResource>*/* aSources,
nsIRDFResource* aCommand, nsIRDFResource* aCommand,
nsISupportsArray/*<nsIRDFResource>*/* aArguments); nsISupportsArray/*<nsIRDFResource>*/* aArguments) MOZ_OVERRIDE;
NS_IMETHOD BeginUpdateBatch() { NS_IMETHOD BeginUpdateBatch() MOZ_OVERRIDE {
return mInner->BeginUpdateBatch(); return mInner->BeginUpdateBatch();
} }
NS_IMETHOD EndUpdateBatch() { NS_IMETHOD EndUpdateBatch() MOZ_OVERRIDE {
return mInner->EndUpdateBatch(); return mInner->EndUpdateBatch();
} }
NS_IMETHOD GetLoaded(bool* _result); NS_IMETHOD GetLoaded(bool* _result) MOZ_OVERRIDE;
NS_IMETHOD Init(const char *uri); NS_IMETHOD Init(const char *uri) MOZ_OVERRIDE;
NS_IMETHOD Flush(); NS_IMETHOD Flush() MOZ_OVERRIDE;
NS_IMETHOD FlushTo(const char *aURI); NS_IMETHOD FlushTo(const char *aURI) MOZ_OVERRIDE;
NS_IMETHOD Refresh(bool sync); NS_IMETHOD Refresh(bool sync) MOZ_OVERRIDE;
// nsIObserver // nsIObserver
NS_DECL_NSIOBSERVER NS_DECL_NSIOBSERVER

View file

@ -25,16 +25,16 @@ public:
NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_THREADSAFE_ISUPPORTS
// nsIRDFNode methods: // nsIRDFNode methods:
NS_IMETHOD EqualsNode(nsIRDFNode* aNode, bool* aResult); NS_IMETHOD EqualsNode(nsIRDFNode* aNode, bool* aResult) MOZ_OVERRIDE;
// nsIRDFResource methods: // nsIRDFResource methods:
NS_IMETHOD Init(const char* aURI); NS_IMETHOD Init(const char* aURI) MOZ_OVERRIDE;
NS_IMETHOD GetValue(char* *aURI); NS_IMETHOD GetValue(char* *aURI) MOZ_OVERRIDE;
NS_IMETHOD GetValueUTF8(nsACString& aResult); NS_IMETHOD GetValueUTF8(nsACString& aResult) MOZ_OVERRIDE;
NS_IMETHOD GetValueConst(const char** aURI); NS_IMETHOD GetValueConst(const char** aURI) MOZ_OVERRIDE;
NS_IMETHOD EqualsString(const char* aURI, bool* aResult); NS_IMETHOD EqualsString(const char* aURI, bool* aResult) MOZ_OVERRIDE;
NS_IMETHOD GetDelegate(const char* aKey, REFNSIID aIID, void** aResult); NS_IMETHOD GetDelegate(const char* aKey, REFNSIID aIID, void** aResult) MOZ_OVERRIDE;
NS_IMETHOD ReleaseDelegate(const char* aKey); NS_IMETHOD ReleaseDelegate(const char* aKey) MOZ_OVERRIDE;
// nsRDFResource methods: // nsRDFResource methods:
nsRDFResource(void); nsRDFResource(void);