From 13743894edca5ebd06774a28b5a3f6784a99f44a Mon Sep 17 00:00:00 2001 From: "alecf%netscape.com" Date: Fri, 17 Nov 2000 03:41:41 +0000 Subject: [PATCH] fix for #45797 - fix NS_IMPL_ISUPPORTS consumers r=dveditz a=self git-svn-id: svn://10.0.0.236/trunk@82722 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/base/nsConsoleMessage.cpp | 2 +- mozilla/xpcom/base/nsConsoleService.cpp | 2 +- mozilla/xpcom/components/nsNativeComponentLoader.cpp | 2 +- mozilla/xpcom/ds/bufferRoutines.h | 2 +- mozilla/xpcom/io/nsBinaryStream.cpp | 4 ++-- mozilla/xpcom/io/nsLocalFileWin.cpp | 2 +- mozilla/xpcom/proxy/src/nsProxyEventClass.cpp | 2 +- mozilla/xpcom/proxy/tests/proxytests.cpp | 2 +- mozilla/xpcom/tests/dynamic/TestDynamic.cpp | 2 +- mozilla/xpcom/tests/services/MyService.cpp | 4 ++-- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/xpcom/base/nsConsoleMessage.cpp b/mozilla/xpcom/base/nsConsoleMessage.cpp index 6a0a042882a..6bf5c97ea38 100644 --- a/mozilla/xpcom/base/nsConsoleMessage.cpp +++ b/mozilla/xpcom/base/nsConsoleMessage.cpp @@ -25,7 +25,7 @@ #include "nsConsoleMessage.h" -NS_IMPL_THREADSAFE_ISUPPORTS(nsConsoleMessage, NS_GET_IID(nsIConsoleMessage)); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage); nsConsoleMessage::nsConsoleMessage() { diff --git a/mozilla/xpcom/base/nsConsoleService.cpp b/mozilla/xpcom/base/nsConsoleService.cpp index 1a17f7e51ff..7cfc328e0e1 100644 --- a/mozilla/xpcom/base/nsConsoleService.cpp +++ b/mozilla/xpcom/base/nsConsoleService.cpp @@ -33,7 +33,7 @@ #include "nsConsoleService.h" #include "nsConsoleMessage.h" -NS_IMPL_THREADSAFE_ISUPPORTS(nsConsoleService, NS_GET_IID(nsIConsoleService)); +NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleService, nsIConsoleService); nsConsoleService::nsConsoleService() : mCurrent(0), mFull(PR_FALSE), mListening(PR_FALSE), mLock(nsnull) diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 561aee2ef61..b867eadae11 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -81,7 +81,7 @@ nsNativeComponentLoader::~nsNativeComponentLoader() delete mDllStore; } -NS_IMPL_ISUPPORTS(nsNativeComponentLoader, NS_GET_IID(nsIComponentLoader)); +NS_IMPL_ISUPPORTS1(nsNativeComponentLoader, nsIComponentLoader); NS_IMETHODIMP nsNativeComponentLoader::GetFactory(const nsIID & aCID, diff --git a/mozilla/xpcom/ds/bufferRoutines.h b/mozilla/xpcom/ds/bufferRoutines.h index e884adf5181..31cc767171f 100644 --- a/mozilla/xpcom/ds/bufferRoutines.h +++ b/mozilla/xpcom/ds/bufferRoutines.h @@ -719,7 +719,7 @@ public : static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); static nsICaseConversion * gCaseConv = 0; -NS_IMPL_ISUPPORTS(HandleCaseConversionShutdown3, NS_GET_IID(nsIShutdownListener)); +NS_IMPL_ISUPPORTS1(HandleCaseConversionShutdown3, nsIShutdownListener); nsresult HandleCaseConversionShutdown3::OnShutdown(const nsCID& cid, nsISupports* service) { if (cid.Equals(kUnicharUtilCID)) { diff --git a/mozilla/xpcom/io/nsBinaryStream.cpp b/mozilla/xpcom/io/nsBinaryStream.cpp index b9d78000a8a..38b4cb48665 100644 --- a/mozilla/xpcom/io/nsBinaryStream.cpp +++ b/mozilla/xpcom/io/nsBinaryStream.cpp @@ -54,7 +54,7 @@ nsBinaryOutputStream::nsBinaryOutputStream(nsIOutputStream* aStream): mOutputStr NS_INIT_REFCNT(); } -NS_IMPL_ISUPPORTS(nsBinaryOutputStream, NS_GET_IID(nsIBinaryOutputStream)) +NS_IMPL_ISUPPORTS1(nsBinaryOutputStream, nsIBinaryOutputStream) NS_IMETHODIMP nsBinaryOutputStream::Flush() { return mOutputStream->Flush(); } @@ -230,7 +230,7 @@ nsBinaryOutputStream::WriteString(nsString* aString) nsBinaryInputStream::nsBinaryInputStream(nsIInputStream* aStream): mInputStream(aStream) { NS_INIT_REFCNT(); } -NS_IMPL_ISUPPORTS(nsBinaryInputStream, NS_GET_IID(nsIBinaryInputStream)) +NS_IMPL_ISUPPORTS1(nsBinaryInputStream, nsIBinaryInputStream) NS_IMETHODIMP nsBinaryInputStream::Available(PRUint32* aResult) { return mInputStream->Available(aResult); } diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index caa3f792b35..71ae000b3cf 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -233,7 +233,7 @@ class nsDirEnumerator : public nsISimpleEnumerator nsCOMPtr mNext; }; -NS_IMPL_ISUPPORTS(nsDirEnumerator, NS_GET_IID(nsISimpleEnumerator)); +NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator); nsLocalFile::nsLocalFile() diff --git a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp index 2a3cb8e0be1..2336cd614d4 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp @@ -53,7 +53,7 @@ static NS_DEFINE_IID(kProxyObject_Identity_Class_IID, NS_PROXYEVENT_IDENTITY_CLA ////////////////////////////////////////////////////////////////////////////////////////////////// // nsProxyEventClass ////////////////////////////////////////////////////////////////////////////////////////////////// -NS_IMPL_THREADSAFE_ISUPPORTS(nsProxyEventClass, kProxyEventClassIID) +NS_IMPL_THREADSAFE_ISUPPORTS1(nsProxyEventClass, nsProxyEventClass) // static nsProxyEventClass* diff --git a/mozilla/xpcom/proxy/tests/proxytests.cpp b/mozilla/xpcom/proxy/tests/proxytests.cpp index 4c215601e00..c0df560aaef 100644 --- a/mozilla/xpcom/proxy/tests/proxytests.cpp +++ b/mozilla/xpcom/proxy/tests/proxytests.cpp @@ -72,7 +72,7 @@ nsTestXPCFoo::~nsTestXPCFoo() { } -NS_IMPL_ISUPPORTS(nsTestXPCFoo, NS_GET_IID(nsITestProxy)) +NS_IMPL_ISUPPORTS1(nsTestXPCFoo, nsITestProxy) NS_IMETHODIMP nsTestXPCFoo::Test(PRInt32 p1, PRInt32 p2, PRInt32* retval) { diff --git a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp index 8bce3e6fa56..4728f8adc2e 100644 --- a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp +++ b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp @@ -38,7 +38,7 @@ class TestDynamicClassImpl: public ITestClass { void Test(); }; -NS_IMPL_ISUPPORTS(TestDynamicClassImpl, NS_GET_IID(ITestClass)); +NS_IMPL_ISUPPORTS1(TestDynamicClassImpl, ITestClass); void TestDynamicClassImpl::Test() { cout << "hello, dynamic world!\n"; diff --git a/mozilla/xpcom/tests/services/MyService.cpp b/mozilla/xpcom/tests/services/MyService.cpp index 10307b7844b..2c72bdd21ad 100644 --- a/mozilla/xpcom/tests/services/MyService.cpp +++ b/mozilla/xpcom/tests/services/MyService.cpp @@ -75,7 +75,7 @@ MyServiceFactory* gFact = NULL; //////////////////////////////////////////////////////////////////////////////// // MyService Implementation -NS_IMPL_ISUPPORTS(MyService, NS_GET_IID(IMyService)); +NS_IMPL_ISUPPORTS1(MyService, IMyService); MyService::MyService(nsISupports* outer) { @@ -102,7 +102,7 @@ MyService::Doit(void) //////////////////////////////////////////////////////////////////////////////// // MyServiceFactory Implementation -NS_IMPL_ISUPPORTS(MyServiceFactory, NS_GET_IID(nsIFactory)); +NS_IMPL_ISUPPORTS1(MyServiceFactory, nsIFactory); MyServiceFactory::MyServiceFactory(void) : mStarted(PR_FALSE), mOutstandingInstances(0)