From a2d0be4d645ab044b3f78c1a567b4fb625422646 Mon Sep 17 00:00:00 2001 From: "scc%netscape.com" Date: Tue, 29 Jun 1999 21:01:31 +0000 Subject: [PATCH] |nsISupports::GetIID()| --> |nsCOMTypeInfo::GetIID()| git-svn-id: svn://10.0.0.236/trunk@37444 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/db/mork/build/nsMorkFactory.cpp | 4 ++-- mozilla/editor/base/nsAOLCiter.cpp | 2 +- mozilla/editor/base/nsEditFactory.cpp | 4 ++-- mozilla/editor/base/nsEditProperty.cpp | 2 +- mozilla/editor/base/nsEditor.cpp | 2 +- mozilla/editor/base/nsEditorEventListeners.cpp | 10 +++++----- mozilla/editor/base/nsInternetCiter.cpp | 2 +- mozilla/editor/base/nsTextEditFactory.cpp | 4 ++-- mozilla/editor/base/nsTextEditor.cpp | 2 +- mozilla/editor/libeditor/base/nsEditor.cpp | 2 +- mozilla/editor/libeditor/html/nsEditProperty.cpp | 2 +- mozilla/editor/libeditor/text/nsAOLCiter.cpp | 2 +- .../editor/libeditor/text/nsEditorEventListeners.cpp | 10 +++++----- mozilla/editor/libeditor/text/nsInternetCiter.cpp | 2 +- mozilla/intl/chardet/src/nsPSMDetectors.cpp | 2 +- mozilla/js/src/xpconnect/public/nsIXPCScriptable.h | 2 +- mozilla/js/src/xpconnect/src/nsXPConnect.cpp | 2 +- mozilla/js/src/xpconnect/src/xpcjsid.cpp | 8 ++++---- mozilla/js/src/xpconnect/src/xpcmodule.cpp | 2 +- mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp | 4 ++-- mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp | 4 ++-- mozilla/js/src/xpconnect/src/xpcwrappednative.cpp | 6 +++--- mozilla/js/src/xpconnect/tests/TestXPC.cpp | 2 +- .../src/xpconnect/tests/components/xpctest_child.cpp | 2 +- mozilla/layout/base/src/nsRangeList.cpp | 4 ++-- mozilla/mailnews/addrbook/build/nsAbFactory.cpp | 2 +- mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp | 2 +- mozilla/mailnews/base/build/nsMsgFactory.cpp | 2 +- mozilla/mailnews/base/search/src/nsMsgFilter.cpp | 2 +- mozilla/mailnews/base/search/src/nsMsgFilterList.cpp | 2 +- .../mailnews/base/search/src/nsMsgFilterService.cpp | 2 +- mozilla/mailnews/compose/build/nsMsgCompFactory.cpp | 2 +- mozilla/mailnews/db/mork/build/nsMorkFactory.cpp | 4 ++-- mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp | 2 +- mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp | 2 +- mozilla/mailnews/imap/build/nsImapFactory.cpp | 2 +- mozilla/mailnews/local/build/nsMsgLocalFactory.cpp | 4 ++-- .../mime/cthandlers/calendar/nsCalendarFactory.cpp | 2 +- .../mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp | 2 +- .../mailnews/mime/emitters/build/nsEmitterFactory.cpp | 2 +- .../mailnews/mime/emitters/html/nsEmitterFactory.cpp | 2 +- .../mailnews/mime/emitters/raw/nsEmitterFactory.cpp | 2 +- .../mailnews/mime/emitters/xml/nsEmitterFactory.cpp | 2 +- mozilla/mailnews/mime/src/nsMimeFactory.cpp | 2 +- mozilla/mailnews/news/build/nsMsgNewsFactory.cpp | 2 +- mozilla/mailnews/news/src/nsNNTPHost.cpp | 4 ++-- mozilla/modules/plugin/bad/badapter.cpp | 4 ++-- mozilla/modules/plugin/samples/backward/badapter.cpp | 4 ++-- mozilla/widget/src/xpwidgets/nsBaseWidget.cpp | 2 +- mozilla/widget/src/xpwidgets/nsKeyBindMgr.cpp | 2 +- mozilla/xpcom/base/nsAllocator.cpp | 6 +++--- mozilla/xpcom/components/nsGenericFactory.cpp | 2 +- mozilla/xpcom/ds/nsConjoiningEnumerator.cpp | 2 +- mozilla/xpcom/ds/nsObserver.cpp | 2 +- mozilla/xpcom/ds/nsProperties.cpp | 8 ++++---- mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp | 2 +- mozilla/xpcom/glue/nsGenericFactory.cpp | 2 +- mozilla/xpcom/io/nsByteBufferInputStream.cpp | 4 ++-- mozilla/xpcom/io/nsIFileStream.cpp | 2 +- mozilla/xpcom/io/nsIStringStream.cpp | 2 +- mozilla/xpcom/io/nsPipe.cpp | 4 ++-- mozilla/xpcom/proxy/src/nsProxyEventClass.cpp | 6 +++--- mozilla/xpcom/proxy/src/nsProxyEventObject.cpp | 6 +++--- mozilla/xpcom/threads/nsEventQueueService.cpp | 2 +- mozilla/xpfe/components/find/src/nsFindComponent.cpp | 2 +- .../xpfe/components/public/nsIAppShellComponentImpl.h | 4 ++-- 66 files changed, 102 insertions(+), 102 deletions(-) diff --git a/mozilla/db/mork/build/nsMorkFactory.cpp b/mozilla/db/mork/build/nsMorkFactory.cpp index eb2d6a74d90..16544aa50b7 100644 --- a/mozilla/db/mork/build/nsMorkFactory.cpp +++ b/mozilla/db/mork/build/nsMorkFactory.cpp @@ -87,7 +87,7 @@ nsresult nsMorkFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; @@ -207,7 +207,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result) *result = nsnull; if(iid.Equals(nsIMdbFactoryFactory::GetIID()) || - iid.Equals(nsISupports::GetIID())) { + iid.Equals(nsCOMTypeInfo::GetIID())) { *result = NS_STATIC_CAST(nsIMdbFactoryFactory*, this); AddRef(); return NS_OK; diff --git a/mozilla/editor/base/nsAOLCiter.cpp b/mozilla/editor/base/nsAOLCiter.cpp index cd0009a5a58..63c2c66d242 100644 --- a/mozilla/editor/base/nsAOLCiter.cpp +++ b/mozilla/editor/base/nsAOLCiter.cpp @@ -41,7 +41,7 @@ nsAOLCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)this; NS_ADDREF_THIS(); diff --git a/mozilla/editor/base/nsEditFactory.cpp b/mozilla/editor/base/nsEditFactory.cpp index d06f1fd3049..0be7aba00f7 100644 --- a/mozilla/editor/base/nsEditFactory.cpp +++ b/mozilla/editor/base/nsEditFactory.cpp @@ -60,7 +60,7 @@ nsEditFactory::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } if (aIID.Equals(nsIFactory::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; AddRef(); return NS_OK; @@ -82,7 +82,7 @@ nsEditFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult nsISupports *obj = nsnull; if (!aResult) return NS_ERROR_NULL_POINTER; - if (aOuter && !aIID.Equals(nsISupports::GetIID())) + if (aOuter && !aIID.Equals(nsCOMTypeInfo::GetIID())) return NS_NOINTERFACE; // XXX right error? diff --git a/mozilla/editor/base/nsEditProperty.cpp b/mozilla/editor/base/nsEditProperty.cpp index f8079ee5769..327ccad4ef7 100644 --- a/mozilla/editor/base/nsEditProperty.cpp +++ b/mozilla/editor/base/nsEditProperty.cpp @@ -293,7 +293,7 @@ nsEditProperty::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index ee674cf34c9..79c258fec67 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -392,7 +392,7 @@ nsEditor::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { nsIEditor *tmp = this; nsISupports *tmp2 = tmp; *aInstancePtr = (void*)tmp2; diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp index 35d6fc39eb6..c8fa6f85173 100644 --- a/mozilla/editor/base/nsEditorEventListeners.cpp +++ b/mozilla/editor/base/nsEditorEventListeners.cpp @@ -79,7 +79,7 @@ nsTextEditorKeyListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -887,7 +887,7 @@ nsTextEditorMouseListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1059,7 +1059,7 @@ nsTextEditorTextListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1131,7 +1131,7 @@ nsTextEditorDragListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1294,7 +1294,7 @@ nsTextEditorCompositionListener::QueryInterface(REFNSIID aIID, void** aInstanceP if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/editor/base/nsInternetCiter.cpp b/mozilla/editor/base/nsInternetCiter.cpp index 13e3beec31b..0e9549488d6 100644 --- a/mozilla/editor/base/nsInternetCiter.cpp +++ b/mozilla/editor/base/nsInternetCiter.cpp @@ -41,7 +41,7 @@ nsInternetCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)this; NS_ADDREF_THIS(); diff --git a/mozilla/editor/base/nsTextEditFactory.cpp b/mozilla/editor/base/nsTextEditFactory.cpp index d41182620ee..25c363522ac 100644 --- a/mozilla/editor/base/nsTextEditFactory.cpp +++ b/mozilla/editor/base/nsTextEditFactory.cpp @@ -56,7 +56,7 @@ nsTextEditFactory::QueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } if (aIID.Equals(nsIFactory::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; AddRef(); return NS_OK; @@ -78,7 +78,7 @@ nsTextEditFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aRe nsISupports *obj = nsnull; if (!aResult) return NS_ERROR_NULL_POINTER; - if (aOuter && !aIID.Equals(nsISupports::GetIID())) + if (aOuter && !aIID.Equals(nsCOMTypeInfo::GetIID())) return NS_NOINTERFACE; // XXX right error? diff --git a/mozilla/editor/base/nsTextEditor.cpp b/mozilla/editor/base/nsTextEditor.cpp index 807ba92f12c..8664a056880 100644 --- a/mozilla/editor/base/nsTextEditor.cpp +++ b/mozilla/editor/base/nsTextEditor.cpp @@ -115,7 +115,7 @@ TypeInState::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index ee674cf34c9..79c258fec67 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -392,7 +392,7 @@ nsEditor::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { nsIEditor *tmp = this; nsISupports *tmp2 = tmp; *aInstancePtr = (void*)tmp2; diff --git a/mozilla/editor/libeditor/html/nsEditProperty.cpp b/mozilla/editor/libeditor/html/nsEditProperty.cpp index f8079ee5769..327ccad4ef7 100644 --- a/mozilla/editor/libeditor/html/nsEditProperty.cpp +++ b/mozilla/editor/libeditor/html/nsEditProperty.cpp @@ -293,7 +293,7 @@ nsEditProperty::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/editor/libeditor/text/nsAOLCiter.cpp b/mozilla/editor/libeditor/text/nsAOLCiter.cpp index cd0009a5a58..63c2c66d242 100644 --- a/mozilla/editor/libeditor/text/nsAOLCiter.cpp +++ b/mozilla/editor/libeditor/text/nsAOLCiter.cpp @@ -41,7 +41,7 @@ nsAOLCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)this; NS_ADDREF_THIS(); diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index 35d6fc39eb6..c8fa6f85173 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -79,7 +79,7 @@ nsTextEditorKeyListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -887,7 +887,7 @@ nsTextEditorMouseListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1059,7 +1059,7 @@ nsTextEditorTextListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1131,7 +1131,7 @@ nsTextEditorDragListener::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; @@ -1294,7 +1294,7 @@ nsTextEditorCompositionListener::QueryInterface(REFNSIID aIID, void** aInstanceP if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)(nsISupports*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/editor/libeditor/text/nsInternetCiter.cpp b/mozilla/editor/libeditor/text/nsInternetCiter.cpp index 13e3beec31b..0e9549488d6 100644 --- a/mozilla/editor/libeditor/text/nsInternetCiter.cpp +++ b/mozilla/editor/libeditor/text/nsInternetCiter.cpp @@ -41,7 +41,7 @@ nsInternetCiter::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (nsnull == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)this; NS_ADDREF_THIS(); diff --git a/mozilla/intl/chardet/src/nsPSMDetectors.cpp b/mozilla/intl/chardet/src/nsPSMDetectors.cpp index c0525fc1754..2f4de831193 100644 --- a/mozilla/intl/chardet/src/nsPSMDetectors.cpp +++ b/mozilla/intl/chardet/src/nsPSMDetectors.cpp @@ -52,7 +52,7 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \ NS_ADDREF_THIS(); \ return NS_OK; \ } \ - if (aIID.Equals(nsISupports::GetIID())) { \ + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { \ *aInstancePtr = (void*) ((nsISupports*)this); \ NS_ADDREF_THIS(); \ return NS_OK; \ diff --git a/mozilla/js/src/xpconnect/public/nsIXPCScriptable.h b/mozilla/js/src/xpconnect/public/nsIXPCScriptable.h index 721b71e00e2..734932e733c 100644 --- a/mozilla/js/src/xpconnect/public/nsIXPCScriptable.h +++ b/mozilla/js/src/xpconnect/public/nsIXPCScriptable.h @@ -463,7 +463,7 @@ nsresult _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \ if (NULL == aInstancePtr) { \ return NS_ERROR_NULL_POINTER; \ } \ - if (aIID.Equals(nsISupports::GetIID()) || \ + if (aIID.Equals(nsCOMTypeInfo::GetIID()) || \ aIID.Equals(_class::GetIID())) { \ *aInstancePtr = (void*) this; \ NS_ADDREF_THIS(); \ diff --git a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp index 34036174887..759beb55f38 100644 --- a/mozilla/js/src/xpconnect/src/nsXPConnect.cpp +++ b/mozilla/js/src/xpconnect/src/nsXPConnect.cpp @@ -144,7 +144,7 @@ nsXPConnect::IsISupportsDescendent(nsIInterfaceInfo* info) nsID* iid; if(NS_SUCCEEDED(oldest->GetIID(&iid))) { - retval = iid->Equals(nsISupports::GetIID()); + retval = iid->Equals(nsCOMTypeInfo::GetIID()); nsAllocator::Free(iid); } NS_RELEASE(oldest); diff --git a/mozilla/js/src/xpconnect/src/xpcjsid.cpp b/mozilla/js/src/xpconnect/src/xpcjsid.cpp index 0cc6fb40e47..83bfee02606 100644 --- a/mozilla/js/src/xpconnect/src/xpcjsid.cpp +++ b/mozilla/js/src/xpconnect/src/xpcjsid.cpp @@ -42,7 +42,7 @@ nsJSIID::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID()) || + if (aIID.Equals(nsCOMTypeInfo::GetIID()) || aIID.Equals(nsIJSID::GetIID()) || aIID.Equals(nsIJSIID::GetIID())) { *aInstancePtr = (void*) this; @@ -353,7 +353,7 @@ CIDCreateInstanceScriptable::Call(JSContext *cx, JSObject *obj, } } if(!piid) - piid = &nsISupports::GetIID(); + piid = &(nsCOMTypeInfo::GetIID()); nsISupports* inst; nsresult rv; @@ -573,7 +573,7 @@ CIDGetServiceScriptable::Call(JSContext *cx, JSObject *obj, } } if(!piid) - piid = &nsISupports::GetIID(); + piid = &(nsCOMTypeInfo::GetIID()); nsISupports* srvc; nsresult rv; @@ -664,7 +664,7 @@ nsJSCID::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (NULL == aInstancePtr) { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID()) || + if (aIID.Equals(nsCOMTypeInfo::GetIID()) || aIID.Equals(nsIJSID::GetIID()) || aIID.Equals(nsIJSCID::GetIID())) { *aInstancePtr = (void*) this; diff --git a/mozilla/js/src/xpconnect/src/xpcmodule.cpp b/mozilla/js/src/xpconnect/src/xpcmodule.cpp index 04bb29643aa..8c1b796b19c 100644 --- a/mozilla/js/src/xpconnect/src/xpcmodule.cpp +++ b/mozilla/js/src/xpconnect/src/xpcmodule.cpp @@ -62,7 +62,7 @@ nsXPCFactory::QueryInterface(const nsIID &aIID, void **aResult) if(aResult == NULL) return NS_ERROR_NULL_POINTER; - if(aIID.Equals(nsISupports::GetIID()) || + if(aIID.Equals(nsCOMTypeInfo::GetIID()) || aIID.Equals(nsIFactory::GetIID()) || aIID.Equals(nsXPCFactory::GetIID())) { diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp index 9ad5bc872ca..57dc3f47fcb 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappedjs.cpp @@ -140,7 +140,7 @@ nsXPCWrappedJS::GetNewOrUsedWrapper(XPCContext* xpcc, // just a root wrapper nsXPCWrappedJSClass* rootClazz; rootClazz = nsXPCWrappedJSClass::GetNewOrUsedClass( - xpcc, nsISupports::GetIID()); + xpcc, nsCOMTypeInfo::GetIID()); if(!rootClazz) goto return_wrapper; @@ -234,7 +234,7 @@ nsXPCWrappedJS::~nsXPCWrappedJS() nsXPCWrappedJS* nsXPCWrappedJS::Find(REFNSIID aIID) { - if(aIID.Equals(nsISupports::GetIID())) + if(aIID.Equals(nsCOMTypeInfo::GetIID())) return mRoot; nsXPCWrappedJS* cur = mRoot; diff --git a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp index 90c0b7aa868..a9976ccc66e 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappedjsclass.cpp @@ -223,7 +223,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self, REFNSIID aIID, void** aInstancePtr) { - if(aIID.Equals(nsISupports::GetIID())) + if(aIID.Equals(nsCOMTypeInfo::GetIID())) { // asking for nsISupports... no problem nsXPCWrappedJS* root = self->GetRootWrapper(); @@ -299,7 +299,7 @@ nsXPCWrappedJSClass::DelegatedQueryInterface(nsXPCWrappedJS* self, JSObject* nsXPCWrappedJSClass::GetRootJSObject(JSObject* aJSObj) { - JSObject* result = CallQueryInterfaceOnJSObject(aJSObj, nsISupports::GetIID()); + JSObject* result = CallQueryInterfaceOnJSObject(aJSObj, nsCOMTypeInfo::GetIID()); return result ? result : aJSObj; } diff --git a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp index 6e196c4f55d..1a6d7242c0c 100644 --- a/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp +++ b/mozilla/js/src/xpconnect/src/xpcwrappednative.cpp @@ -97,7 +97,7 @@ nsXPCWrappedNative::GetNewOrUsedWrapper(XPCContext* xpcc, } // always find the native root - if(NS_FAILED(aObj->QueryInterface(nsISupports::GetIID(), (void**)&rootObj))) + if(NS_FAILED(aObj->QueryInterface(nsCOMTypeInfo::GetIID(), (void**)&rootObj))) return NULL; // look for the root wrapper @@ -154,7 +154,7 @@ nsXPCWrappedNative::GetNewOrUsedWrapper(XPCContext* xpcc, // just a root wrapper nsXPCWrappedNativeClass* rootClazz; rootClazz = nsXPCWrappedNativeClass::GetNewOrUsedClass( - xpcc, nsISupports::GetIID()); + xpcc, nsCOMTypeInfo::GetIID()); if(!rootClazz) goto return_wrapper; @@ -307,7 +307,7 @@ nsXPCWrappedNative::~nsXPCWrappedNative() nsXPCWrappedNative* nsXPCWrappedNative::Find(REFNSIID aIID) { - if(aIID.Equals(nsISupports::GetIID())) + if(aIID.Equals(nsCOMTypeInfo::GetIID())) return mRoot; nsXPCWrappedNative* cur = mRoot; diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp index 1aa49f38fdc..5faadef5a65 100644 --- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp +++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp @@ -124,7 +124,7 @@ NS_IMETHODIMP nsTestXPCFoo::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsITestXPCFoo::GetIID()) || aIID.Equals(nsITestXPCFoo2::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp index a28cd32b9b5..5ad21ff478e 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_child.cpp @@ -148,7 +148,7 @@ xpctestChild::QueryInterface(REFNSIID iid, void** result) if (iid.Equals(nsIXPCTestChild::GetIID()) || iid.Equals(nsIXPCTestParent::GetIID()) || - iid.Equals(nsISupports::GetIID())) { + iid.Equals(nsCOMTypeInfo::GetIID())) { *result = NS_STATIC_CAST(nsIXPCTestChild*, this); NS_ADDREF(this); return NS_OK; diff --git a/mozilla/layout/base/src/nsRangeList.cpp b/mozilla/layout/base/src/nsRangeList.cpp index 84df12be822..2c8c06b4224 100644 --- a/mozilla/layout/base/src/nsRangeList.cpp +++ b/mozilla/layout/base/src/nsRangeList.cpp @@ -398,7 +398,7 @@ nsRangeListIterator::QueryInterface(REFNSIID aIID, void** aInstancePtr) // XXX shouldn't this just do mRangeList->QueryInterface instead of // having a complete copy of that method here? What about AddRef and // Release? shouldn't they be delegated too? - if (aIID.Equals(nsISupports::GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { nsIDOMSelection* tmp = mRangeList; *aInstancePtr = (void*)tmp; NS_ADDREF(mRangeList); @@ -527,7 +527,7 @@ nsRangeList::QueryInterface(REFNSIID aIID, void** aInstancePtr) *aInstancePtr = (void *)iterator; return iterator->AddRef(); } - if (aIID.Equals(((nsISupports *)((nsIFrameSelection *)this))->GetIID())) { + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { // use *first* base class for ISupports nsIFrameSelection* tmp1 = this; nsISupports* tmp2 = tmp1; diff --git a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp index b2d8782bb3e..e9cdf1764b2 100644 --- a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp +++ b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp @@ -98,7 +98,7 @@ nsresult nsAbFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp index f344367e453..8fe7cd9dae6 100644 --- a/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -141,7 +141,7 @@ NS_IMETHODIMP nsAddrDatabase::QueryInterface(REFNSIID aIID, void** aResult) if (aIID.Equals(nsIAddrDatabase::GetIID()) || aIID.Equals(nsIAddrDBAnnouncer::GetIID()) || - aIID.Equals(::nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aResult = NS_STATIC_CAST(nsIAddrDatabase*, this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp index c4c89550ff1..95e7cae4855 100644 --- a/mozilla/mailnews/base/build/nsMsgFactory.cpp +++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp @@ -160,7 +160,7 @@ nsMsgFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)NS_STATIC_CAST(nsISupports*,this); else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)NS_STATIC_CAST(nsIFactory*,this); diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp index b9c6b811299..cdf66b4d372 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp @@ -55,7 +55,7 @@ NS_IMETHODIMP nsMsgFilter::QueryInterface(REFNSIID aIID, void** aResult) return NS_ERROR_NULL_POINTER; if (aIID.Equals(nsIMsgFilter::GetIID()) || - aIID.Equals(::nsISupports::GetIID())) + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aResult = NS_STATIC_CAST(nsMsgFilter*, this); NS_ADDREF_THIS(); diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp index ccb46fcafec..b64e93fc88f 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp @@ -48,7 +48,7 @@ NS_IMETHODIMP nsMsgFilterList::QueryInterface(REFNSIID aIID, void** aResult) return NS_ERROR_NULL_POINTER; if (aIID.Equals(nsIMsgFilterList::GetIID()) || - aIID.Equals(::nsISupports::GetIID())) + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aResult = NS_STATIC_CAST(nsMsgFilterList*, this); NS_ADDREF_THIS(); diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp b/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp index b40fe2c13a6..3295a14ff52 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilterService.cpp @@ -53,7 +53,7 @@ NS_IMETHODIMP nsMsgFilterService::QueryInterface(REFNSIID aIID, void** aResult) return NS_ERROR_NULL_POINTER; if (aIID.Equals(nsIMsgFilterService::GetIID()) || - aIID.Equals(::nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aResult = NS_STATIC_CAST(nsIMsgFilterService*, this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp index 3fee96f0a04..f1bd7074e01 100644 --- a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp +++ b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp @@ -114,7 +114,7 @@ nsresult nsMsgComposeFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/db/mork/build/nsMorkFactory.cpp b/mozilla/mailnews/db/mork/build/nsMorkFactory.cpp index eb2d6a74d90..16544aa50b7 100644 --- a/mozilla/mailnews/db/mork/build/nsMorkFactory.cpp +++ b/mozilla/mailnews/db/mork/build/nsMorkFactory.cpp @@ -87,7 +87,7 @@ nsresult nsMorkFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; @@ -207,7 +207,7 @@ nsMorkFactoryFactory::QueryInterface(REFNSIID iid, void** result) *result = nsnull; if(iid.Equals(nsIMdbFactoryFactory::GetIID()) || - iid.Equals(nsISupports::GetIID())) { + iid.Equals(nsCOMTypeInfo::GetIID())) { *result = NS_STATIC_CAST(nsIMdbFactoryFactory*, this); AddRef(); return NS_OK; diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index fc32ca5ab13..a07a0cf0919 100644 --- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -81,7 +81,7 @@ nsresult nsMsgDBFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 1ebd6ee3acd..c70f4e1f061 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -384,7 +384,7 @@ NS_IMETHODIMP nsMsgDatabase::QueryInterface(REFNSIID aIID, void** aResult) if (aIID.Equals(nsIMsgDatabase::GetIID()) || aIID.Equals(nsIDBChangeAnnouncer::GetIID()) || - aIID.Equals(::nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aResult = NS_STATIC_CAST(nsIMsgDatabase*, this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp index d8f548bb1cf..1eeb6eed75e 100644 --- a/mozilla/mailnews/imap/build/nsImapFactory.cpp +++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp @@ -90,7 +90,7 @@ nsresult nsImapFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp index afd6a699a07..ef4e4c976f9 100644 --- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp @@ -93,7 +93,7 @@ nsresult nsMsgLocalFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = nsnull; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; @@ -194,7 +194,7 @@ nsresult nsMsgLocalFactory::CreateInstance(nsISupports * /* aOuter */, const nsI else if (mClassID.Equals(kParseMailMsgStateCID)) rv = NS_NewParseMailMessageState(aIID, aResult); else if (mClassID.Equals(kPop3IncomingServerCID)) - rv = NS_NewPop3IncomingServer(nsISupports::GetIID(), aResult); + rv = NS_NewPop3IncomingServer(nsCOMTypeInfo::GetIID(), aResult); else rv = NS_NOINTERFACE; diff --git a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp index 10948eaadbb..cee37b67e0a 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp @@ -93,7 +93,7 @@ nsCalendarFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp index 0b2c46aebe5..9d67eb2b407 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp @@ -93,7 +93,7 @@ nsVCardFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp index bcc5decaf3d..d3a19869e7f 100644 --- a/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp @@ -90,7 +90,7 @@ nsresult nsMimeEmitterFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp index 4ee70d3f021..05d3a6b2da5 100644 --- a/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/html/nsEmitterFactory.cpp @@ -94,7 +94,7 @@ nsHtmlEmitterFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp index e49a83a88ee..517e82c4ea1 100644 --- a/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/raw/nsEmitterFactory.cpp @@ -94,7 +94,7 @@ nsRawEmitterFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp index 575838c4969..c39ee9386be 100644 --- a/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/xml/nsEmitterFactory.cpp @@ -93,7 +93,7 @@ nsXmlEmitterFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/mime/src/nsMimeFactory.cpp b/mozilla/mailnews/mime/src/nsMimeFactory.cpp index a5f04b31461..f9b9dc5e1e1 100644 --- a/mozilla/mailnews/mime/src/nsMimeFactory.cpp +++ b/mozilla/mailnews/mime/src/nsMimeFactory.cpp @@ -104,7 +104,7 @@ nsresult nsMimeFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support three interfaces....nsISupports, nsFactory and nsINetPlugin..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp index d01fc095d37..4175dc9b697 100644 --- a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp +++ b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp @@ -104,7 +104,7 @@ nsresult nsMsgNewsFactory::QueryInterface(const nsIID &aIID, void **aResult) *aResult = NULL; // we support two interfaces....nsISupports and nsFactory..... - if (aIID.Equals(::nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aResult = (void *)(nsISupports*)this; else if (aIID.Equals(nsIFactory::GetIID())) *aResult = (void *)(nsIFactory*)this; diff --git a/mozilla/mailnews/news/src/nsNNTPHost.cpp b/mozilla/mailnews/news/src/nsNNTPHost.cpp index b7a9e1e6ae1..7154f0b12fc 100644 --- a/mozilla/mailnews/news/src/nsNNTPHost.cpp +++ b/mozilla/mailnews/news/src/nsNNTPHost.cpp @@ -2361,7 +2361,7 @@ nsNNTPHost::ReorderGroup(nsINNTPNewsgroup *groupToMove, nsINNTPNewsgroup *groupT (void)infoList->CurrentItem(&hostInfoSupports); nsIMsgFolder *groupInHostInfo=nsnull; - rv = hostInfoSupports->QueryInterface(::nsISupports::GetIID(), + rv = hostInfoSupports->QueryInterface(nsCOMTypeInfo::GetIID(), (void **)&groupInHostInfo); #endif #ifdef HAVE_PANE @@ -2387,7 +2387,7 @@ nsNNTPHost::ReorderGroup(nsINNTPNewsgroup *groupToMove, nsINNTPNewsgroup *groupT { m_groups->InsertElementAt(groupToMove, idxInData); // the index has to be the same, right? nsISupports* groupSupports; - groupToMove->QueryInterface(::nsISupports::GetIID(), + groupToMove->QueryInterface(nsCOMTypeInfo::GetIID(), (void **)&groupSupports); //XXX infoList->InsertElementAt(groupSupports, idxInHostInfo); NS_RELEASE(groupSupports); diff --git a/mozilla/modules/plugin/bad/badapter.cpp b/mozilla/modules/plugin/bad/badapter.cpp index ac9a176316f..7e02accb58b 100644 --- a/mozilla/modules/plugin/bad/badapter.cpp +++ b/mozilla/modules/plugin/bad/badapter.cpp @@ -1327,7 +1327,7 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr) AddRef(); return NS_OK; } - if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsISupports::GetIID())) { + if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsCOMTypeInfo::GetIID())) { *ptr = (void*) ((nsIPluginManager*)this); AddRef(); return NS_OK; @@ -1581,7 +1581,7 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr) AddRef(); return NS_OK; } - if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsISupports::GetIID())) { + if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsCOMTypeInfo::GetIID())) { *ptr = (void*) ((nsIPluginTagInfo*)this); AddRef(); return NS_OK; diff --git a/mozilla/modules/plugin/samples/backward/badapter.cpp b/mozilla/modules/plugin/samples/backward/badapter.cpp index ac9a176316f..7e02accb58b 100644 --- a/mozilla/modules/plugin/samples/backward/badapter.cpp +++ b/mozilla/modules/plugin/samples/backward/badapter.cpp @@ -1327,7 +1327,7 @@ CPluginManager::QueryInterface(const nsIID& iid, void** ptr) AddRef(); return NS_OK; } - if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsISupports::GetIID())) { + if (iid.Equals(nsIPluginManager::GetIID()) || iid.Equals(nsCOMTypeInfo::GetIID())) { *ptr = (void*) ((nsIPluginManager*)this); AddRef(); return NS_OK; @@ -1581,7 +1581,7 @@ CPluginInstancePeer::QueryInterface(const nsIID& iid, void** ptr) AddRef(); return NS_OK; } - if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsISupports::GetIID())) { + if (iid.Equals(nsIPluginTagInfo::GetIID()) || iid.Equals(nsCOMTypeInfo::GetIID())) { *ptr = (void*) ((nsIPluginTagInfo*)this); AddRef(); return NS_OK; diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp index 54f26c743ae..ef0b08eacf3 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp @@ -67,7 +67,7 @@ nsBaseWidget::Enumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || aIID.Equals(nsIEnumerator::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/widget/src/xpwidgets/nsKeyBindMgr.cpp b/mozilla/widget/src/xpwidgets/nsKeyBindMgr.cpp index 2472e4976a6..3e2ee3714d8 100644 --- a/mozilla/widget/src/xpwidgets/nsKeyBindMgr.cpp +++ b/mozilla/widget/src/xpwidgets/nsKeyBindMgr.cpp @@ -65,7 +65,7 @@ nsresult nsKeyBindMgr::QueryInterface(const nsIID& aIID, { return NS_ERROR_NULL_POINTER; } - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtrResult = (void*)(nsISupports*)this; NS_ADDREF_THIS(); diff --git a/mozilla/xpcom/base/nsAllocator.cpp b/mozilla/xpcom/base/nsAllocator.cpp index 4a8e0e665b3..776374f5907 100644 --- a/mozilla/xpcom/base/nsAllocator.cpp +++ b/mozilla/xpcom/base/nsAllocator.cpp @@ -42,7 +42,7 @@ nsAllocatorImpl::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr return NS_ERROR_NULL_POINTER; } if (aIID.Equals(nsIAllocator::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; AddRef(); return NS_OK; @@ -53,13 +53,13 @@ nsAllocatorImpl::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr NS_METHOD nsAllocatorImpl::Create(nsISupports* outer, const nsIID& aIID, void* *aInstancePtr) { - if (outer && !aIID.Equals(nsISupports::GetIID())) + if (outer && !aIID.Equals(nsCOMTypeInfo::GetIID())) return NS_NOINTERFACE; // XXX right error? nsAllocatorImpl* mm = new nsAllocatorImpl(outer); if (mm == NULL) return NS_ERROR_OUT_OF_MEMORY; mm->AddRef(); - if (aIID.Equals(nsISupports::GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) *aInstancePtr = mm->GetInner(); else *aInstancePtr = mm; diff --git a/mozilla/xpcom/components/nsGenericFactory.cpp b/mozilla/xpcom/components/nsGenericFactory.cpp index 187fcd17217..c0ef64d0099 100644 --- a/mozilla/xpcom/components/nsGenericFactory.cpp +++ b/mozilla/xpcom/components/nsGenericFactory.cpp @@ -37,7 +37,7 @@ NS_METHOD nsGenericFactory::QueryInterface(const nsIID& aIID, void** aInstancePt } if (aIID.Equals(nsIGenericFactory::GetIID()) || aIID.Equals(nsIFactory::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (nsIGenericFactory*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp b/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp index 66742926853..1f64c0084d7 100644 --- a/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp +++ b/mozilla/xpcom/ds/nsConjoiningEnumerator.cpp @@ -71,7 +71,7 @@ nsConjoiningEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || aIID.Equals(nsIEnumerator::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/ds/nsObserver.cpp b/mozilla/xpcom/ds/nsObserver.cpp index d760cea108d..e19a02c1b0a 100644 --- a/mozilla/xpcom/ds/nsObserver.cpp +++ b/mozilla/xpcom/ds/nsObserver.cpp @@ -74,7 +74,7 @@ nsObserver::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr) if (aInstancePtr == nsnull) return NS_ERROR_NULL_POINTER; if (aIID.Equals(nsIObserver::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (nsIObserver*)this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/ds/nsProperties.cpp b/mozilla/xpcom/ds/nsProperties.cpp index 7b6b5282cd0..8ac61f6a3e7 100644 --- a/mozilla/xpcom/ds/nsProperties.cpp +++ b/mozilla/xpcom/ds/nsProperties.cpp @@ -30,7 +30,7 @@ nsProperties::nsProperties(nsISupports* outer) NS_METHOD nsProperties::Create(nsISupports *outer, REFNSIID aIID, void **aResult) { - if (outer && !aIID.Equals(nsISupports::GetIID())) + if (outer && !aIID.Equals(nsCOMTypeInfo::GetIID())) return NS_NOINTERFACE; // XXX right error? nsProperties* props = new nsProperties(outer); if (props == NULL) @@ -63,7 +63,7 @@ nsProperties::AggregatedQueryInterface(const nsIID& aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; } if (aIID.Equals(nsIProperties::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; NS_ADDREF_THIS(); return NS_OK; @@ -203,7 +203,7 @@ nsPersistentProperties::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ASSERTION(aInstancePtr != nsnull, "null ptr"); if (aIID.Equals(nsIPersistentProperties::GetIID()) || aIID.Equals(nsIProperties::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = NS_STATIC_CAST(nsIPersistentProperties*, this); NS_ADDREF_THIS(); return NS_OK; @@ -510,7 +510,7 @@ nsPropertyElement::QueryInterface(REFNSIID aIID, void** aInstancePtr) { NS_ASSERTION(aInstancePtr != nsnull, "null ptr"); if (aIID.Equals(nsIPropertyElement::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = NS_STATIC_CAST(nsIPropertyElement*, this); NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp index 176f720ea6a..f3c777662ae 100644 --- a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp +++ b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp @@ -43,7 +43,7 @@ nsSupportsArrayEnumerator::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIBidirectionalEnumerator::GetIID()) || aIID.Equals(nsIEnumerator::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp index 187fcd17217..c0ef64d0099 100644 --- a/mozilla/xpcom/glue/nsGenericFactory.cpp +++ b/mozilla/xpcom/glue/nsGenericFactory.cpp @@ -37,7 +37,7 @@ NS_METHOD nsGenericFactory::QueryInterface(const nsIID& aIID, void** aInstancePt } if (aIID.Equals(nsIGenericFactory::GetIID()) || aIID.Equals(nsIFactory::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (nsIGenericFactory*) this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/io/nsByteBufferInputStream.cpp b/mozilla/xpcom/io/nsByteBufferInputStream.cpp index 6b3aef8d5a7..31f4fb1ad99 100644 --- a/mozilla/xpcom/io/nsByteBufferInputStream.cpp +++ b/mozilla/xpcom/io/nsByteBufferInputStream.cpp @@ -77,7 +77,7 @@ nsByteBufferInputStream::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIByteBufferInputStream::GetIID()) || aIID.Equals(nsIInputStream::GetIID()) || aIID.Equals(nsIBaseStream::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = this; NS_ADDREF_THIS(); return NS_OK; @@ -330,7 +330,7 @@ nsByteBufferOutputStream::QueryInterface(REFNSIID aIID, void** aInstancePtr) return NS_ERROR_NULL_POINTER; if (aIID.Equals(nsIOutputStream::GetIID()) || aIID.Equals(nsIBaseStream::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/io/nsIFileStream.cpp b/mozilla/xpcom/io/nsIFileStream.cpp index 839a0b42452..52c5fdf8869 100644 --- a/mozilla/xpcom/io/nsIFileStream.cpp +++ b/mozilla/xpcom/io/nsIFileStream.cpp @@ -212,7 +212,7 @@ NS_IMETHODIMP FileImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr) NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this); NS_ADDREF_THIS(); diff --git a/mozilla/xpcom/io/nsIStringStream.cpp b/mozilla/xpcom/io/nsIStringStream.cpp index d5019512505..3662817e618 100644 --- a/mozilla/xpcom/io/nsIStringStream.cpp +++ b/mozilla/xpcom/io/nsIStringStream.cpp @@ -341,7 +341,7 @@ NS_IMETHODIMP BasicStringImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr NS_ADDREF_THIS(); return NS_OK; } - if (aIID.Equals(((nsISupports*)(nsIOutputStream*)this)->GetIID())) + if (aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = (void*)((nsISupports*)(nsIOutputStream*)this); NS_ADDREF_THIS(); diff --git a/mozilla/xpcom/io/nsPipe.cpp b/mozilla/xpcom/io/nsPipe.cpp index c95873685dd..95d0eef7826 100644 --- a/mozilla/xpcom/io/nsPipe.cpp +++ b/mozilla/xpcom/io/nsPipe.cpp @@ -110,7 +110,7 @@ nsBufferInputStream::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIBufferInputStream::GetIID()) || aIID.Equals(nsIInputStream::GetIID()) || aIID.Equals(nsIBaseStream::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = this; NS_ADDREF_THIS(); return NS_OK; @@ -365,7 +365,7 @@ nsBufferOutputStream::QueryInterface(REFNSIID aIID, void** aInstancePtr) if (aIID.Equals(nsIBufferOutputStream::GetIID()) || aIID.Equals(nsIOutputStream::GetIID()) || aIID.Equals(nsIBaseStream::GetIID()) || - aIID.Equals(nsISupports::GetIID())) { + aIID.Equals(nsCOMTypeInfo::GetIID())) { *aInstancePtr = this; NS_ADDREF_THIS(); return NS_OK; diff --git a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp index c120d1ff9e7..0e979f6777e 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp @@ -93,7 +93,7 @@ nsProxyEventClass::GetNewOrUsedClass(REFNSIID aIID) nsID* iid; if(NS_SUCCEEDED(oldest->GetIID(&iid))) { - isISupportsDescendent = iid->Equals(nsISupports::GetIID()); + isISupportsDescendent = iid->Equals(nsCOMTypeInfo::GetIID()); nsAllocator::Free(iid); } NS_RELEASE(oldest); @@ -245,7 +245,7 @@ nsProxyEventClass::DelegatedQueryInterface(nsProxyEventObject* self, REFNSIID aIID, void** aInstancePtr) { - if(aIID.Equals(nsISupports::GetIID())) + if(aIID.Equals(nsCOMTypeInfo::GetIID())) { nsProxyEventObject* root = self->GetRootProxyObject(); *aInstancePtr = (void*) root; @@ -280,7 +280,7 @@ nsProxyEventClass::DelegatedQueryInterface(nsProxyEventObject* self, nsProxyEventObject* nsProxyEventClass::GetRootProxyObject(nsProxyEventObject* anObject) { - nsProxyEventObject* result = CallQueryInterfaceOnProxy(anObject, nsISupports::GetIID()); + nsProxyEventObject* result = CallQueryInterfaceOnProxy(anObject, nsCOMTypeInfo::GetIID()); return result ? result : anObject; } diff --git a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp index 1771573e90c..302b8837ce1 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp @@ -51,7 +51,7 @@ nsProxyEventObject::GetNewOrUsedProxy(nsIEventQueue *destQueue, nsISupports* rootObject; // always find the native root - if(NS_FAILED(aObj->QueryInterface(nsISupports::GetIID(), (void**)&rootObject))) + if(NS_FAILED(aObj->QueryInterface(nsCOMTypeInfo::GetIID(), (void**)&rootObject))) return NULL; @@ -96,7 +96,7 @@ nsProxyEventObject::GetNewOrUsedProxy(nsIEventQueue *destQueue, else { // just a root proxy - nsProxyEventClass* rootClazz = nsProxyEventClass::GetNewOrUsedClass(nsISupports::GetIID()); + nsProxyEventClass* rootClazz = nsProxyEventClass::GetNewOrUsedClass(nsCOMTypeInfo::GetIID()); if(!rootClazz) { goto return_wrapper; @@ -242,7 +242,7 @@ nsProxyEventObject::Release(void) nsProxyEventObject* nsProxyEventObject::Find(REFNSIID aIID) { - if(aIID.Equals(nsISupports::GetIID())) + if(aIID.Equals(nsCOMTypeInfo::GetIID())) return mRoot; nsProxyEventObject* cur = mRoot; diff --git a/mozilla/xpcom/threads/nsEventQueueService.cpp b/mozilla/xpcom/threads/nsEventQueueService.cpp index eafeb705012..ad08d843d6d 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.cpp +++ b/mozilla/xpcom/threads/nsEventQueueService.cpp @@ -74,7 +74,7 @@ void EventQueueStack::SetNext(EventQueueStack* aStack) //////////////////////////////////////////////////////////////////////////////// /* nsISupports interface implementation... */ -NS_IMPL_ISUPPORTS(EventQueueEntry,nsISupports::GetIID()); +NS_IMPL_ISUPPORTS(EventQueueEntry,nsCOMTypeInfo::GetIID()); EventQueueEntry::EventQueueEntry() { diff --git a/mozilla/xpfe/components/find/src/nsFindComponent.cpp b/mozilla/xpfe/components/find/src/nsFindComponent.cpp index 5f85fb103fc..30d741c512a 100644 --- a/mozilla/xpfe/components/find/src/nsFindComponent.cpp +++ b/mozilla/xpfe/components/find/src/nsFindComponent.cpp @@ -738,6 +738,6 @@ nsFindComponent::ResetContext( nsISupports *aContext, } // nsFindComponent::Context implementation... -NS_IMPL_ISUPPORTS( nsFindComponent::Context, nsISupports::GetIID() ) +NS_IMPL_ISUPPORTS( nsFindComponent::Context, nsCOMTypeInfo::GetIID() ) NS_IMPL_IAPPSHELLCOMPONENT( nsFindComponent, nsIFindComponent, NS_IFINDCOMPONENT_PROGID ) diff --git a/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h b/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h index 4375a65566c..558828cc22b 100644 --- a/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h +++ b/mozilla/xpfe/components/public/nsIAppShellComponentImpl.h @@ -181,7 +181,7 @@ className::QueryInterface( REFNSIID anIID, void **anInstancePtr ) { \ } else if ( anIID.Equals( nsIAppShellComponent::GetIID() ) ) { \ *anInstancePtr = (void*) ( (nsIAppShellComponent*)this ); \ NS_ADDREF_THIS(); \ - } else if ( anIID.Equals( nsISupports::GetIID() ) ) { \ + } else if ( anIID.Equals( nsCOMTypeInfo::GetIID() ) ) { \ *anInstancePtr = (void*) ( (nsISupports*)this ); \ NS_ADDREF_THIS(); \ } else { \ @@ -221,7 +221,7 @@ className##Factory::QueryInterface( const nsIID &anIID, void **aResult ) { \ } else if ( anIID.Equals( nsIFactory::GetIID() ) ) { \ *aResult = (void*) (nsIFactory*)this; \ NS_ADDREF_THIS(); \ - } else if ( anIID.Equals( nsISupports::GetIID() ) ) { \ + } else if ( anIID.Equals( nsCOMTypeInfo::GetIID() ) ) { \ *aResult = (void*) (nsISupports*)this; \ NS_ADDREF_THIS(); \ } else { \