diff --git a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp index 949face0e63..e4c25c460b9 100644 --- a/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp @@ -107,7 +107,6 @@ nsSSLStatus::GetCipherName(char** _result) nsSSLStatus::nsSSLStatus() : mKeyLength(0), mSecretKeyLength(0) { - NS_INIT_ISUPPORTS(); } NS_IMPL_THREADSAFE_ISUPPORTS1(nsSSLStatus, nsISSLStatus); diff --git a/mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp b/mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp index a1c46cf750b..f5ee06ed1be 100644 --- a/mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSCertValidity.cpp @@ -49,14 +49,12 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsX509CertValidity, nsIX509CertValidity) nsX509CertValidity::nsX509CertValidity() : mTimesInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } nsX509CertValidity::nsX509CertValidity(CERTCertificate *cert) : mTimesInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); if (cert) { SECStatus rv = CERT_GetCertTimes(cert, &mNotBefore, &mNotAfter); if (rv == SECSuccess) diff --git a/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp b/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp index d0d4474c9e5..6769c9b2b49 100644 --- a/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSCertificate.cpp @@ -117,8 +117,6 @@ nsNSSCertificate::nsNSSCertificate(CERTCertificate *cert) : mPermDelete(PR_FALSE), mCertType(nsIX509Cert::UNKNOWN_CERT) { - NS_INIT_ISUPPORTS(); - if (cert) mCert = CERT_DupCertificate(cert); else diff --git a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp index 149ddd45850..8444f6d196e 100644 --- a/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSCertificateDB.cpp @@ -81,7 +81,6 @@ NS_IMPL_ISUPPORTS1(nsNSSCertificateDB, nsIX509CertDB) nsNSSCertificateDB::nsNSSCertificateDB() { - NS_INIT_ISUPPORTS(); } nsNSSCertificateDB::~nsNSSCertificateDB() diff --git a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp index a118b211c62..e8352685585 100644 --- a/mozilla/security/manager/ssl/src/nsNSSComponent.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSComponent.cpp @@ -209,7 +209,6 @@ static void PR_CALLBACK DestroyCRLImportPLEvent(CRLDownloadEvent* aEvent) nsNSSComponent::nsNSSComponent() :mNSSInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); mutex = PR_NewLock(); #ifdef PR_LOGGING @@ -1646,7 +1645,6 @@ NS_IMPL_ISUPPORTS1(PipUIContext, nsIInterfaceRequestor) PipUIContext::PipUIContext() { - NS_INIT_ISUPPORTS(); } PipUIContext::~PipUIContext() @@ -1754,7 +1752,6 @@ PSMContentDownloader::PSMContentDownloader(PRUint32 type) mType(type), mDoSilentDownload(PR_FALSE) { - NS_INIT_ISUPPORTS(); } PSMContentDownloader::~PSMContentDownloader() @@ -2011,7 +2008,6 @@ NS_IMPL_ISUPPORTS2(PSMContentListener, PSMContentListener::PSMContentListener() { - NS_INIT_ISUPPORTS(); mLoadCookie = nsnull; mParentContentListener = nsnull; } diff --git a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp index 9396ef575cb..4a4a519c800 100644 --- a/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -147,7 +147,6 @@ nsNSSSocketInfo::nsNSSSocketInfo() mPort(0), mCAChain(nsnull) { - NS_INIT_ISUPPORTS(); } nsNSSSocketInfo::~nsNSSSocketInfo() diff --git a/mozilla/security/manager/ssl/src/nsOCSPResponder.cpp b/mozilla/security/manager/ssl/src/nsOCSPResponder.cpp index 08e20d26d4e..47e34a6ae4c 100644 --- a/mozilla/security/manager/ssl/src/nsOCSPResponder.cpp +++ b/mozilla/security/manager/ssl/src/nsOCSPResponder.cpp @@ -49,13 +49,11 @@ NS_IMPL_ISUPPORTS1(nsOCSPResponder, nsIOCSPResponder) nsOCSPResponder::nsOCSPResponder() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } nsOCSPResponder::nsOCSPResponder(const PRUnichar * aCA, const PRUnichar * aURL) { - NS_INIT_ISUPPORTS(); mCA.Assign(aCA); mURL.Assign(aURL); } diff --git a/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp b/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp index ca5a402f401..065e4c5b0bb 100644 --- a/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp +++ b/mozilla/security/manager/ssl/src/nsPK11TokenDB.cpp @@ -36,8 +36,6 @@ NS_IMPL_ISUPPORTS1(nsPK11Token, nsIPK11Token) nsPK11Token::nsPK11Token(PK11SlotInfo *slot) { - NS_INIT_ISUPPORTS(); - PK11_ReferenceSlot(slot); mSlot = slot; @@ -315,7 +313,6 @@ NS_IMPL_ISUPPORTS1(nsPK11TokenDB, nsIPK11TokenDB) nsPK11TokenDB::nsPK11TokenDB() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp b/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp index 448c880ad58..94005e0a123 100644 --- a/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp +++ b/mozilla/security/manager/ssl/src/nsPKCS11Slot.cpp @@ -52,7 +52,6 @@ NS_IMPL_ISUPPORTS1(nsPKCS11Slot, nsIPKCS11Slot) nsPKCS11Slot::nsPKCS11Slot(PK11SlotInfo *slot) { - NS_INIT_ISUPPORTS(); PK11_ReferenceSlot(slot); mSlot = slot; @@ -188,7 +187,6 @@ NS_IMPL_ISUPPORTS1(nsPKCS11Module, nsIPKCS11Module) nsPKCS11Module::nsPKCS11Module(SECMODModule *module) { - NS_INIT_ISUPPORTS(); SECMOD_ReferenceModule(module); mModule = module; } @@ -281,7 +279,6 @@ NS_IMPL_ISUPPORTS1(nsPKCS11ModuleDB, nsIPKCS11ModuleDB) nsPKCS11ModuleDB::nsPKCS11ModuleDB() { - NS_INIT_ISUPPORTS(); } nsPKCS11ModuleDB::~nsPKCS11ModuleDB() diff --git a/mozilla/security/manager/ssl/src/nsSDR.cpp b/mozilla/security/manager/ssl/src/nsSDR.cpp index edfd7bbf138..c488ac32d56 100644 --- a/mozilla/security/manager/ssl/src/nsSDR.cpp +++ b/mozilla/security/manager/ssl/src/nsSDR.cpp @@ -67,7 +67,6 @@ NS_IMPL_ISUPPORTS1(nsSDRContext, nsIInterfaceRequestor) nsSDRContext::nsSDRContext() { - NS_INIT_ISUPPORTS(); } nsSDRContext::~nsSDRContext() @@ -109,7 +108,6 @@ NS_IMPL_ISUPPORTS2(nsSecretDecoderRing, nsISecretDecoderRing, nsISecretDecoderRi nsSecretDecoderRing::nsSecretDecoderRing() { // initialize superclass - NS_INIT_ISUPPORTS(); } // nsSecretDecoderRing destructor diff --git a/mozilla/security/manager/ssl/src/nsSSLSocketProvider.cpp b/mozilla/security/manager/ssl/src/nsSSLSocketProvider.cpp index f9220591e82..13f498fbe44 100644 --- a/mozilla/security/manager/ssl/src/nsSSLSocketProvider.cpp +++ b/mozilla/security/manager/ssl/src/nsSSLSocketProvider.cpp @@ -26,7 +26,6 @@ nsSSLSocketProvider::nsSSLSocketProvider() { - NS_INIT_ISUPPORTS(); } nsSSLSocketProvider::~nsSSLSocketProvider() diff --git a/mozilla/security/manager/ssl/src/nsTLSSocketProvider.cpp b/mozilla/security/manager/ssl/src/nsTLSSocketProvider.cpp index 19d7f9642ea..27f79861f30 100644 --- a/mozilla/security/manager/ssl/src/nsTLSSocketProvider.cpp +++ b/mozilla/security/manager/ssl/src/nsTLSSocketProvider.cpp @@ -26,7 +26,6 @@ nsTLSSocketProvider::nsTLSSocketProvider() { - NS_INIT_ISUPPORTS(); } nsTLSSocketProvider::~nsTLSSocketProvider() diff --git a/mozilla/uriloader/base/nsDocLoader.cpp b/mozilla/uriloader/base/nsDocLoader.cpp index ec7427beb7e..71a814ca674 100644 --- a/mozilla/uriloader/base/nsDocLoader.cpp +++ b/mozilla/uriloader/base/nsDocLoader.cpp @@ -134,8 +134,6 @@ struct nsListenerInfo { nsDocLoaderImpl::nsDocLoaderImpl() : mListenerInfoList(8) { - NS_INIT_ISUPPORTS(); - #if defined(PR_LOGGING) if (nsnull == gDocLoaderLog) { gDocLoaderLog = PR_NewLogModule("DocLoader"); diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp index 696ffea12d7..e9cd25f70f9 100644 --- a/mozilla/uriloader/base/nsURILoader.cpp +++ b/mozilla/uriloader/base/nsURILoader.cpp @@ -123,7 +123,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsDocumentOpenInfo::nsDocumentOpenInfo() { - NS_INIT_ISUPPORTS(); } nsDocumentOpenInfo::~nsDocumentOpenInfo() @@ -522,7 +521,6 @@ nsresult nsDocumentOpenInfo::RetargetOutput(nsIRequest *request, const char * aS nsURILoader::nsURILoader() { - NS_INIT_ISUPPORTS(); } nsURILoader::~nsURILoader() diff --git a/mozilla/uriloader/exthandler/mac/nsDecodeAppleFile.cpp b/mozilla/uriloader/exthandler/mac/nsDecodeAppleFile.cpp index 4afb2931f23..885274e9f5f 100644 --- a/mozilla/uriloader/exthandler/mac/nsDecodeAppleFile.cpp +++ b/mozilla/uriloader/exthandler/mac/nsDecodeAppleFile.cpp @@ -51,8 +51,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsDecodeAppleFile::nsDecodeAppleFile() { - NS_INIT_ISUPPORTS(); - m_state = parseHeaders; m_dataBufferLength = 0; m_dataBuffer = (unsigned char*) PR_MALLOC(MAX_BUFFERSIZE); diff --git a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp index e0e23b28170..c7a83ab04a4 100644 --- a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp +++ b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp @@ -78,8 +78,6 @@ static NS_DEFINE_CID(kICServiceCID, NS_INTERNETCONFIGSERVICE_CID); nsInternetConfigService::nsInternetConfigService() { - NS_INIT_ISUPPORTS(); - long version; OSErr err; mRunningOSX = ((err = ::Gestalt(gestaltSystemVersion, &version)) == noErr && version >= 0x00001000); diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp index 5269daf1f4b..fb178c27bb9 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -171,7 +171,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsExternalHelperAppService::nsExternalHelperAppService() : mDataSourceInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); // we need a good guess for a size for our hash table...let's try O(n) where n = # of default // entries we'll be adding to the hash table. Of course, we'll be adding more entries as we // discover those content types at run time... @@ -743,7 +742,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsExternalAppHandler::nsExternalAppHandler() { - NS_INIT_ISUPPORTS(); mCanceled = PR_FALSE; mReceivedDispositionInfo = PR_FALSE; mHandlingAttachment = PR_FALSE; diff --git a/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp b/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp index d1374573908..64c708d91f8 100644 --- a/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp +++ b/mozilla/uriloader/exthandler/nsExternalProtocolHandler.cpp @@ -74,7 +74,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsExtProtocolChannel::nsExtProtocolChannel() : mStatus(NS_OK) { - NS_INIT_ISUPPORTS(); } nsExtProtocolChannel::~nsExtProtocolChannel() @@ -266,7 +265,6 @@ NS_IMETHODIMP nsExtProtocolChannel::Resume() nsExternalProtocolHandler::nsExternalProtocolHandler() { - NS_INIT_ISUPPORTS(); m_schemeName = "default"; } diff --git a/mozilla/uriloader/prefetch/nsPrefetchService.cpp b/mozilla/uriloader/prefetch/nsPrefetchService.cpp index 003ac6fff48..2e7ea59ecb1 100644 --- a/mozilla/uriloader/prefetch/nsPrefetchService.cpp +++ b/mozilla/uriloader/prefetch/nsPrefetchService.cpp @@ -97,8 +97,6 @@ PRTimeToSeconds(PRTime t_usec) nsPrefetchListener::nsPrefetchListener(nsPrefetchService *aService) { - NS_INIT_ISUPPORTS(); - NS_ADDREF(mService = aService); } @@ -207,7 +205,6 @@ nsPrefetchService::nsPrefetchService() , mStopCount(0) , mDisabled(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsPrefetchService::~nsPrefetchService() diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp index 9a111078713..70297b62283 100644 --- a/mozilla/view/src/nsViewManager.cpp +++ b/mozilla/view/src/nsViewManager.cpp @@ -304,8 +304,6 @@ PRUint32 nsViewManager::gLastUserEventTime = 0; nsViewManager::nsViewManager() { - NS_INIT_ISUPPORTS(); - if (gViewManagers == nsnull) { NS_ASSERTION(mVMCount == 0, "View Manager count is incorrect"); // Create an array to hold a list of view managers diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index 6c98b1c51d6..4c7abab79cb 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -1321,7 +1321,6 @@ GetTitleSuffix(void) // Note: operator new zeros our memory nsBrowserWindow::nsBrowserWindow() { - NS_INIT_ISUPPORTS(); if (!gTitleSuffix) { #if XXX gTitleSuffix = GetTitleSuffix(); diff --git a/mozilla/webshell/tests/viewer/nsThrobber.cpp b/mozilla/webshell/tests/viewer/nsThrobber.cpp index 0e3f4923352..34f805f5980 100644 --- a/mozilla/webshell/tests/viewer/nsThrobber.cpp +++ b/mozilla/webshell/tests/viewer/nsThrobber.cpp @@ -199,7 +199,6 @@ PRInt32 nsThrobber::gNumThrobbers; // Note: operator new zeros our memory nsThrobber::nsThrobber() { - NS_INIT_ISUPPORTS(); if (0 == gNumThrobbers++) { gThrobbers = new nsVoidArray; } diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index 30dab31b0fe..43e31463d20 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -144,8 +144,6 @@ app_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); nsViewerApp::nsViewerApp() { - NS_INIT_ISUPPORTS(); - char * text = PR_GetEnv("NGLAYOUT_HOME"); mStartURL.AssignWithConversion(text ? text : "resource:/res/samples/test0.html"); @@ -231,7 +229,6 @@ NS_IMPL_ISUPPORTS1(nsTestFormProcessor, nsIFormProcessor); nsTestFormProcessor::nsTestFormProcessor() { - NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp index e7194342f5a..ddd171c513a 100644 --- a/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp +++ b/mozilla/webshell/tests/viewer/nsWebBrowserChrome.cpp @@ -52,8 +52,6 @@ static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); nsWebBrowserChrome::nsWebBrowserChrome() : mBrowserWindow(nsnull), mTimerSet(PR_FALSE) { - NS_INIT_ISUPPORTS(); - mActiveDocuments = 0; mChromeFlags = 0; mSizeSet = PR_FALSE; diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp index 5bcbefd5aa2..e665583eae5 100644 --- a/mozilla/webshell/tests/viewer/nsWebCrawler.cpp +++ b/mozilla/webshell/tests/viewer/nsWebCrawler.cpp @@ -172,8 +172,6 @@ nsWebCrawler::nsWebCrawler(nsViewerApp* aViewer) : mHaveURLList(PR_FALSE), mQueuedLoadURLs(0) { - NS_INIT_ISUPPORTS(); - mBrowser = nsnull; mViewer = aViewer; mCrawl = PR_FALSE; diff --git a/mozilla/webshell/tests/viewer/nsWindowCreator.cpp b/mozilla/webshell/tests/viewer/nsWindowCreator.cpp index 046223a7898..8fa06643c3d 100644 --- a/mozilla/webshell/tests/viewer/nsWindowCreator.cpp +++ b/mozilla/webshell/tests/viewer/nsWindowCreator.cpp @@ -43,7 +43,6 @@ nsWindowCreator::nsWindowCreator(nsViewerApp *aApp) { - NS_INIT_ISUPPORTS(); mApp = aApp; } diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp index eb37dbfbc58..aa638c4c618 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -665,7 +665,6 @@ public: //---------------------------------------------------------------------- nsXPBaseWindowFactory::nsXPBaseWindowFactory() { - NS_INIT_ISUPPORTS(); } //---------------------------------------------------------------------- diff --git a/mozilla/webshell/tests/viewer/os2/nsButton.cpp b/mozilla/webshell/tests/viewer/os2/nsButton.cpp index d51dcece9d7..ac79c1e26e5 100644 --- a/mozilla/webshell/tests/viewer/os2/nsButton.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsButton.cpp @@ -82,7 +82,6 @@ NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/webshell/tests/viewer/os2/nsCheckButton.cpp b/mozilla/webshell/tests/viewer/os2/nsCheckButton.cpp index 070d05a2908..c9a7635cc05 100644 --- a/mozilla/webshell/tests/viewer/os2/nsCheckButton.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsCheckButton.cpp @@ -80,7 +80,6 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/webshell/tests/viewer/os2/nsLabel.cpp b/mozilla/webshell/tests/viewer/os2/nsLabel.cpp index df80aac52ef..fa3ae1472a2 100644 --- a/mozilla/webshell/tests/viewer/os2/nsLabel.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsLabel.cpp @@ -73,7 +73,6 @@ NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp b/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp index 701abc706d8..91a59d61f54 100644 --- a/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp +++ b/mozilla/webshell/tests/viewer/os2/nsTextWidget.cpp @@ -81,7 +81,6 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/mozilla/webshell/tests/viewer/windows/nsButton.cpp b/mozilla/webshell/tests/viewer/windows/nsButton.cpp index ed6a6c427f6..e01c04b11e9 100644 --- a/mozilla/webshell/tests/viewer/windows/nsButton.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsButton.cpp @@ -82,7 +82,6 @@ NS_IMPL_RELEASE(nsButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/webshell/tests/viewer/windows/nsCheckButton.cpp b/mozilla/webshell/tests/viewer/windows/nsCheckButton.cpp index e6a3145cf4e..82c41ad29fc 100644 --- a/mozilla/webshell/tests/viewer/windows/nsCheckButton.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsCheckButton.cpp @@ -78,7 +78,6 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/webshell/tests/viewer/windows/nsLabel.cpp b/mozilla/webshell/tests/viewer/windows/nsLabel.cpp index 96784e5d232..8239bba2273 100644 --- a/mozilla/webshell/tests/viewer/windows/nsLabel.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsLabel.cpp @@ -73,7 +73,6 @@ NS_IMPL_RELEASE(nsLabel) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp b/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp index 9577feaefcf..dc5ed55d7e0 100644 --- a/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp +++ b/mozilla/webshell/tests/viewer/windows/nsTextWidget.cpp @@ -81,7 +81,6 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/mozilla/widget/src/beos/nsAppShell.cpp b/mozilla/widget/src/beos/nsAppShell.cpp index 54ef702106f..d47e6338b71 100644 --- a/mozilla/widget/src/beos/nsAppShell.cpp +++ b/mozilla/widget/src/beos/nsAppShell.cpp @@ -102,7 +102,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAppShell, nsIAppShell) nsAppShell::nsAppShell() : is_port_error(false) { - NS_INIT_ISUPPORTS(); mDispatchListener = 0; gBAppCount++; diff --git a/mozilla/widget/src/beos/nsBidiKeyboard.cpp b/mozilla/widget/src/beos/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/beos/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/beos/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/beos/nsButton.cpp b/mozilla/widget/src/beos/nsButton.cpp index 820aadfc74e..0d3f7b78c60 100644 --- a/mozilla/widget/src/beos/nsButton.cpp +++ b/mozilla/widget/src/beos/nsButton.cpp @@ -59,7 +59,6 @@ static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsButton::nsButton() : nsWindow() , nsIButton() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/beos/nsCheckButton.cpp b/mozilla/widget/src/beos/nsCheckButton.cpp index 1c4ec79e502..9840649993f 100644 --- a/mozilla/widget/src/beos/nsCheckButton.cpp +++ b/mozilla/widget/src/beos/nsCheckButton.cpp @@ -55,7 +55,6 @@ nsCheckButton::nsCheckButton() : nsWindow() , nsICheckButton(), mState(PR_FALSE) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/widget/src/beos/nsClipboard.cpp b/mozilla/widget/src/beos/nsClipboard.cpp index fcad45e0bd7..6295d4d0159 100644 --- a/mozilla/widget/src/beos/nsClipboard.cpp +++ b/mozilla/widget/src/beos/nsClipboard.cpp @@ -70,7 +70,6 @@ nsClipboard::nsClipboard() : nsBaseClipboard() printf(" nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - //NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mClipboardOwner = nsnull; mTransferable = nsnull; diff --git a/mozilla/widget/src/beos/nsDragService.cpp b/mozilla/widget/src/beos/nsDragService.cpp index 61a282d4e40..f159b1a7680 100644 --- a/mozilla/widget/src/beos/nsDragService.cpp +++ b/mozilla/widget/src/beos/nsDragService.cpp @@ -63,7 +63,6 @@ NS_IMPL_RELEASE_INHERITED(nsDragService, nsBaseDragService) //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/beos/nsFilePicker.cpp b/mozilla/widget/src/beos/nsFilePicker.cpp index 2cba85afbd9..0ebe7991750 100644 --- a/mozilla/widget/src/beos/nsFilePicker.cpp +++ b/mozilla/widget/src/beos/nsFilePicker.cpp @@ -53,7 +53,6 @@ nsFilePicker::nsFilePicker() , mUnicodeEncoder(nsnull) , mUnicodeDecoder(nsnull) { - NS_INIT_ISUPPORTS(); mDisplayDirectory = do_CreateInstance("@mozilla.org/file/local;1"); } diff --git a/mozilla/widget/src/beos/nsLabel.cpp b/mozilla/widget/src/beos/nsLabel.cpp index 9c6366645e9..784e2d720aa 100644 --- a/mozilla/widget/src/beos/nsLabel.cpp +++ b/mozilla/widget/src/beos/nsLabel.cpp @@ -51,7 +51,6 @@ //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWindow(), nsILabel() { - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/widget/src/beos/nsScrollbar.cpp b/mozilla/widget/src/beos/nsScrollbar.cpp index 7f1950fd002..8e73f654920 100644 --- a/mozilla/widget/src/beos/nsScrollbar.cpp +++ b/mozilla/widget/src/beos/nsScrollbar.cpp @@ -59,7 +59,6 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsWindow) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_ISUPPORTS(); mOrientation = (aIsVertical) ? B_VERTICAL : B_HORIZONTAL; mLineIncrement = 0; mScrollbar = 0; diff --git a/mozilla/widget/src/beos/nsSound.cpp b/mozilla/widget/src/beos/nsSound.cpp index a8dd29177e0..73bcb46b9ef 100644 --- a/mozilla/widget/src/beos/nsSound.cpp +++ b/mozilla/widget/src/beos/nsSound.cpp @@ -55,7 +55,6 @@ NS_IMPL_ISUPPORTS1(nsSound, nsISound) nsSound::nsSound() : mSound(0) { - NS_INIT_ISUPPORTS(); } nsSound::~nsSound() diff --git a/mozilla/widget/src/beos/nsTextWidget.cpp b/mozilla/widget/src/beos/nsTextWidget.cpp index 6c12d13a2bd..742c91c9070 100644 --- a/mozilla/widget/src/beos/nsTextWidget.cpp +++ b/mozilla/widget/src/beos/nsTextWidget.cpp @@ -61,7 +61,6 @@ static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/mozilla/widget/src/beos/nsToolkit.cpp b/mozilla/widget/src/beos/nsToolkit.cpp index 0c1a572b84e..e3be12a4063 100644 --- a/mozilla/widget/src/beos/nsToolkit.cpp +++ b/mozilla/widget/src/beos/nsToolkit.cpp @@ -157,7 +157,6 @@ void nsToolkit::RunPump(void* arg) nsToolkit::nsToolkit() { localthread = false; - NS_INIT_ISUPPORTS(); mGuiThread = NULL; } diff --git a/mozilla/widget/src/beos/nsWindow.cpp b/mozilla/widget/src/beos/nsWindow.cpp index 2a10f574bed..2b75bf7c1b4 100644 --- a/mozilla/widget/src/beos/nsWindow.cpp +++ b/mozilla/widget/src/beos/nsWindow.cpp @@ -106,7 +106,6 @@ nsWindow::nsWindow() : nsBaseWidget() { rgb_color back = ui_color(B_PANEL_BACKGROUND_COLOR); - NS_INIT_ISUPPORTS(); mView = 0; mBackground = NS_RGB(back.red, back.green, back.blue); mForeground = NS_RGB(0x00,0x00,0x00); diff --git a/mozilla/widget/src/cocoa/nsBidiKeyboard.cpp b/mozilla/widget/src/cocoa/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/cocoa/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/cocoa/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/cocoa/nsDragHelperService.cpp b/mozilla/widget/src/cocoa/nsDragHelperService.cpp index c7aa8c2235c..fdbe48f7bb3 100644 --- a/mozilla/widget/src/cocoa/nsDragHelperService.cpp +++ b/mozilla/widget/src/cocoa/nsDragHelperService.cpp @@ -55,7 +55,6 @@ NS_IMPL_QUERY_INTERFACE1(nsDragHelperService, nsIDragHelperService); // nsDragHelperService::nsDragHelperService() { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/widget/src/cocoa/nsMenuBarX.cpp b/mozilla/widget/src/cocoa/nsMenuBarX.cpp index 05295b0148e..726eb7c3d37 100644 --- a/mozilla/widget/src/cocoa/nsMenuBarX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuBarX.cpp @@ -88,8 +88,6 @@ EventHandlerUPP nsMenuBarX::sCommandEventHandler = nsnull; nsMenuBarX::nsMenuBarX() : mNumMenus(0), mParent(nsnull), mIsMenuBarAdded(PR_FALSE), mDocument(nsnull), mCurrentCommandID(1) { - NS_INIT_ISUPPORTS(); - OSStatus status = ::CreateNewMenu(0, 0, &mRootMenu); NS_ASSERTION(status == noErr, "nsMenuBarX::nsMenuBarX: creation of root menu failed."); diff --git a/mozilla/widget/src/cocoa/nsMenuItemX.cpp b/mozilla/widget/src/cocoa/nsMenuItemX.cpp index c0375506e8a..ffcdd53b009 100644 --- a/mozilla/widget/src/cocoa/nsMenuItemX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuItemX.cpp @@ -67,7 +67,6 @@ NS_IMPL_ISUPPORTS4(nsMenuItemX, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItemX::nsMenuItemX() { - NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/mozilla/widget/src/cocoa/nsMenuX.cpp b/mozilla/widget/src/cocoa/nsMenuX.cpp index b94bc63fc63..c16a7900e28 100644 --- a/mozilla/widget/src/cocoa/nsMenuX.cpp +++ b/mozilla/widget/src/cocoa/nsMenuX.cpp @@ -99,7 +99,6 @@ public: nsDummyMenuItemX() { - NS_INIT_ISUPPORTS(); } }; @@ -120,8 +119,6 @@ nsMenuX::nsMenuX() mIsHelpMenu(PR_FALSE), mIsEnabled(PR_TRUE), mDestroyHandlerCalled(PR_FALSE), mNeedsRebuild(PR_TRUE), mConstructed(PR_FALSE), mVisible(PR_TRUE), mHandler(nsnull) { - NS_INIT_ISUPPORTS(); - #if DEBUG //++gMenuCounterX; #endif diff --git a/mozilla/widget/src/cocoa/nsRegionMac.cpp b/mozilla/widget/src/cocoa/nsRegionMac.cpp index f5af86a36d0..ef9abf7592d 100644 --- a/mozilla/widget/src/cocoa/nsRegionMac.cpp +++ b/mozilla/widget/src/cocoa/nsRegionMac.cpp @@ -46,7 +46,6 @@ nsRegionMac::nsRegionMac() { - NS_INIT_ISUPPORTS(); mRegion = nsnull; mRegionType = eRegionComplexity_empty; } diff --git a/mozilla/widget/src/cocoa/nsSound.cpp b/mozilla/widget/src/cocoa/nsSound.cpp index 6f1c3cf11cc..dd74cf28d15 100644 --- a/mozilla/widget/src/cocoa/nsSound.cpp +++ b/mozilla/widget/src/cocoa/nsSound.cpp @@ -201,7 +201,6 @@ CopyCToPascalString(const char* inString, StringPtr outPString) nsSound::nsSound() { - NS_INIT_ISUPPORTS(); #ifdef SOUND_DEBUG printf("%%%%%%%% Made nsSound\n"); #endif @@ -460,7 +459,6 @@ nsSound::GetSoundResourceName(const char* inSoundName, StringPtr outResourceName nsSoundRequest::nsSoundRequest() { - NS_INIT_ISUPPORTS(); } nsSoundRequest::~nsSoundRequest() diff --git a/mozilla/widget/src/gtk/nsAppShell.cpp b/mozilla/widget/src/gtk/nsAppShell.cpp index d6819c1c1ca..43cb5f3eb2c 100644 --- a/mozilla/widget/src/gtk/nsAppShell.cpp +++ b/mozilla/widget/src/gtk/nsAppShell.cpp @@ -139,7 +139,6 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); #ifdef DEBUG_APPSHELL printf("nsAppShell::nsAppShell()\n"); #endif diff --git a/mozilla/widget/src/gtk/nsBidiKeyboard.cpp b/mozilla/widget/src/gtk/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/gtk/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/gtk/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/gtk/nsCheckButton.cpp b/mozilla/widget/src/gtk/nsCheckButton.cpp index f086d1c5aa8..b657ba10ef5 100644 --- a/mozilla/widget/src/gtk/nsCheckButton.cpp +++ b/mozilla/widget/src/gtk/nsCheckButton.cpp @@ -49,7 +49,6 @@ NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget) //------------------------------------------------------------------------- nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton() { - NS_INIT_ISUPPORTS(); mLabel = nsnull; mCheckButton = nsnull; mState = PR_FALSE; diff --git a/mozilla/widget/src/gtk/nsClipboard.cpp b/mozilla/widget/src/gtk/nsClipboard.cpp index e23db5e742f..09fa7589b21 100644 --- a/mozilla/widget/src/gtk/nsClipboard.cpp +++ b/mozilla/widget/src/gtk/nsClipboard.cpp @@ -84,7 +84,6 @@ nsClipboard::nsClipboard() g_print("nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mGlobalTransferable = nsnull; mSelectionTransferable = nsnull; diff --git a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp index d033b91ba9a..a8402b86b41 100644 --- a/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp +++ b/mozilla/widget/src/gtk/nsGtkMozRemoteHelper.cpp @@ -187,7 +187,6 @@ nsGtkMozRemoteHelper::~nsGtkMozRemoteHelper() nsGtkXRemoteWidgetHelper::nsGtkXRemoteWidgetHelper() { - NS_INIT_ISUPPORTS(); } nsGtkXRemoteWidgetHelper::~nsGtkXRemoteWidgetHelper() diff --git a/mozilla/widget/src/gtk/nsLabel.cpp b/mozilla/widget/src/gtk/nsLabel.cpp index 68b03b4cd66..6eb15d0d2e1 100644 --- a/mozilla/widget/src/gtk/nsLabel.cpp +++ b/mozilla/widget/src/gtk/nsLabel.cpp @@ -51,7 +51,6 @@ NS_IMPL_QUERY_INTERFACE2(nsLabel, nsILabel, nsIWidget) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWidget(), nsILabel() { - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/widget/src/gtk/nsScrollbar.cpp b/mozilla/widget/src/gtk/nsScrollbar.cpp index 87cce074916..2ff23092267 100644 --- a/mozilla/widget/src/gtk/nsScrollbar.cpp +++ b/mozilla/widget/src/gtk/nsScrollbar.cpp @@ -53,8 +53,6 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar () { - NS_INIT_ISUPPORTS (); - mOrientation = (aIsVertical) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; mAdjustment = nsnull; diff --git a/mozilla/widget/src/gtk/nsSound.cpp b/mozilla/widget/src/gtk/nsSound.cpp index 85048dd3f8e..f4dd6c763f5 100644 --- a/mozilla/widget/src/gtk/nsSound.cpp +++ b/mozilla/widget/src/gtk/nsSound.cpp @@ -59,7 +59,6 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_ISUPPORTS(); mInited = PR_FALSE; } diff --git a/mozilla/widget/src/gtk/nsToolkit.cpp b/mozilla/widget/src/gtk/nsToolkit.cpp index 8518c1ed779..5084fba292c 100644 --- a/mozilla/widget/src/gtk/nsToolkit.cpp +++ b/mozilla/widget/src/gtk/nsToolkit.cpp @@ -51,7 +51,6 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); mSharedGC = nsnull; } diff --git a/mozilla/widget/src/gtk2/mai/nsMaiTopLevel.cpp b/mozilla/widget/src/gtk2/mai/nsMaiTopLevel.cpp index 4a9ae4ac553..f3e6864bad1 100644 --- a/mozilla/widget/src/gtk2/mai/nsMaiTopLevel.cpp +++ b/mozilla/widget/src/gtk2/mai/nsMaiTopLevel.cpp @@ -76,8 +76,6 @@ NS_IMPL_ISUPPORTS1(MaiTopLevel, nsIAccessibleEventListener) MaiTopLevel::MaiTopLevel(nsIAccessible *aAcc):MaiWidget(aAcc) { - NS_INIT_ISUPPORTS(); - #ifdef MAI_LOGGING ++sMaiTopCount; #endif diff --git a/mozilla/widget/src/gtk2/nsAppShell.cpp b/mozilla/widget/src/gtk2/nsAppShell.cpp index b44c9ff2346..bfa803f2421 100644 --- a/mozilla/widget/src/gtk2/nsAppShell.cpp +++ b/mozilla/widget/src/gtk2/nsAppShell.cpp @@ -84,8 +84,6 @@ IntHashKey(PRInt32 key) nsAppShell::nsAppShell(void) { - NS_INIT_ISUPPORTS(); - #ifdef PR_LOGGING if (!gWidgetLog) gWidgetLog = PR_NewLogModule("Widget"); diff --git a/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp b/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp index 24c5747cd01..a1b8f5f6168 100644 --- a/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp @@ -42,7 +42,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/gtk2/nsClipboard.cpp b/mozilla/widget/src/gtk2/nsClipboard.cpp index 23222991014..beb523caf25 100644 --- a/mozilla/widget/src/gtk2/nsClipboard.cpp +++ b/mozilla/widget/src/gtk2/nsClipboard.cpp @@ -72,7 +72,6 @@ GetHTMLCharset (guchar * data, PRInt32 dataLength, nsAString& str); nsClipboard::nsClipboard() { - NS_INIT_ISUPPORTS(); mWidget = nsnull; } diff --git a/mozilla/widget/src/gtk2/nsGtkMozRemoteHelper.cpp b/mozilla/widget/src/gtk2/nsGtkMozRemoteHelper.cpp index d4cf4b30cfe..430ce0f23f0 100644 --- a/mozilla/widget/src/gtk2/nsGtkMozRemoteHelper.cpp +++ b/mozilla/widget/src/gtk2/nsGtkMozRemoteHelper.cpp @@ -187,7 +187,6 @@ nsGtkMozRemoteHelper::~nsGtkMozRemoteHelper() nsGtkXRemoteWidgetHelper::nsGtkXRemoteWidgetHelper() { - NS_INIT_ISUPPORTS(); } nsGtkXRemoteWidgetHelper::~nsGtkXRemoteWidgetHelper() diff --git a/mozilla/widget/src/gtk2/nsSound.cpp b/mozilla/widget/src/gtk2/nsSound.cpp index 6df0bcc86bd..6ffc1e5acc6 100644 --- a/mozilla/widget/src/gtk2/nsSound.cpp +++ b/mozilla/widget/src/gtk2/nsSound.cpp @@ -64,7 +64,6 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_ISUPPORTS(); mInited = PR_FALSE; } diff --git a/mozilla/widget/src/gtk2/nsToolkit.cpp b/mozilla/widget/src/gtk2/nsToolkit.cpp index 30ab1feaa1b..3cf3cd65bb6 100644 --- a/mozilla/widget/src/gtk2/nsToolkit.cpp +++ b/mozilla/widget/src/gtk2/nsToolkit.cpp @@ -53,7 +53,6 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); mSharedGC = nsnull; } diff --git a/mozilla/widget/src/mac/nsBidiKeyboard.cpp b/mozilla/widget/src/mac/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/mac/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/mac/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/mac/nsButton.cpp b/mozilla/widget/src/mac/nsButton.cpp index 7a9f35bf3f8..f5adda353cd 100644 --- a/mozilla/widget/src/mac/nsButton.cpp +++ b/mozilla/widget/src/mac/nsButton.cpp @@ -49,7 +49,6 @@ NS_IMPL_RELEASE(nsButton); //------------------------------------------------------------------------- nsButton::nsButton() : nsMacControl(), nsIButton() { - NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsButton"); SetControlType(pushButProc); } diff --git a/mozilla/widget/src/mac/nsCheckButton.cpp b/mozilla/widget/src/mac/nsCheckButton.cpp index bbaa4a3d288..0585ff83a0b 100644 --- a/mozilla/widget/src/mac/nsCheckButton.cpp +++ b/mozilla/widget/src/mac/nsCheckButton.cpp @@ -49,7 +49,6 @@ NS_IMPL_RELEASE(nsCheckButton); //------------------------------------------------------------------------- nsCheckButton::nsCheckButton() : nsMacControl(), nsICheckButton() { - NS_INIT_ISUPPORTS(); gInstanceClassName = "nsCheckButton"; SetControlType(checkBoxProc); } diff --git a/mozilla/widget/src/mac/nsDragHelperService.cpp b/mozilla/widget/src/mac/nsDragHelperService.cpp index be981d6f2b7..8ae4979d496 100644 --- a/mozilla/widget/src/mac/nsDragHelperService.cpp +++ b/mozilla/widget/src/mac/nsDragHelperService.cpp @@ -55,7 +55,6 @@ NS_IMPL_QUERY_INTERFACE1(nsDragHelperService, nsIDragHelperService); // nsDragHelperService::nsDragHelperService() { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/widget/src/mac/nsFilePicker.cpp b/mozilla/widget/src/mac/nsFilePicker.cpp index 37cf9a767b4..4dd3789a31c 100644 --- a/mozilla/widget/src/mac/nsFilePicker.cpp +++ b/mozilla/widget/src/mac/nsFilePicker.cpp @@ -58,7 +58,6 @@ OSType nsFilePicker::sCurrentProcessSignature = 0; nsFilePicker::nsFilePicker() : mAllFilesDisplayed(PR_TRUE) { - NS_INIT_ISUPPORTS(); // Zero out the type lists for (int i = 0; i < kMaxTypeListCount; i++) diff --git a/mozilla/widget/src/mac/nsLabel.cpp b/mozilla/widget/src/mac/nsLabel.cpp index 270b08544c8..7b4b62397c3 100644 --- a/mozilla/widget/src/mac/nsLabel.cpp +++ b/mozilla/widget/src/mac/nsLabel.cpp @@ -46,7 +46,6 @@ NS_IMPL_RELEASE(nsLabel); //------------------------------------------------------------------------- nsLabel::nsLabel() : nsTextWidget(), nsILabel() { - NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsLabel"); } diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index 1272c8e34ae..17c40cc809a 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -115,7 +115,6 @@ public: nsDummyMenuItem() { - NS_INIT_ISUPPORTS(); } }; @@ -129,7 +128,6 @@ NS_IMPL_ISUPPORTS4(nsMenu, nsIMenu, nsIMenuListener, nsIChangeObserver, nsISuppo // nsMenu::nsMenu() { - NS_INIT_ISUPPORTS(); mNumMenuItems = 0; mParent = nsnull; mManager = nsnull; diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp index c1abe8d0ac3..97418906a76 100644 --- a/mozilla/widget/src/mac/nsMenuBar.cpp +++ b/mozilla/widget/src/mac/nsMenuBar.cpp @@ -113,7 +113,6 @@ nsMenuBar::nsMenuBar() nsPreviousMenuStackUnwind(nsnull, nsnull); - NS_INIT_ISUPPORTS(); mNumMenus = 0; mParent = nsnull; mIsMenuBarAdded = PR_FALSE; diff --git a/mozilla/widget/src/mac/nsMenuBarX.cpp b/mozilla/widget/src/mac/nsMenuBarX.cpp index cc472decccf..81e838e11d1 100644 --- a/mozilla/widget/src/mac/nsMenuBarX.cpp +++ b/mozilla/widget/src/mac/nsMenuBarX.cpp @@ -93,8 +93,6 @@ EventHandlerUPP nsMenuBarX::sCommandEventHandler = nsnull; nsMenuBarX::nsMenuBarX() : mNumMenus(0), mParent(nsnull), mIsMenuBarAdded(PR_FALSE), mDocument(nsnull), mCurrentCommandID(1) { - NS_INIT_ISUPPORTS(); - OSStatus status = ::CreateNewMenu(0, 0, &mRootMenu); NS_ASSERTION(status == noErr, "nsMenuBarX::nsMenuBarX: creation of root menu failed."); diff --git a/mozilla/widget/src/mac/nsMenuItem.cpp b/mozilla/widget/src/mac/nsMenuItem.cpp index 21b84c01ec6..5779bf6745e 100644 --- a/mozilla/widget/src/mac/nsMenuItem.cpp +++ b/mozilla/widget/src/mac/nsMenuItem.cpp @@ -69,7 +69,6 @@ NS_IMPL_ISUPPORTS4(nsMenuItem, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItem::nsMenuItem() { - NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/mozilla/widget/src/mac/nsMenuItemX.cpp b/mozilla/widget/src/mac/nsMenuItemX.cpp index f3317f3f0c9..bd89311ccd5 100644 --- a/mozilla/widget/src/mac/nsMenuItemX.cpp +++ b/mozilla/widget/src/mac/nsMenuItemX.cpp @@ -68,7 +68,6 @@ NS_IMPL_ISUPPORTS4(nsMenuItemX, nsIMenuItem, nsIMenuListener, nsIChangeObserver, // nsMenuItemX::nsMenuItemX() { - NS_INIT_ISUPPORTS(); mMenuParent = nsnull; mIsSeparator = PR_FALSE; mKeyEquivalent.Assign(NS_LITERAL_STRING(" ")); diff --git a/mozilla/widget/src/mac/nsMenuX.cpp b/mozilla/widget/src/mac/nsMenuX.cpp index 048dee64f7a..fc421cb62e5 100644 --- a/mozilla/widget/src/mac/nsMenuX.cpp +++ b/mozilla/widget/src/mac/nsMenuX.cpp @@ -101,7 +101,6 @@ public: nsDummyMenuItemX() { - NS_INIT_ISUPPORTS(); } }; @@ -122,8 +121,6 @@ nsMenuX::nsMenuX() mIsHelpMenu(PR_FALSE), mIsEnabled(PR_TRUE), mDestroyHandlerCalled(PR_FALSE), mNeedsRebuild(PR_TRUE), mConstructed(PR_FALSE), mVisible(PR_TRUE), mHandler(nsnull) { - NS_INIT_ISUPPORTS(); - #if DEBUG ++gMenuCounterX; #endif diff --git a/mozilla/widget/src/mac/nsSound.cpp b/mozilla/widget/src/mac/nsSound.cpp index 31a1ff65e8c..99f8967d2ed 100644 --- a/mozilla/widget/src/mac/nsSound.cpp +++ b/mozilla/widget/src/mac/nsSound.cpp @@ -201,7 +201,6 @@ CopyCToPascalString(const char* inString, StringPtr outPString) nsSound::nsSound() { - NS_INIT_ISUPPORTS(); #ifdef SOUND_DEBUG printf("%%%%%%%% Made nsSound\n"); #endif @@ -460,7 +459,6 @@ nsSound::GetSoundResourceName(const char* inSoundName, StringPtr outResourceName nsSoundRequest::nsSoundRequest() { - NS_INIT_ISUPPORTS(); } nsSoundRequest::~nsSoundRequest() diff --git a/mozilla/widget/src/mac/nsTextWidget.cpp b/mozilla/widget/src/mac/nsTextWidget.cpp index ac7ff81949d..52009dfe3e0 100644 --- a/mozilla/widget/src/mac/nsTextWidget.cpp +++ b/mozilla/widget/src/mac/nsTextWidget.cpp @@ -88,7 +88,6 @@ enum //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsMacControl(), nsITextWidget(), Repeater() { - NS_INIT_ISUPPORTS(); WIDGET_SET_CLASSNAME("nsTextWidget"); SetControlType(kControlEditTextProc); mIsPassword = PR_FALSE; diff --git a/mozilla/widget/src/mac/nsToolkit.cpp b/mozilla/widget/src/mac/nsToolkit.cpp index bbf41e2b859..323b0983c4b 100644 --- a/mozilla/widget/src/mac/nsToolkit.cpp +++ b/mozilla/widget/src/mac/nsToolkit.cpp @@ -200,7 +200,6 @@ static const char* gQuartzRenderingPref = "browser.quartz.enable"; //------------------------------------------------------------------------- nsToolkit::nsToolkit() : mInited(false) { - NS_INIT_ISUPPORTS(); if (gEventQueueHandler == nsnull) gEventQueueHandler = new nsMacNSPREventQueueHandler; } diff --git a/mozilla/widget/src/os2/nsAppShell.cpp b/mozilla/widget/src/os2/nsAppShell.cpp index 91f8f56cc78..4e3cb922e05 100644 --- a/mozilla/widget/src/os2/nsAppShell.cpp +++ b/mozilla/widget/src/os2/nsAppShell.cpp @@ -105,7 +105,6 @@ NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell) // nsAppShell constructor nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); mDispatchListener = 0; mHab = 0; mHmq = 0; mQuitNow = FALSE; diff --git a/mozilla/widget/src/os2/nsBidiKeyboard.cpp b/mozilla/widget/src/os2/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/os2/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/os2/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/os2/nsFilePicker.cpp b/mozilla/widget/src/os2/nsFilePicker.cpp index ad0f0ba01c7..3eeb68d90b6 100644 --- a/mozilla/widget/src/os2/nsFilePicker.cpp +++ b/mozilla/widget/src/os2/nsFilePicker.cpp @@ -67,7 +67,6 @@ MRESULT EXPENTRY FileDialogProc( HWND hwndDlg, ULONG msg, MPARAM mp1, MPARAM mp2 //------------------------------------------------------------------------- nsFilePicker::nsFilePicker() { - NS_INIT_ISUPPORTS(); mWnd = NULL; mUnicodeEncoder = nsnull; mUnicodeDecoder = nsnull; diff --git a/mozilla/widget/src/os2/nsScrollbar.cpp b/mozilla/widget/src/os2/nsScrollbar.cpp index dbbd1a8a3b8..c4784e91b81 100644 --- a/mozilla/widget/src/os2/nsScrollbar.cpp +++ b/mozilla/widget/src/os2/nsScrollbar.cpp @@ -37,7 +37,6 @@ NS_IMPL_RELEASE(nsScrollbar) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_ISUPPORTS(); mPositionFlag = aIsVertical ? SBS_VERT : SBS_HORZ; mScaleFactor = 1.0f; mLineIncrement = 0; diff --git a/mozilla/widget/src/os2/nsSound.cpp b/mozilla/widget/src/os2/nsSound.cpp index 0d1342bbe9a..e0ecba5f396 100644 --- a/mozilla/widget/src/os2/nsSound.cpp +++ b/mozilla/widget/src/os2/nsSound.cpp @@ -41,7 +41,6 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver) //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_ISUPPORTS(); } nsSound::~nsSound() diff --git a/mozilla/widget/src/os2/nsToolkit.cpp b/mozilla/widget/src/os2/nsToolkit.cpp index 3e54037b391..b1affc9adbb 100644 --- a/mozilla/widget/src/os2/nsToolkit.cpp +++ b/mozilla/widget/src/os2/nsToolkit.cpp @@ -87,7 +87,6 @@ void PR_CALLBACK RunPump(void* arg) //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); mGuiThread = NULL; mDispatchWnd = 0; mMonitor = PR_NewMonitor(); diff --git a/mozilla/widget/src/os2/nsWindow.cpp b/mozilla/widget/src/os2/nsWindow.cpp index c7ce8b5491d..38c3aee470b 100644 --- a/mozilla/widget/src/os2/nsWindow.cpp +++ b/mozilla/widget/src/os2/nsWindow.cpp @@ -134,7 +134,6 @@ static int currentWindowIdentifier = 0; //------------------------------------------------------------------------- nsWindow::nsWindow() : nsBaseWidget() { - NS_INIT_ISUPPORTS(); mWnd = 0; mFrameWnd = 0; mPrevWndProc = NULL; diff --git a/mozilla/widget/src/photon/nsAppShell.cpp b/mozilla/widget/src/photon/nsAppShell.cpp index b1b1b1f424f..470bbef5739 100644 --- a/mozilla/widget/src/photon/nsAppShell.cpp +++ b/mozilla/widget/src/photon/nsAppShell.cpp @@ -90,7 +90,6 @@ nsAppShell::nsAppShell() { mEventQueue = nsnull; mFD = -1; - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/photon/nsBidiKeyboard.cpp b/mozilla/widget/src/photon/nsBidiKeyboard.cpp index dbd51032d8c..3771c6bc4e9 100644 --- a/mozilla/widget/src/photon/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/photon/nsBidiKeyboard.cpp @@ -41,7 +41,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/photon/nsButton.cpp b/mozilla/widget/src/photon/nsButton.cpp index d81a26aba66..992956748b7 100644 --- a/mozilla/widget/src/photon/nsButton.cpp +++ b/mozilla/widget/src/photon/nsButton.cpp @@ -63,7 +63,6 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsButton, nsWidget, nsIButton) //------------------------------------------------------------------------- nsButton::nsButton() : nsWidget(), nsIButton() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/photon/nsCheckButton.cpp b/mozilla/widget/src/photon/nsCheckButton.cpp index 5d0e1db1e55..160f77302fa 100644 --- a/mozilla/widget/src/photon/nsCheckButton.cpp +++ b/mozilla/widget/src/photon/nsCheckButton.cpp @@ -66,7 +66,6 @@ NS_IMPL_RELEASE(nsCheckButton) nsCheckButton::nsCheckButton() : nsWidget(), nsICheckButton(), mState(PR_FALSE) { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/photon/nsClipboard.cpp b/mozilla/widget/src/photon/nsClipboard.cpp index 80da1cb4d72..7c64d1a1b3e 100644 --- a/mozilla/widget/src/photon/nsClipboard.cpp +++ b/mozilla/widget/src/photon/nsClipboard.cpp @@ -76,7 +76,6 @@ nsClipboard::nsClipboard() printf("nsClipboard::nsClipboard()\n"); #endif /* DEBUG_CLIPBOARD */ - NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mGlobalTransferable = nsnull; mSelectionTransferable = nsnull; diff --git a/mozilla/widget/src/photon/nsDragService.cpp b/mozilla/widget/src/photon/nsDragService.cpp index fccc3e1428d..ed27fe05d2a 100644 --- a/mozilla/widget/src/photon/nsDragService.cpp +++ b/mozilla/widget/src/photon/nsDragService.cpp @@ -61,7 +61,6 @@ NS_IMPL_QUERY_INTERFACE2(nsDragService, nsIDragService, nsIDragSession) //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_ISUPPORTS(); mDndWidget = nsnull; mDndEvent = nsnull; mNativeCtrl = nsnull; diff --git a/mozilla/widget/src/photon/nsLabel.cpp b/mozilla/widget/src/photon/nsLabel.cpp index e1ecce4da8e..8b4ec78044a 100644 --- a/mozilla/widget/src/photon/nsLabel.cpp +++ b/mozilla/widget/src/photon/nsLabel.cpp @@ -54,7 +54,6 @@ NS_IMPL_RELEASE_INHERITED(nsLabel, nsWidget) //------------------------------------------------------------------------- nsLabel::nsLabel() : nsWidget(), nsILabel() { - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/widget/src/photon/nsScrollbar.cpp b/mozilla/widget/src/photon/nsScrollbar.cpp index a41c3b2ddfb..26f1855c51d 100644 --- a/mozilla/widget/src/photon/nsScrollbar.cpp +++ b/mozilla/widget/src/photon/nsScrollbar.cpp @@ -55,8 +55,6 @@ NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsIWidget) //------------------------------------------------------------------------- nsScrollbar::nsScrollbar (PRBool aIsVertical):nsWidget (), nsIScrollbar () { - NS_INIT_ISUPPORTS (); - mOrientation = (aIsVertical) ? Pt_VERTICAL : Pt_HORIZONTAL; } diff --git a/mozilla/widget/src/photon/nsSound.cpp b/mozilla/widget/src/photon/nsSound.cpp index 4914cc85df9..24f81a3cbd6 100644 --- a/mozilla/widget/src/photon/nsSound.cpp +++ b/mozilla/widget/src/photon/nsSound.cpp @@ -55,7 +55,6 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, nsIStreamLoaderObserver); //////////////////////////////////////////////////////////////////////// nsSound::nsSound() { - NS_INIT_ISUPPORTS(); mInited = PR_FALSE; } diff --git a/mozilla/widget/src/photon/nsTextWidget.cpp b/mozilla/widget/src/photon/nsTextWidget.cpp index 346465eb5db..78921a088d4 100644 --- a/mozilla/widget/src/photon/nsTextWidget.cpp +++ b/mozilla/widget/src/photon/nsTextWidget.cpp @@ -65,7 +65,6 @@ NS_IMPL_RELEASE(nsTextWidget) //------------------------------------------------------------------------- nsTextWidget::nsTextWidget() : nsTextHelper() { - NS_INIT_ISUPPORTS(); mBackground = NS_RGB(124, 124, 124); } diff --git a/mozilla/widget/src/photon/nsToolkit.cpp b/mozilla/widget/src/photon/nsToolkit.cpp index acd8bd2dbf9..3f59c16c5ab 100644 --- a/mozilla/widget/src/photon/nsToolkit.cpp +++ b/mozilla/widget/src/photon/nsToolkit.cpp @@ -58,7 +58,6 @@ NS_IMPL_ISUPPORTS1(nsToolkit,nsIToolkit); //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/widget/src/photon/nsWidget.cpp b/mozilla/widget/src/photon/nsWidget.cpp index 980d8cdf3ef..a0c96d98ed1 100644 --- a/mozilla/widget/src/photon/nsWidget.cpp +++ b/mozilla/widget/src/photon/nsWidget.cpp @@ -108,9 +108,6 @@ PRBool nsWidget::sJustGotDeactivated = PR_FALSE; nsWidget::nsWidget() { - // XXX Shouldn't this be done in nsBaseWidget? - // NS_INIT_ISUPPORTS(); - if (!sLookAndFeel) { if (NS_OK != nsComponentManager::CreateInstance(kLookAndFeelCID, nsnull, diff --git a/mozilla/widget/src/qt/nsAppShell.cpp b/mozilla/widget/src/qt/nsAppShell.cpp index a066a9c589d..7be07f8805d 100644 --- a/mozilla/widget/src/qt/nsAppShell.cpp +++ b/mozilla/widget/src/qt/nsAppShell.cpp @@ -66,7 +66,6 @@ PRBool nsAppShell::mRunning = PR_FALSE; //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); mDispatchListener = 0; mEventQueue = nsnull; mApplication = nsnull; diff --git a/mozilla/widget/src/qt/nsBidiKeyboard.cpp b/mozilla/widget/src/qt/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/qt/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/qt/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/qt/nsCheckButton.cpp b/mozilla/widget/src/qt/nsCheckButton.cpp index da8ab0a7e04..75492013631 100644 --- a/mozilla/widget/src/qt/nsCheckButton.cpp +++ b/mozilla/widget/src/qt/nsCheckButton.cpp @@ -68,7 +68,6 @@ NS_IMPL_QUERY_INTERFACE2(nsCheckButton, nsICheckButton, nsIWidget) nsCheckButton::nsCheckButton() : nsWidget() , nsICheckButton() { PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsCheckButton::nsCheckButton()\n")); - NS_INIT_ISUPPORTS(); mWidget = nsnull; } diff --git a/mozilla/widget/src/qt/nsClipboard.cpp b/mozilla/widget/src/qt/nsClipboard.cpp index 68520232842..c1ab33317a2 100644 --- a/mozilla/widget/src/qt/nsClipboard.cpp +++ b/mozilla/widget/src/qt/nsClipboard.cpp @@ -76,7 +76,6 @@ nsClipboard::nsClipboard() : mGlobalTransferable (nsnull), mIgnoreEmptyNotification (PR_FALSE) { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/qt/nsDragService.cpp b/mozilla/widget/src/qt/nsDragService.cpp index 96a0ab5cb88..cb71f53e35f 100644 --- a/mozilla/widget/src/qt/nsDragService.cpp +++ b/mozilla/widget/src/qt/nsDragService.cpp @@ -72,8 +72,6 @@ static PRBool gHaveDrag = PR_FALSE; //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_ISUPPORTS(); - // our hidden source widget mHiddenWidget = new QWidget(0,QWidget::tr("DragDrop"),0); } diff --git a/mozilla/widget/src/qt/nsLabel.cpp b/mozilla/widget/src/qt/nsLabel.cpp index 7d3abbddc24..71b7959c1cb 100644 --- a/mozilla/widget/src/qt/nsLabel.cpp +++ b/mozilla/widget/src/qt/nsLabel.cpp @@ -72,7 +72,6 @@ nsLabel::nsLabel() : nsWidget(), nsILabel() PR_LOG(QtWidgetsLM, PR_LOG_DEBUG, ("nsLabel::nsLabel()\n")); - NS_INIT_ISUPPORTS(); mAlignment = eAlign_Left; } diff --git a/mozilla/widget/src/qt/nsToolkit.cpp b/mozilla/widget/src/qt/nsToolkit.cpp index 7db2d51fa4b..07b1cf45576 100644 --- a/mozilla/widget/src/qt/nsToolkit.cpp +++ b/mozilla/widget/src/qt/nsToolkit.cpp @@ -50,7 +50,6 @@ static PRUintn gToolkitTLSIndex = 0; //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/windows/nsAppShell.cpp b/mozilla/widget/src/windows/nsAppShell.cpp index fb6fcf90126..16ac33c276f 100644 --- a/mozilla/widget/src/windows/nsAppShell.cpp +++ b/mozilla/widget/src/windows/nsAppShell.cpp @@ -63,7 +63,6 @@ static int gKeepGoing = 1; //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); mDispatchListener = 0; } diff --git a/mozilla/widget/src/windows/nsBidiKeyboard.cpp b/mozilla/widget/src/windows/nsBidiKeyboard.cpp index 0f6176cfae7..cd08388c848 100644 --- a/mozilla/widget/src/windows/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/windows/nsBidiKeyboard.cpp @@ -27,7 +27,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); #ifdef IBMBIDI mDefaultsSet = PR_FALSE; mLTRKeyboard[0] = '\0'; diff --git a/mozilla/widget/src/windows/nsClipboard.cpp b/mozilla/widget/src/windows/nsClipboard.cpp index 37dacd6da81..e5d27ec07a2 100644 --- a/mozilla/widget/src/windows/nsClipboard.cpp +++ b/mozilla/widget/src/windows/nsClipboard.cpp @@ -80,7 +80,6 @@ UINT nsClipboard::CF_HTML = ::RegisterClipboardFormat("HTML Format"); //------------------------------------------------------------------------- nsClipboard::nsClipboard() : nsBaseClipboard() { - //NS_INIT_ISUPPORTS(); mIgnoreEmptyNotification = PR_FALSE; mWindow = nsnull; diff --git a/mozilla/widget/src/windows/nsDragService.cpp b/mozilla/widget/src/windows/nsDragService.cpp index d5114ca1886..c313a895911 100644 --- a/mozilla/widget/src/windows/nsDragService.cpp +++ b/mozilla/widget/src/windows/nsDragService.cpp @@ -62,7 +62,6 @@ //------------------------------------------------------------------------- nsDragService::nsDragService() { - NS_INIT_ISUPPORTS(); mNativeDragTarget = nsnull; mNativeDragSrc = nsnull; mDataObject = nsnull; diff --git a/mozilla/widget/src/windows/nsFilePicker.cpp b/mozilla/widget/src/windows/nsFilePicker.cpp index 2931c0b1374..06e2aa3c270 100644 --- a/mozilla/widget/src/windows/nsFilePicker.cpp +++ b/mozilla/widget/src/windows/nsFilePicker.cpp @@ -64,7 +64,6 @@ char nsFilePicker::mLastUsedDirectory[MAX_PATH+1] = { 0 }; //------------------------------------------------------------------------- nsFilePicker::nsFilePicker() { - NS_INIT_ISUPPORTS(); mWnd = NULL; mUnicodeEncoder = nsnull; mUnicodeDecoder = nsnull; diff --git a/mozilla/widget/src/windows/nsFullScreen.cpp b/mozilla/widget/src/windows/nsFullScreen.cpp index 68ad0a93a59..a2998e9b2b9 100644 --- a/mozilla/widget/src/windows/nsFullScreen.cpp +++ b/mozilla/widget/src/windows/nsFullScreen.cpp @@ -53,7 +53,6 @@ NS_IMPL_ISUPPORTS1(nsFullScreen, nsIFullScreen) nsFullScreen::nsFullScreen() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } @@ -129,7 +128,6 @@ NS_IMPL_ISUPPORTS1(nsOSChromeItem, nsIOSChromeItem) nsOSChromeItem::nsOSChromeItem(char* aName) : mIsHidden(PR_FALSE) { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ mName.Assign(aName); diff --git a/mozilla/widget/src/windows/nsScrollbar.cpp b/mozilla/widget/src/windows/nsScrollbar.cpp index 40aecb56bdd..2180aa33462 100644 --- a/mozilla/widget/src/windows/nsScrollbar.cpp +++ b/mozilla/widget/src/windows/nsScrollbar.cpp @@ -54,7 +54,6 @@ nsScrollbar::InitializationState nsScrollbar::sScrollbarInited = nsScrollbar::eN //------------------------------------------------------------------------- nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar() { - NS_INIT_ISUPPORTS(); mPositionFlag = (aIsVertical) ? SBS_VERT : SBS_HORZ; mScaleFactor = 1.0f; mLineIncrement = 0; diff --git a/mozilla/widget/src/windows/nsSound.cpp b/mozilla/widget/src/windows/nsSound.cpp index df7c1ea99e7..156c3208e24 100644 --- a/mozilla/widget/src/windows/nsSound.cpp +++ b/mozilla/widget/src/windows/nsSound.cpp @@ -76,7 +76,6 @@ private: nsSound::nsSound() { - NS_INIT_ISUPPORTS(); mLastSound = nsnull; } diff --git a/mozilla/widget/src/windows/nsToolkit.cpp b/mozilla/widget/src/windows/nsToolkit.cpp index 995fb9cc0c4..d824124beb4 100644 --- a/mozilla/widget/src/windows/nsToolkit.cpp +++ b/mozilla/widget/src/windows/nsToolkit.cpp @@ -532,7 +532,6 @@ void RunPump(void* arg) //------------------------------------------------------------------------- nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); mGuiThread = NULL; mDispatchWnd = 0; diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index 4b35abdaaa6..70bb029e733 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -823,7 +823,6 @@ nsWindow::nsWindow() : nsBaseWidget(), mRootAccessible(NULL) nsWindow::nsWindow() : nsBaseWidget() #endif { - NS_INIT_ISUPPORTS(); mWnd = 0; mPrevWndProc = NULL; mBackground = ::GetSysColor(COLOR_BTNFACE); diff --git a/mozilla/widget/src/xlib/nsAppShell.cpp b/mozilla/widget/src/xlib/nsAppShell.cpp index dd1c741e134..2c850455968 100644 --- a/mozilla/widget/src/xlib/nsAppShell.cpp +++ b/mozilla/widget/src/xlib/nsAppShell.cpp @@ -149,7 +149,6 @@ static const char *event_names[] = nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); mDispatchListener = 0; if (!sEventQueueList) diff --git a/mozilla/widget/src/xlib/nsBidiKeyboard.cpp b/mozilla/widget/src/xlib/nsBidiKeyboard.cpp index ac910adc52d..7a225900707 100644 --- a/mozilla/widget/src/xlib/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/xlib/nsBidiKeyboard.cpp @@ -26,7 +26,6 @@ NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard) nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard() { - NS_INIT_ISUPPORTS(); } nsBidiKeyboard::~nsBidiKeyboard() diff --git a/mozilla/widget/src/xlib/nsClipboard.cpp b/mozilla/widget/src/xlib/nsClipboard.cpp index 4de5f6fabe0..0f337f5f1e9 100644 --- a/mozilla/widget/src/xlib/nsClipboard.cpp +++ b/mozilla/widget/src/xlib/nsClipboard.cpp @@ -85,8 +85,6 @@ Display *nsClipboard::sDisplay; NS_IMPL_ISUPPORTS1(nsClipboard, nsIClipboard) nsClipboard::nsClipboard() { - NS_INIT_ISUPPORTS(); - sDisplay = xxlib_rgb_get_display(nsAppShell::GetXlibRgbHandle()); Init(); diff --git a/mozilla/widget/src/xlib/nsToolkit.cpp b/mozilla/widget/src/xlib/nsToolkit.cpp index 74f89cdb9ef..6caa9385a1a 100644 --- a/mozilla/widget/src/xlib/nsToolkit.cpp +++ b/mozilla/widget/src/xlib/nsToolkit.cpp @@ -47,7 +47,6 @@ static PRUintn gToolkitTLSIndex = 0; nsToolkit::nsToolkit() { - NS_INIT_ISUPPORTS(); mGC = nsnull; mDisplay = xxlib_rgb_get_display(nsAppShell::GetXlibRgbHandle()); } diff --git a/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp b/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp index 3d238e33059..1efa10a4813 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp @@ -59,7 +59,6 @@ NS_IMPL_QUERY_INTERFACE1(nsBaseClipboard, nsIClipboard); //------------------------------------------------------------------------- nsBaseClipboard::nsBaseClipboard() { - NS_INIT_ISUPPORTS(); mClipboardOwner = nsnull; mTransferable = nsnull; mIgnoreEmptyNotification = PR_FALSE; diff --git a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp index 1941e379f38..d26b4c79eec 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp @@ -67,7 +67,6 @@ NS_IMPL_QUERY_INTERFACE2(nsBaseDragService, nsIDragService, nsIDragSession) nsBaseDragService::nsBaseDragService() : mCanDrop(PR_FALSE), mDoingDrag(PR_FALSE), mTargetSize(0,0), mDragAction(DRAGDROP_ACTION_NONE) { - NS_INIT_ISUPPORTS(); nsresult result = NS_NewISupportsArray(getter_AddRefs(mTransArray)); if ( NS_FAILED(result) ) { //what do we do? we can't throw! diff --git a/mozilla/widget/src/xpwidgets/nsBasePointerService.cpp b/mozilla/widget/src/xpwidgets/nsBasePointerService.cpp index 198c346d40f..ed5ad63a3b0 100644 --- a/mozilla/widget/src/xpwidgets/nsBasePointerService.cpp +++ b/mozilla/widget/src/xpwidgets/nsBasePointerService.cpp @@ -22,7 +22,6 @@ nsBasePointerService::nsBasePointerService() { - NS_INIT_ISUPPORTS(); } nsBasePointerService::~nsBasePointerService() diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp index 0c1e9b1aefb..8658b505624 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp @@ -100,8 +100,6 @@ nsBaseWidget::nsBaseWidget() #endif NS_NewISupportsArray(getter_AddRefs(mChildren)); - - NS_INIT_ISUPPORTS(); } @@ -1279,7 +1277,6 @@ nsBaseWidget::debug_DumpInvalidate(FILE * aFileOut, nsBaseWidget::Enumerator::Enumerator(nsBaseWidget & inParent) : mCurrentPosition(0), mParent(inParent) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp b/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp index f9cd6633300..7bf5a46c363 100644 --- a/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp +++ b/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp @@ -44,7 +44,6 @@ NS_IMPL_ISUPPORTS1(nsClipboardHelper, nsIClipboardHelper); nsClipboardHelper::nsClipboardHelper() { - NS_INIT_ISUPPORTS(); } nsClipboardHelper::~nsClipboardHelper() diff --git a/mozilla/widget/src/xpwidgets/nsDataFlavor.cpp b/mozilla/widget/src/xpwidgets/nsDataFlavor.cpp index 0cd44f52944..cae4b61d4b5 100644 --- a/mozilla/widget/src/xpwidgets/nsDataFlavor.cpp +++ b/mozilla/widget/src/xpwidgets/nsDataFlavor.cpp @@ -50,7 +50,6 @@ NS_IMPL_RELEASE(nsDataFlavor) //------------------------------------------------------------------------- nsDataFlavor::nsDataFlavor() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp b/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp index 8eb679effb2..0e58f860684 100644 --- a/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp +++ b/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp @@ -74,7 +74,6 @@ NS_IMPL_QUERY_INTERFACE1(nsHTMLFormatConverter, nsIFormatConverter) //------------------------------------------------------------------------- nsHTMLFormatConverter::nsHTMLFormatConverter() { - NS_INIT_ISUPPORTS(); } //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/xpwidgets/nsTransferable.cpp b/mozilla/widget/src/xpwidgets/nsTransferable.cpp index 537ac074e8d..caf641eb7c0 100644 --- a/mozilla/widget/src/xpwidgets/nsTransferable.cpp +++ b/mozilla/widget/src/xpwidgets/nsTransferable.cpp @@ -289,7 +289,6 @@ DataStruct::ReadCache(nsISupports** aData, PRUint32* aDataLen) //------------------------------------------------------------------------- nsTransferable::nsTransferable() { - NS_INIT_ISUPPORTS(); mDataArray = new nsVoidArray(); } diff --git a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp index 498025e0475..6400b3bc9ea 100644 --- a/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/mozilla/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -183,7 +183,6 @@ PRBool nsXPLookAndFeel::sInitialized = PR_FALSE; nsXPLookAndFeel::nsXPLookAndFeel() : nsILookAndFeel() { - NS_INIT_ISUPPORTS(); } static int PR_CALLBACK intPrefChanged (const char *newpref, void *data) diff --git a/mozilla/widget/src/xremoteclient/XRemoteClient.cpp b/mozilla/widget/src/xremoteclient/XRemoteClient.cpp index 54dae822473..9b7b5509916 100644 --- a/mozilla/widget/src/xremoteclient/XRemoteClient.cpp +++ b/mozilla/widget/src/xremoteclient/XRemoteClient.cpp @@ -48,7 +48,6 @@ static PRLogModuleInfo *sRemoteLm = NULL; XRemoteClient::XRemoteClient() { - NS_INIT_ISUPPORTS(); mDisplay = 0; mInitialized = PR_FALSE; mMozVersionAtom = 0; diff --git a/mozilla/xpcom/base/nsAgg.h b/mozilla/xpcom/base/nsAgg.h index cd128821f4b..13103a50e73 100644 --- a/mozilla/xpcom/base/nsAgg.h +++ b/mozilla/xpcom/base/nsAgg.h @@ -81,7 +81,6 @@ public: \ // Put this in your class's constructor: #define NS_INIT_AGGREGATED(outer) \ PR_BEGIN_MACRO \ - NS_INIT_ISUPPORTS(); \ fOuter = outer ? outer : &fAggregated; \ PR_END_MACRO diff --git a/mozilla/xpcom/base/nsConsoleMessage.cpp b/mozilla/xpcom/base/nsConsoleMessage.cpp index 30f4966abf7..a96812b9c89 100644 --- a/mozilla/xpcom/base/nsConsoleMessage.cpp +++ b/mozilla/xpcom/base/nsConsoleMessage.cpp @@ -46,12 +46,10 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleMessage, nsIConsoleMessage); nsConsoleMessage::nsConsoleMessage() { - NS_INIT_ISUPPORTS(); } nsConsoleMessage::nsConsoleMessage(const PRUnichar *message) { - NS_INIT_ISUPPORTS(); mMessage.Assign(message); } diff --git a/mozilla/xpcom/base/nsConsoleService.cpp b/mozilla/xpcom/base/nsConsoleService.cpp index 0295a19302b..b362ca6bae5 100644 --- a/mozilla/xpcom/base/nsConsoleService.cpp +++ b/mozilla/xpcom/base/nsConsoleService.cpp @@ -55,8 +55,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsConsoleService, nsIConsoleService); nsConsoleService::nsConsoleService() : mCurrent(0), mFull(PR_FALSE), mListening(PR_FALSE), mLock(nsnull) { - NS_INIT_ISUPPORTS(); - // XXX grab this from a pref! // hm, but worry about circularity, bc we want to be able to report // prefs errs... diff --git a/mozilla/xpcom/base/nsErrorService.h b/mozilla/xpcom/base/nsErrorService.h index 5585920892c..20b0d427ddd 100644 --- a/mozilla/xpcom/base/nsErrorService.h +++ b/mozilla/xpcom/base/nsErrorService.h @@ -61,7 +61,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_NSIERRORSERVICE - nsErrorService() { NS_INIT_ISUPPORTS(); } + nsErrorService() {} virtual ~nsErrorService() {} static NS_METHOD diff --git a/mozilla/xpcom/base/nsExceptionService.cpp b/mozilla/xpcom/base/nsExceptionService.cpp index f8ecb86e86b..e5e8e4fa1c2 100644 --- a/mozilla/xpcom/base/nsExceptionService.cpp +++ b/mozilla/xpcom/base/nsExceptionService.cpp @@ -99,7 +99,6 @@ nsExceptionManager::nsExceptionManager(nsExceptionService *svc) : mService(svc) { /* member initializers and constructor code */ - NS_INIT_ISUPPORTS(); #ifdef NS_DEBUG PR_AtomicIncrement(&totalInstances); #endif @@ -158,7 +157,6 @@ nsExceptionService::nsExceptionService() NS_ERROR("The nsExceptionService is a singleton!"); } #endif - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ if (tlsIndex == BAD_TLS_INDEX) { PRStatus status; diff --git a/mozilla/xpcom/base/nsLeakDetector.cpp b/mozilla/xpcom/base/nsLeakDetector.cpp index 8296adcd0bf..ccb6d9d3400 100644 --- a/mozilla/xpcom/base/nsLeakDetector.cpp +++ b/mozilla/xpcom/base/nsLeakDetector.cpp @@ -84,7 +84,6 @@ public: NS_IMPL_ISUPPORTS1(nsLeakDetector, nsILeakDetector) nsLeakDetector::nsLeakDetector() { - NS_INIT_ISUPPORTS(); } nsLeakDetector::~nsLeakDetector() {} diff --git a/mozilla/xpcom/base/nsMemoryImpl.cpp b/mozilla/xpcom/base/nsMemoryImpl.cpp index 1bd203f65e4..ae0c4aba341 100644 --- a/mozilla/xpcom/base/nsMemoryImpl.cpp +++ b/mozilla/xpcom/base/nsMemoryImpl.cpp @@ -110,7 +110,6 @@ MemoryFlusher::MemoryFlusher(nsMemoryImpl* aMemoryImpl) mLock(nsnull), mCVar(nsnull) { - NS_INIT_ISUPPORTS(); } MemoryFlusher::~MemoryFlusher() @@ -253,7 +252,6 @@ nsMemoryImpl::nsMemoryImpl() mFlushLock(nsnull), mIsFlushing(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsMemoryImpl::~nsMemoryImpl() diff --git a/mozilla/xpcom/base/nsSystemInfo.cpp b/mozilla/xpcom/base/nsSystemInfo.cpp index dcb4b0cd9c9..3a01dd32269 100644 --- a/mozilla/xpcom/base/nsSystemInfo.cpp +++ b/mozilla/xpcom/base/nsSystemInfo.cpp @@ -42,7 +42,6 @@ nsSystemInfo::nsSystemInfo() { - NS_INIT_ISUPPORTS(); } nsSystemInfo::~nsSystemInfo() diff --git a/mozilla/xpcom/components/nsCategoryManager.cpp b/mozilla/xpcom/components/nsCategoryManager.cpp index 907cfa6a241..02b4a65b0e2 100644 --- a/mozilla/xpcom/components/nsCategoryManager.cpp +++ b/mozilla/xpcom/components/nsCategoryManager.cpp @@ -169,7 +169,6 @@ nsCategoryManager::nsCategoryManager() (nsHashtableEnumFunc) Destroy_CategoryNode, 0 ) { - NS_INIT_ISUPPORTS(); } nsCategoryManager::~nsCategoryManager() @@ -395,7 +394,6 @@ NS_IMPL_ISUPPORTS1(nsCategoryManagerFactory, nsIFactory) nsCategoryManagerFactory::nsCategoryManagerFactory() { - NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index 188be9072ca..4cd8fd18065 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -479,7 +479,6 @@ PLDHashTableEnumeratorImpl::PLDHashTableEnumeratorImpl(PLDHashTable *table, nsAutoMonitor mon(mMonitor); - NS_INIT_ISUPPORTS(); Closure c = { PR_FALSE, converter, converterData, this }; mCount = PL_DHashTableEnumerate(table, Enumerator, &c); if (!c.succeeded) { @@ -686,7 +685,6 @@ nsComponentManagerImpl::nsComponentManagerImpl() mLoaderData(nsnull), mRegistryDirty(PR_FALSE) { - NS_INIT_ISUPPORTS(); mFactories.ops = nsnull; mContractIDs.ops = nsnull; } diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 173194985a2..a41b60cca84 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -59,7 +59,6 @@ extern PRLogModuleInfo *nsComponentManagerLog; nsNativeComponentLoader::nsNativeComponentLoader() : mCompMgr(nsnull), mDllStore(nsnull) { - NS_INIT_ISUPPORTS(); } static PRBool PR_CALLBACK diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp index e19de06b9f5..e3078def514 100644 --- a/mozilla/xpcom/components/nsRegistry.cpp +++ b/mozilla/xpcom/components/nsRegistry.cpp @@ -368,7 +368,6 @@ NS_IMPL_ISUPPORTS1( nsRegistryValue, nsIRegistryValue ) ------------------------------------------------------------------------------*/ nsRegistry::nsRegistry() : mReg(0), mCurRegID(0) { - NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1574,7 +1573,6 @@ int nsRegistry::SetBufferSize( int bufsize ) nsRegSubtreeEnumerator::nsRegSubtreeEnumerator( HREG hReg, RKEY rKey, PRBool all ) : mReg( hReg ), mKey( rKey ), mEnum( 0 ), mNext( 0 ), mStyle( all ? REGENUM_DESCEND : REGENUM_CHILDREN ), mDone( PR_FALSE ) { - NS_INIT_ISUPPORTS(); mName[0] = '\0'; @@ -1762,7 +1760,6 @@ NS_IMETHODIMP nsRegValueEnumerator::advance() { ------------------------------------------------------------------------------*/ nsRegistryNode::nsRegistryNode( HREG hReg, char *name, RKEY childKey ) : mReg( hReg ), mChildKey( childKey ) { - NS_INIT_ISUPPORTS(); PR_ASSERT(name != nsnull); strcpy(mName, name); @@ -1825,7 +1822,6 @@ NS_IMETHODIMP nsRegistryNode::GetKey( nsRegistryKey *r_key ) { ------------------------------------------------------------------------------*/ nsRegistryValue::nsRegistryValue( HREG hReg, RKEY key, REGENUM slot ) : mReg( hReg ), mKey( key ), mEnum( slot ), mErr( -1 ) { - NS_INIT_ISUPPORTS(); #ifdef EXTRA_THREADSAFE mregLock = PR_NewLock(); #endif @@ -1953,7 +1949,6 @@ nsresult nsRegistryValue::getInfo() { nsRegistryFactory::nsRegistryFactory() { - NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsRegistryFactory, nsIFactory) diff --git a/mozilla/xpcom/components/nsStaticComponentLoader.cpp b/mozilla/xpcom/components/nsStaticComponentLoader.cpp index 52c9eae8890..2d42cec82be 100644 --- a/mozilla/xpcom/components/nsStaticComponentLoader.cpp +++ b/mozilla/xpcom/components/nsStaticComponentLoader.cpp @@ -32,7 +32,6 @@ public: nsStaticComponentLoader() : mAutoRegistered(PR_FALSE), mLoadedInfo(PR_FALSE) { - NS_INIT_ISUPPORTS(); } virtual ~nsStaticComponentLoader() { diff --git a/mozilla/xpcom/components/nsXPComFactory.h b/mozilla/xpcom/components/nsXPComFactory.h index 35ebe5962fa..37b219b5268 100644 --- a/mozilla/xpcom/components/nsXPComFactory.h +++ b/mozilla/xpcom/components/nsXPComFactory.h @@ -89,7 +89,7 @@ class ns##_name##Factory : public nsIFactory \ public: \ NS_DECL_ISUPPORTS \ \ - ns##_name##Factory() { NS_INIT_ISUPPORTS(); } \ + ns##_name##Factory() { } \ \ NS_IMETHOD CreateInstance(nsISupports *aOuter, \ const nsIID &aIID, \ diff --git a/mozilla/xpcom/ds/nsArena.cpp b/mozilla/xpcom/ds/nsArena.cpp index d9c02dba775..4717804c4e5 100644 --- a/mozilla/xpcom/ds/nsArena.cpp +++ b/mozilla/xpcom/ds/nsArena.cpp @@ -42,7 +42,6 @@ ArenaImpl::ArenaImpl(void) : mInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); memset(&mPool, 0, sizeof(PLArenaPool)); } diff --git a/mozilla/xpcom/ds/nsArray.h b/mozilla/xpcom/ds/nsArray.h index 5d0dfb3777a..6aa220cba83 100644 --- a/mozilla/xpcom/ds/nsArray.h +++ b/mozilla/xpcom/ds/nsArray.h @@ -71,9 +71,9 @@ NS_NewArray(nsIMutableArray** aResult, const nsCOMArray_base& base); class nsArray : public nsIMutableArray { public: - nsArray() { NS_INIT_ISUPPORTS(); } + nsArray() { } nsArray(const nsCOMArray_base& aBaseArray) : mArray(aBaseArray) - { NS_INIT_ISUPPORTS(); } + { } virtual ~nsArray(); diff --git a/mozilla/xpcom/ds/nsArrayEnumerator.cpp b/mozilla/xpcom/ds/nsArrayEnumerator.cpp index 7cc14f90e89..8443794236c 100644 --- a/mozilla/xpcom/ds/nsArrayEnumerator.cpp +++ b/mozilla/xpcom/ds/nsArrayEnumerator.cpp @@ -109,7 +109,6 @@ public: // nsSimpleArrayEnumerator methods nsCOMArrayEnumerator() : mIndex(0) { - NS_INIT_ISUPPORTS(); } virtual ~nsCOMArrayEnumerator(void); diff --git a/mozilla/xpcom/ds/nsArrayEnumerator.h b/mozilla/xpcom/ds/nsArrayEnumerator.h index 7df685a6e3f..d252f4b08b4 100644 --- a/mozilla/xpcom/ds/nsArrayEnumerator.h +++ b/mozilla/xpcom/ds/nsArrayEnumerator.h @@ -58,7 +58,6 @@ public: // nsSimpleArrayEnumerator methods nsSimpleArrayEnumerator(nsIArray* aValueArray) : mValueArray(aValueArray), mIndex(0) { - NS_INIT_ISUPPORTS(); } virtual ~nsSimpleArrayEnumerator(void) {} diff --git a/mozilla/xpcom/ds/nsAtomService.cpp b/mozilla/xpcom/ds/nsAtomService.cpp index cf79d965689..180c448ac90 100644 --- a/mozilla/xpcom/ds/nsAtomService.cpp +++ b/mozilla/xpcom/ds/nsAtomService.cpp @@ -42,7 +42,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAtomService, nsIAtomService) nsAtomService::nsAtomService() { - NS_INIT_ISUPPORTS(); } nsAtomService::~nsAtomService() diff --git a/mozilla/xpcom/ds/nsAtomTable.cpp b/mozilla/xpcom/ds/nsAtomTable.cpp index b9e27c79c27..1c38d099223 100644 --- a/mozilla/xpcom/ds/nsAtomTable.cpp +++ b/mozilla/xpcom/ds/nsAtomTable.cpp @@ -159,7 +159,6 @@ void NS_PurgeAtomTable() AtomImpl::AtomImpl() { - NS_INIT_ISUPPORTS(); } AtomImpl::~AtomImpl() diff --git a/mozilla/xpcom/ds/nsByteBuffer.cpp b/mozilla/xpcom/ds/nsByteBuffer.cpp index d12d4fd8d1a..21e16522107 100644 --- a/mozilla/xpcom/ds/nsByteBuffer.cpp +++ b/mozilla/xpcom/ds/nsByteBuffer.cpp @@ -45,7 +45,6 @@ ByteBufferImpl::ByteBufferImpl(void) : mBuffer(NULL), mSpace(0), mLength(0) { - NS_INIT_ISUPPORTS(); } NS_IMETHODIMP diff --git a/mozilla/xpcom/ds/nsEnumeratorUtils.cpp b/mozilla/xpcom/ds/nsEnumeratorUtils.cpp index 2c39ddc33a5..fe69586abc3 100644 --- a/mozilla/xpcom/ds/nsEnumeratorUtils.cpp +++ b/mozilla/xpcom/ds/nsEnumeratorUtils.cpp @@ -42,7 +42,6 @@ nsArrayEnumerator::nsArrayEnumerator(nsISupportsArray* aValueArray) : mValueArray(aValueArray), mIndex(0) { - NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValueArray); } @@ -111,7 +110,6 @@ NS_NewArrayEnumerator(nsISimpleEnumerator* *result, nsSingletonEnumerator::nsSingletonEnumerator(nsISupports* aValue) : mValue(aValue) { - NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValue); mConsumed = (mValue ? PR_FALSE : PR_TRUE); } @@ -170,7 +168,6 @@ NS_NewSingletonEnumerator(nsISimpleEnumerator* *result, nsAdapterEnumerator::nsAdapterEnumerator(nsIEnumerator* aEnum) : mEnum(aEnum), mCurrent(0), mStarted(PR_FALSE) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mEnum); } diff --git a/mozilla/xpcom/ds/nsHashtableEnumerator.cpp b/mozilla/xpcom/ds/nsHashtableEnumerator.cpp index 85ec406a144..d7d7758483a 100644 --- a/mozilla/xpcom/ds/nsHashtableEnumerator.cpp +++ b/mozilla/xpcom/ds/nsHashtableEnumerator.cpp @@ -139,8 +139,6 @@ nsHashtableEnumerator::nsHashtableEnumerator(nsHashtable *aHash, aConverter, void* aData) { - NS_INIT_ISUPPORTS(); - nsHashEnumClosure c; c.Current = mCurrent = 0; c.Elements = mElements; diff --git a/mozilla/xpcom/ds/nsObserverList.cpp b/mozilla/xpcom/ds/nsObserverList.cpp index 7701c58d181..c28b3ff7f2b 100644 --- a/mozilla/xpcom/ds/nsObserverList.cpp +++ b/mozilla/xpcom/ds/nsObserverList.cpp @@ -146,7 +146,6 @@ nsObserverList::GetObserverList(nsISimpleEnumerator** anEnumerator) ObserverListEnumerator::ObserverListEnumerator(nsISupportsArray* aValueArray) : mValueArray(aValueArray), mIndex(0) { - NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mValueArray); if (mValueArray) { PRUint32 total; diff --git a/mozilla/xpcom/ds/nsObserverService.cpp b/mozilla/xpcom/ds/nsObserverService.cpp index 7a21abf4081..114b1db3037 100644 --- a/mozilla/xpcom/ds/nsObserverService.cpp +++ b/mozilla/xpcom/ds/nsObserverService.cpp @@ -74,7 +74,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsObserverService, nsIObserverService) nsObserverService::nsObserverService() : mObserverTopicTable(nsnull) { - NS_INIT_ISUPPORTS(); mObserverTopicTable = nsnull; } diff --git a/mozilla/xpcom/ds/nsPersistentProperties.cpp b/mozilla/xpcom/ds/nsPersistentProperties.cpp index 1bdfca0d3eb..463ee2b5286 100644 --- a/mozilla/xpcom/ds/nsPersistentProperties.cpp +++ b/mozilla/xpcom/ds/nsPersistentProperties.cpp @@ -119,8 +119,6 @@ struct PLDHashTableOps property_HashTableOps = { nsPersistentProperties::nsPersistentProperties() { - NS_INIT_ISUPPORTS(); - mIn = nsnull; mSubclass = NS_STATIC_CAST(nsIPersistentProperties*, this); PL_DHashTableInit(&mTable, &property_HashTableOps, nsnull, diff --git a/mozilla/xpcom/ds/nsPersistentProperties.h b/mozilla/xpcom/ds/nsPersistentProperties.h index 76a39a6906f..389f8029337 100644 --- a/mozilla/xpcom/ds/nsPersistentProperties.h +++ b/mozilla/xpcom/ds/nsPersistentProperties.h @@ -81,13 +81,11 @@ class nsPropertyElement : public nsIPropertyElement public: nsPropertyElement() { - NS_INIT_ISUPPORTS(); } nsPropertyElement(const nsACString& aKey, const nsAString& aValue) : mKey(aKey), mValue(aValue) { - NS_INIT_ISUPPORTS(); } virtual ~nsPropertyElement() {} diff --git a/mozilla/xpcom/ds/nsRecyclingAllocator.h b/mozilla/xpcom/ds/nsRecyclingAllocator.h index e2769286cb9..cbe7face04b 100644 --- a/mozilla/xpcom/ds/nsRecyclingAllocator.h +++ b/mozilla/xpcom/ds/nsRecyclingAllocator.h @@ -200,7 +200,6 @@ public: nsRecyclingAllocatorImpl() { - NS_INIT_ISUPPORTS(); } virtual ~nsRecyclingAllocatorImpl() {} diff --git a/mozilla/xpcom/ds/nsSizeOfHandler.cpp b/mozilla/xpcom/ds/nsSizeOfHandler.cpp index 4ded07ffdeb..3004364089a 100644 --- a/mozilla/xpcom/ds/nsSizeOfHandler.cpp +++ b/mozilla/xpcom/ds/nsSizeOfHandler.cpp @@ -129,7 +129,6 @@ nsSizeOfHandler::nsSizeOfHandler() : mTotalSize(0), mTotalCount(0) { - NS_INIT_ISUPPORTS(); mTotalSize = 0; mSizeTable = PL_NewHashTable(32, (PLHashFunction) PointerHashKey, (PLHashComparator) PointerCompareKeys, diff --git a/mozilla/xpcom/ds/nsStringService.cpp b/mozilla/xpcom/ds/nsStringService.cpp index b40a546acac..fc906b47f59 100644 --- a/mozilla/xpcom/ds/nsStringService.cpp +++ b/mozilla/xpcom/ds/nsStringService.cpp @@ -42,7 +42,6 @@ nsStringService::nsStringService() { - NS_INIT_ISUPPORTS(); } nsStringService::~nsStringService() { diff --git a/mozilla/xpcom/ds/nsSupportsArray.cpp b/mozilla/xpcom/ds/nsSupportsArray.cpp index 8f10e700123..fc8f06dca8e 100644 --- a/mozilla/xpcom/ds/nsSupportsArray.cpp +++ b/mozilla/xpcom/ds/nsSupportsArray.cpp @@ -130,7 +130,6 @@ static const PRInt32 kLinearThreshold = 16 * sizeof(nsISupports *); nsSupportsArray::nsSupportsArray() { - NS_INIT_ISUPPORTS(); mArray = mAutoArray; mArraySize = kAutoArraySize; mCount = 0; diff --git a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp index ccaac4f6f77..57d60ff1d32 100644 --- a/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp +++ b/mozilla/xpcom/ds/nsSupportsArrayEnumerator.cpp @@ -41,7 +41,6 @@ nsSupportsArrayEnumerator::nsSupportsArrayEnumerator(nsISupportsArray* array) : mArray(array), mCursor(0) { - NS_INIT_ISUPPORTS(); NS_ASSERTION(array, "null array"); NS_ADDREF(mArray); } diff --git a/mozilla/xpcom/ds/nsSupportsPrimitives.cpp b/mozilla/xpcom/ds/nsSupportsPrimitives.cpp index 21657b11b82..c35f227354d 100644 --- a/mozilla/xpcom/ds/nsSupportsPrimitives.cpp +++ b/mozilla/xpcom/ds/nsSupportsPrimitives.cpp @@ -191,7 +191,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsSupportsPRBoolImpl, nsISupportsPRBool, nsSupportsPRBoolImpl::nsSupportsPRBoolImpl() : mData(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsSupportsPRBoolImpl::~nsSupportsPRBoolImpl() {} @@ -250,7 +249,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRUint8Impl, nsISupportsPRUint8, nsSupportsPRUint8Impl::nsSupportsPRUint8Impl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsPRUint8Impl::~nsSupportsPRUint8Impl() {} @@ -298,7 +296,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRUint16Impl, nsISupportsPRUint16, nsSupportsPRUint16Impl::nsSupportsPRUint16Impl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsPRUint16Impl::~nsSupportsPRUint16Impl() {} @@ -346,7 +343,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRUint32Impl, nsISupportsPRUint32, nsSupportsPRUint32Impl::nsSupportsPRUint32Impl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsPRUint32Impl::~nsSupportsPRUint32Impl() {} @@ -394,7 +390,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRUint64Impl, nsISupportsPRUint64, nsSupportsPRUint64Impl::nsSupportsPRUint64Impl() : mData(LL_ZERO) { - NS_INIT_ISUPPORTS(); } nsSupportsPRUint64Impl::~nsSupportsPRUint64Impl() {} @@ -442,7 +437,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRTimeImpl, nsISupportsPRTime, nsSupportsPRTimeImpl::nsSupportsPRTimeImpl() : mData(LL_ZERO) { - NS_INIT_ISUPPORTS(); } nsSupportsPRTimeImpl::~nsSupportsPRTimeImpl() {} @@ -490,7 +484,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsCharImpl, nsISupportsChar, nsSupportsCharImpl::nsSupportsCharImpl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsCharImpl::~nsSupportsCharImpl() {} @@ -538,7 +531,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRInt16Impl, nsISupportsPRInt16, nsSupportsPRInt16Impl::nsSupportsPRInt16Impl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsPRInt16Impl::~nsSupportsPRInt16Impl() {} @@ -586,7 +578,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRInt32Impl, nsISupportsPRInt32, nsSupportsPRInt32Impl::nsSupportsPRInt32Impl() : mData(0) { - NS_INIT_ISUPPORTS(); } nsSupportsPRInt32Impl::~nsSupportsPRInt32Impl() {} @@ -634,7 +625,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsPRInt64Impl, nsISupportsPRInt64, nsSupportsPRInt64Impl::nsSupportsPRInt64Impl() : mData(LL_ZERO) { - NS_INIT_ISUPPORTS(); } nsSupportsPRInt64Impl::~nsSupportsPRInt64Impl() {} @@ -682,7 +672,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsFloatImpl, nsISupportsFloat, nsSupportsFloatImpl::nsSupportsFloatImpl() : mData(float(0.0)) { - NS_INIT_ISUPPORTS(); } nsSupportsFloatImpl::~nsSupportsFloatImpl() {} @@ -730,7 +719,6 @@ NS_IMPL_ISUPPORTS2(nsSupportsDoubleImpl, nsISupportsDouble, nsSupportsDoubleImpl::nsSupportsDoubleImpl() : mData(double(0.0)) { - NS_INIT_ISUPPORTS(); } nsSupportsDoubleImpl::~nsSupportsDoubleImpl() {} @@ -779,7 +767,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsSupportsVoidImpl, nsISupportsVoid, nsSupportsVoidImpl::nsSupportsVoidImpl() : mData(nsnull) { - NS_INIT_ISUPPORTS(); } nsSupportsVoidImpl::~nsSupportsVoidImpl() {} @@ -825,7 +812,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsSupportsInterfacePointerImpl, nsSupportsInterfacePointerImpl::nsSupportsInterfacePointerImpl() : mIID(nsnull) { - NS_INIT_ISUPPORTS(); } nsSupportsInterfacePointerImpl::~nsSupportsInterfacePointerImpl() diff --git a/mozilla/xpcom/ds/nsSupportsPrimitives.h b/mozilla/xpcom/ds/nsSupportsPrimitives.h index a29a01f5972..bb6019a664b 100644 --- a/mozilla/xpcom/ds/nsSupportsPrimitives.h +++ b/mozilla/xpcom/ds/nsSupportsPrimitives.h @@ -66,7 +66,7 @@ public: NS_DECL_NSISUPPORTSPRIMITIVE NS_DECL_NSISUPPORTSCSTRING - nsSupportsCStringImpl() { NS_INIT_ISUPPORTS(); } + nsSupportsCStringImpl() {} virtual ~nsSupportsCStringImpl() {} private: @@ -83,7 +83,7 @@ public: NS_DECL_NSISUPPORTSPRIMITIVE NS_DECL_NSISUPPORTSSTRING - nsSupportsStringImpl() { NS_INIT_ISUPPORTS(); } + nsSupportsStringImpl() {} virtual ~nsSupportsStringImpl() {} private: diff --git a/mozilla/xpcom/ds/nsTimelineService.cpp b/mozilla/xpcom/ds/nsTimelineService.cpp index f7879d9c80f..c6760bd9617 100644 --- a/mozilla/xpcom/ds/nsTimelineService.cpp +++ b/mozilla/xpcom/ds/nsTimelineService.cpp @@ -476,7 +476,6 @@ PR_IMPLEMENT(nsresult) NS_TimelineLeave(const char *text) nsTimelineService::nsTimelineService() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/mozilla/xpcom/ds/nsUnicharBuffer.cpp b/mozilla/xpcom/ds/nsUnicharBuffer.cpp index 72dd40faec0..58cfd1306f7 100644 --- a/mozilla/xpcom/ds/nsUnicharBuffer.cpp +++ b/mozilla/xpcom/ds/nsUnicharBuffer.cpp @@ -45,7 +45,6 @@ UnicharBufferImpl::UnicharBufferImpl() : mBuffer(NULL), mSpace(0), mLength(0) { - NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/mozilla/xpcom/ds/nsVariant.cpp b/mozilla/xpcom/ds/nsVariant.cpp index 560f88ac825..e34a1dceec2 100644 --- a/mozilla/xpcom/ds/nsVariant.cpp +++ b/mozilla/xpcom/ds/nsVariant.cpp @@ -1636,8 +1636,6 @@ NS_IMPL_ISUPPORTS2(nsVariant, nsIVariant, nsIWritableVariant) nsVariant::nsVariant() : mWritable(PR_TRUE) { - NS_INIT_ISUPPORTS(); - nsVariant::Initialize(&mData); #ifdef DEBUG diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp index a69f68deeac..271c43284ca 100644 --- a/mozilla/xpcom/glue/nsGenericFactory.cpp +++ b/mozilla/xpcom/glue/nsGenericFactory.cpp @@ -57,7 +57,6 @@ nsGenericFactory::nsGenericFactory(const nsModuleComponentInfo *info) : mInfo(info) { - NS_INIT_ISUPPORTS(); if (mInfo && mInfo->mClassInfoGlobal) *mInfo->mClassInfoGlobal = NS_STATIC_CAST(nsIClassInfo *, this); } @@ -234,7 +233,6 @@ nsGenericModule::nsGenericModule(const char* moduleName, PRUint32 componentCount mCtor(ctor), mDtor(dtor) { - NS_INIT_ISUPPORTS(); } nsGenericModule::~nsGenericModule() diff --git a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp index 8a5ba84346f..988d90bd3e2 100755 --- a/mozilla/xpcom/io/nsAppFileLocationProvider.cpp +++ b/mozilla/xpcom/io/nsAppFileLocationProvider.cpp @@ -110,7 +110,6 @@ nsAppFileLocationProvider::nsAppFileLocationProvider() { - NS_INIT_ISUPPORTS(); } nsAppFileLocationProvider::~nsAppFileLocationProvider() @@ -453,7 +452,6 @@ class nsAppDirectoryEnumerator : public nsISimpleEnumerator mProvider(aProvider), mCurrentKey(aKeyList) { - NS_INIT_ISUPPORTS(); } NS_IMETHOD HasMoreElements(PRBool *result) diff --git a/mozilla/xpcom/io/nsBinaryStream.cpp b/mozilla/xpcom/io/nsBinaryStream.cpp index 894d5552df6..7ed1b20a4c6 100644 --- a/mozilla/xpcom/io/nsBinaryStream.cpp +++ b/mozilla/xpcom/io/nsBinaryStream.cpp @@ -44,7 +44,6 @@ nsBinaryOutputStream::nsBinaryOutputStream(nsIOutputStream* aStream) : mOutputStream(aStream), mBufferAccess(do_QueryInterface(aStream)) { - NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBinaryOutputStream, nsIBinaryOutputStream) @@ -274,7 +273,6 @@ nsBinaryInputStream::nsBinaryInputStream(nsIInputStream* aStream) : mInputStream(aStream), mBufferAccess(do_QueryInterface(aStream)) { - NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsBinaryInputStream, nsIBinaryInputStream) diff --git a/mozilla/xpcom/io/nsByteArrayInputStream.cpp b/mozilla/xpcom/io/nsByteArrayInputStream.cpp index 9bb8d16a548..05ac1ff165a 100644 --- a/mozilla/xpcom/io/nsByteArrayInputStream.cpp +++ b/mozilla/xpcom/io/nsByteArrayInputStream.cpp @@ -27,7 +27,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS2(nsByteArrayInputStream, nsIInputStream, nsIByteArr nsByteArrayInputStream::nsByteArrayInputStream (char *buffer, PRUint32 bytes) : _buffer (buffer), _nbytes (bytes), _pos (0) { - NS_INIT_ISUPPORTS (); } nsByteArrayInputStream::~nsByteArrayInputStream () diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp index 587c77cbe82..81070bb0418 100644 --- a/mozilla/xpcom/io/nsDirectoryService.cpp +++ b/mozilla/xpcom/io/nsDirectoryService.cpp @@ -420,7 +420,6 @@ nsDirectoryService* nsDirectoryService::mService = nsnull; nsDirectoryService::nsDirectoryService() { - NS_INIT_ISUPPORTS(); } NS_METHOD diff --git a/mozilla/xpcom/io/nsFastLoadService.cpp b/mozilla/xpcom/io/nsFastLoadService.cpp index 7631f5fc30f..e16b4de7d79 100644 --- a/mozilla/xpcom/io/nsFastLoadService.cpp +++ b/mozilla/xpcom/io/nsFastLoadService.cpp @@ -67,8 +67,6 @@ nsFastLoadService::nsFastLoadService() mFastLoadPtrMap(nsnull), mDirection(0) { - NS_INIT_ISUPPORTS(); - NS_ASSERTION(gFastLoadService_ == nsnull, "double FastLoadService init?"); gFastLoadService_ = this; } diff --git a/mozilla/xpcom/io/nsFileSpecImpl.cpp b/mozilla/xpcom/io/nsFileSpecImpl.cpp index 718a42cefad..b5f520ff2d5 100644 --- a/mozilla/xpcom/io/nsFileSpecImpl.cpp +++ b/mozilla/xpcom/io/nsFileSpecImpl.cpp @@ -61,7 +61,6 @@ nsFileSpecImpl::nsFileSpecImpl() : mInputStream(nsnull) , mOutputStream(nsnull) { - NS_INIT_ISUPPORTS(); // NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!"); } @@ -73,7 +72,6 @@ nsFileSpecImpl::nsFileSpecImpl(const nsFileSpec& inSpec) , mInputStream(nsnull) , mOutputStream(nsnull) { - NS_INIT_ISUPPORTS(); // NS_ASSERTION(0, "nsFileSpec is unsupported - use nsIFile!"); } @@ -727,7 +725,6 @@ nsDirectoryIteratorImpl::nsDirectoryIteratorImpl() //---------------------------------------------------------------------------------------- : mDirectoryIterator(nsnull) { - NS_INIT_ISUPPORTS(); } //---------------------------------------------------------------------------------------- diff --git a/mozilla/xpcom/io/nsIFileStream.cpp b/mozilla/xpcom/io/nsIFileStream.cpp index 42da714be1f..6702d6d8a91 100644 --- a/mozilla/xpcom/io/nsIFileStream.cpp +++ b/mozilla/xpcom/io/nsIFileStream.cpp @@ -140,8 +140,6 @@ FileImpl::FileImpl(PRFileDesc* inDesc) , mLength(-1) , mGotBuffers(PR_FALSE) { - NS_INIT_ISUPPORTS(); - mWriteCursor = nsnull; mWriteLimit = nsnull; } @@ -156,8 +154,6 @@ FileImpl::FileImpl(const nsFileSpec& inFile, int nsprMode, PRIntn accessMode) , mLength(-1) , mGotBuffers(PR_FALSE) { - NS_INIT_ISUPPORTS(); - mWriteCursor = nsnull; mWriteLimit = nsnull; diff --git a/mozilla/xpcom/io/nsInputStreamTee.cpp b/mozilla/xpcom/io/nsInputStreamTee.cpp index df993c4340f..8171c4ab935 100644 --- a/mozilla/xpcom/io/nsInputStreamTee.cpp +++ b/mozilla/xpcom/io/nsInputStreamTee.cpp @@ -66,7 +66,6 @@ private: nsInputStreamTee::nsInputStreamTee() { - NS_INIT_ISUPPORTS(); } nsInputStreamTee::~nsInputStreamTee() diff --git a/mozilla/xpcom/io/nsLocalFileMac.cpp b/mozilla/xpcom/io/nsLocalFileMac.cpp index 217d0384c1a..098fd8aa031 100644 --- a/mozilla/xpcom/io/nsLocalFileMac.cpp +++ b/mozilla/xpcom/io/nsLocalFileMac.cpp @@ -813,7 +813,6 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() { - NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFileMac* parent) @@ -919,8 +918,6 @@ nsLocalFile::nsLocalFile() : mType('TEXT'), mCreator(kDefaultCreator) { - NS_INIT_ISUPPORTS(); - ClearFSSpec(mSpec); ClearFSSpec(mTargetSpec); @@ -931,7 +928,6 @@ nsLocalFile::nsLocalFile() : nsLocalFile::nsLocalFile(const nsLocalFile& srcFile) { - NS_INIT_ISUPPORTS(); *this = srcFile; } @@ -945,8 +941,6 @@ nsLocalFile::nsLocalFile(const FSSpec& aSpec, const nsACString& aAppendedPath) : mType('TEXT'), mCreator(kDefaultCreator) { - NS_INIT_ISUPPORTS(); - ClearFSSpec(mTargetSpec); InitClassStatics(); diff --git a/mozilla/xpcom/io/nsLocalFileOS2.cpp b/mozilla/xpcom/io/nsLocalFileOS2.cpp index b58f423b747..f2f83c79431 100644 --- a/mozilla/xpcom/io/nsLocalFileOS2.cpp +++ b/mozilla/xpcom/io/nsLocalFileOS2.cpp @@ -147,7 +147,6 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() : mDir(nsnull) { - NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFile* parent) @@ -249,8 +248,6 @@ NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator) nsLocalFile::nsLocalFile() { - NS_INIT_ISUPPORTS(); - mLastResolution = PR_FALSE; mFollowSymlinks = PR_FALSE; MakeDirty(); diff --git a/mozilla/xpcom/io/nsLocalFileOSX.cpp b/mozilla/xpcom/io/nsLocalFileOSX.cpp index 9c2e32e8156..e391a9309a3 100644 --- a/mozilla/xpcom/io/nsLocalFileOSX.cpp +++ b/mozilla/xpcom/io/nsLocalFileOSX.cpp @@ -123,7 +123,6 @@ class nsDirEnumerator : public nsISimpleEnumerator mFSRefsArray(nsnull), mArrayCnt(0), mArrayIndex(0) { - NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFileMac* parent) @@ -322,8 +321,6 @@ nsLocalFile::nsLocalFile() : mIdentityDirty(PR_TRUE), mFollowLinksDirty(PR_TRUE) { - NS_INIT_ISUPPORTS(); - mFSRef = kInvalidFSRef; mTargetFSRef = kInvalidFSRef; } @@ -334,8 +331,6 @@ nsLocalFile::nsLocalFile(const FSRef& aFSRef, const nsAString& aRelativePath) : mIdentityDirty(PR_TRUE), mFollowLinksDirty(PR_TRUE) { - NS_INIT_ISUPPORTS(); - mTargetFSRef = kInvalidFSRef; if (aRelativePath.Length()) { @@ -361,7 +356,6 @@ nsLocalFile::nsLocalFile(const nsLocalFile& src) : mIdentityDirty(src.mIdentityDirty), mFollowLinksDirty(src.mFollowLinksDirty) { - NS_INIT_ISUPPORTS(); } nsLocalFile::~nsLocalFile() diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index 84a34c384c1..4a5bd2c2528 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -121,7 +121,6 @@ nsDirEnumeratorUnix::nsDirEnumeratorUnix() : mDir(nsnull), mEntry(nsnull) { - NS_INIT_ISUPPORTS(); } nsDirEnumeratorUnix::~nsDirEnumeratorUnix() @@ -201,7 +200,6 @@ nsDirEnumeratorUnix::GetNextEntry() nsLocalFile::nsLocalFile() : mHaveCachedStat(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsLocalFile::~nsLocalFile() diff --git a/mozilla/xpcom/io/nsLocalFileWin.cpp b/mozilla/xpcom/io/nsLocalFileWin.cpp index 2c97e80979e..f8ea6cb066d 100644 --- a/mozilla/xpcom/io/nsLocalFileWin.cpp +++ b/mozilla/xpcom/io/nsLocalFileWin.cpp @@ -286,7 +286,6 @@ class nsDirEnumerator : public nsISimpleEnumerator nsDirEnumerator() : mDir(nsnull) { - NS_INIT_ISUPPORTS(); } nsresult Init(nsILocalFile* parent) @@ -392,7 +391,6 @@ NS_IMPL_ISUPPORTS1(nsDirEnumerator, nsISimpleEnumerator); nsLocalFile::nsLocalFile() { - NS_INIT_ISUPPORTS(); mLastResolution = PR_FALSE; mFollowSymlinks = PR_FALSE; MakeDirty(); diff --git a/mozilla/xpcom/io/nsMultiplexInputStream.cpp b/mozilla/xpcom/io/nsMultiplexInputStream.cpp index 9b95d8beb00..d7c0b371617 100644 --- a/mozilla/xpcom/io/nsMultiplexInputStream.cpp +++ b/mozilla/xpcom/io/nsMultiplexInputStream.cpp @@ -89,7 +89,6 @@ nsMultiplexInputStream::nsMultiplexInputStream() : mCurrentStream(0), mStartedReadingCurrent(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsMultiplexInputStream::~nsMultiplexInputStream() diff --git a/mozilla/xpcom/io/nsPipe2.cpp b/mozilla/xpcom/io/nsPipe2.cpp index 6d10410cf4c..dffe9a28981 100644 --- a/mozilla/xpcom/io/nsPipe2.cpp +++ b/mozilla/xpcom/io/nsPipe2.cpp @@ -202,7 +202,6 @@ nsPipe::nsPipe() mWriteLimit(nsnull), mCondition(NS_OK) { - NS_INIT_ISUPPORTS(); } nsPipe::~nsPipe() diff --git a/mozilla/xpcom/io/nsScriptableInputStream.h b/mozilla/xpcom/io/nsScriptableInputStream.h index a7479cc97db..5305a98dcd3 100644 --- a/mozilla/xpcom/io/nsScriptableInputStream.h +++ b/mozilla/xpcom/io/nsScriptableInputStream.h @@ -57,7 +57,7 @@ public: NS_DECL_NSISCRIPTABLEINPUTSTREAM // nsScriptableInputStream methods - nsScriptableInputStream() { NS_INIT_ISUPPORTS(); }; + nsScriptableInputStream() {}; virtual ~nsScriptableInputStream() {}; static NS_METHOD diff --git a/mozilla/xpcom/io/nsStorageStream.cpp b/mozilla/xpcom/io/nsStorageStream.cpp index dcb1d1eb63c..0d950a1228f 100644 --- a/mozilla/xpcom/io/nsStorageStream.cpp +++ b/mozilla/xpcom/io/nsStorageStream.cpp @@ -57,8 +57,6 @@ nsStorageStream::nsStorageStream() : mSegmentedBuffer(0), mSegmentSize(0), mWriteInProgress(PR_FALSE), mLastSegmentNum(-1), mWriteCursor(0), mSegmentEnd(0), mLogicalLength(0) { - NS_INIT_ISUPPORTS(); - #if defined(PR_LOGGING) // // Initialize the global PRLogModule for socket transport logging @@ -321,7 +319,6 @@ public: mSegmentSize(aSegmentSize), mLogicalCursor(0) { NS_ADDREF(mStorageStream); - NS_INIT_ISUPPORTS(); } virtual ~nsStorageInputStream() diff --git a/mozilla/xpcom/io/nsStringStream.cpp b/mozilla/xpcom/io/nsStringStream.cpp index 63882d11167..bdc4d37c048 100644 --- a/mozilla/xpcom/io/nsStringStream.cpp +++ b/mozilla/xpcom/io/nsStringStream.cpp @@ -122,7 +122,6 @@ BasicStringImpl::BasicStringImpl() , mLastResult(NS_OK) , mEOF(PR_FALSE) { - NS_INIT_ISUPPORTS(); } //---------------------------------------------------------------------------------------- diff --git a/mozilla/xpcom/io/nsUnicharInputStream.cpp b/mozilla/xpcom/io/nsUnicharInputStream.cpp index 49c1385f02f..6e2779284b5 100644 --- a/mozilla/xpcom/io/nsUnicharInputStream.cpp +++ b/mozilla/xpcom/io/nsUnicharInputStream.cpp @@ -69,7 +69,6 @@ public: StringUnicharInputStream::StringUnicharInputStream(nsString* aString) { - NS_INIT_ISUPPORTS(); mString = aString; mPos = 0; mLen = aString->Length(); @@ -168,7 +167,6 @@ UTF8InputStream::UTF8InputStream() : mUnicharDataOffset(0), mUnicharDataLength(0) { - NS_INIT_ISUPPORTS(); } nsresult diff --git a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp index e17e9fec1e4..f20d613c04b 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEvent.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEvent.cpp @@ -264,8 +264,6 @@ nsProxyObject::nsProxyObject() } nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, nsISupports *realObject) { - NS_INIT_ISUPPORTS(); - mEventQService = do_GetService(kEventQueueServiceCID); mRealObject = realObject; @@ -276,8 +274,6 @@ nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, nsISup nsProxyObject::nsProxyObject(nsIEventQueue *destQueue, PRInt32 proxyType, const nsCID &aClass, nsISupports *aDelegate, const nsIID &aIID) { - NS_INIT_ISUPPORTS(); - mEventQService = do_GetService(kEventQueueServiceCID); nsComponentManager::CreateInstance(aClass, diff --git a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp index 43a0d63a7d7..bc7d949b664 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventClass.cpp @@ -159,7 +159,6 @@ nsProxyEventClass::nsProxyEventClass(REFNSIID aIID, nsIInterfaceInfo* aInfo) : mIID(aIID), mDescriptors(NULL) { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); mInfo = aInfo; diff --git a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp index d43664b41cf..9513c053158 100644 --- a/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyEventObject.cpp @@ -402,7 +402,6 @@ nsProxyEventObject::nsProxyEventObject(nsIEventQueue *destQueue, mRoot(root), mNext(nsnull) { - NS_INIT_ISUPPORTS(); NS_IF_ADDREF(mRoot); mProxyObject = new nsProxyObject(destQueue, proxyType, aObj); diff --git a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp index 89cd4b2bd1c..af0f6deabc1 100644 --- a/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp +++ b/mozilla/xpcom/proxy/src/nsProxyObjectManager.cpp @@ -80,7 +80,6 @@ class nsProxyCreateInstance : public nsIProxyCreateInstance nsProxyCreateInstance::nsProxyCreateInstance() { - NS_INIT_ISUPPORTS(); } nsProxyCreateInstance::~nsProxyCreateInstance() @@ -116,8 +115,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsProxyObjectManager, nsIProxyObjectManager) nsProxyObjectManager::nsProxyObjectManager() { - NS_INIT_ISUPPORTS(); - mProxyClassMap = new nsHashtable(256, PR_TRUE); mProxyObjectMap = new nsHashtable(256, PR_TRUE); diff --git a/mozilla/xpcom/proxy/tests/proxytests.cpp b/mozilla/xpcom/proxy/tests/proxytests.cpp index 20cc815e7cb..1c3be999889 100644 --- a/mozilla/xpcom/proxy/tests/proxytests.cpp +++ b/mozilla/xpcom/proxy/tests/proxytests.cpp @@ -73,7 +73,6 @@ class nsTestXPCFoo : public nsITestProxy nsTestXPCFoo::nsTestXPCFoo() { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -134,7 +133,6 @@ class nsTestXPCFoo2 : public nsITestProxy nsTestXPCFoo2::nsTestXPCFoo2() { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp b/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp index ea2a659766a..7bc8652d92a 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp +++ b/mozilla/xpcom/reflect/xptcall/tests/TestXPTCInvoke.cpp @@ -130,7 +130,6 @@ NS_IMPL_ISUPPORTS1(InvokeTestTarget, InvokeTestTargetInterface) InvokeTestTarget::InvokeTestTarget() { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -800,7 +799,6 @@ public: FooBarImpl::FooBarImpl() : MyName("FooBarImpl") { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } @@ -949,7 +947,6 @@ public: FooBarImpl2::FooBarImpl2() : value(0x12345678) { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); } diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp index 64639be5766..3dbe7058d95 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfo.cpp @@ -761,7 +761,6 @@ NS_IMPL_QUERY_INTERFACE1(xptiInterfaceInfo, nsIInterfaceInfo) xptiInterfaceInfo::xptiInterfaceInfo(xptiInterfaceEntry* entry) : mEntry(entry), mParent(nsnull) { - NS_INIT_ISUPPORTS(); LOG_INFO_CREATE(this); } diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp index 9a49b479f15..eb7a88d42d9 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiInterfaceInfoManager.cpp @@ -125,8 +125,6 @@ xptiInterfaceInfoManager::xptiInterfaceInfoManager(nsISupportsArray* aSearchPath mAdditionalManagersLock(PR_NewLock()), mSearchPath(aSearchPath) { - NS_INIT_ISUPPORTS(); - const char* statsFilename = PR_GetEnv("MOZILLA_XPTI_STATS"); if(statsFilename) { @@ -1991,7 +1989,6 @@ NS_IMPL_ISUPPORTS1(xptiAdditionalManagersEnumerator, nsISimpleEnumerator) xptiAdditionalManagersEnumerator::xptiAdditionalManagersEnumerator() : mIndex(0), mCount(0) { - NS_INIT_ISUPPORTS(); } PRBool xptiAdditionalManagersEnumerator::AppendElement(nsIInterfaceInfoManager* element) diff --git a/mozilla/xpcom/reflect/xptinfo/src/xptiprivate.h b/mozilla/xpcom/reflect/xptinfo/src/xptiprivate.h index 71279750366..2deb05cb8c9 100644 --- a/mozilla/xpcom/reflect/xptinfo/src/xptiprivate.h +++ b/mozilla/xpcom/reflect/xptinfo/src/xptiprivate.h @@ -787,7 +787,7 @@ public: xptiZipLoaderSink(xptiInterfaceInfoManager* aMgr, xptiWorkingSet* aWorkingSet) : mManager(aMgr), - mWorkingSet(aWorkingSet) { NS_INIT_ISUPPORTS(); } + mWorkingSet(aWorkingSet) {} virtual ~xptiZipLoaderSink() {}; NS_DECL_ISUPPORTS diff --git a/mozilla/xpcom/sample/nsSample.cpp b/mozilla/xpcom/sample/nsSample.cpp index b597bda40b2..d1ff93cf528 100644 --- a/mozilla/xpcom/sample/nsSample.cpp +++ b/mozilla/xpcom/sample/nsSample.cpp @@ -53,7 +53,6 @@ nsSampleImpl::nsSampleImpl() : mValue(nsnull) { - NS_INIT_ISUPPORTS(); mValue = (char*)nsMemory::Clone("initial value", 14); } diff --git a/mozilla/xpcom/tests/TestArray.cpp b/mozilla/xpcom/tests/TestArray.cpp index 579e566465b..14068cdd455 100644 --- a/mozilla/xpcom/tests/TestArray.cpp +++ b/mozilla/xpcom/tests/TestArray.cpp @@ -77,7 +77,6 @@ PRInt32 Foo::gCount; Foo::Foo(PRInt32 aID) { - NS_INIT_ISUPPORTS(); mID = aID; ++gCount; fprintf(stdout, "init: %d (%p), %d total)\n", mID, this, gCount); diff --git a/mozilla/xpcom/tests/TestBuffers.cpp b/mozilla/xpcom/tests/TestBuffers.cpp index b87dfdbd0b9..15693e8d99e 100644 --- a/mozilla/xpcom/tests/TestBuffers.cpp +++ b/mozilla/xpcom/tests/TestBuffers.cpp @@ -92,7 +92,6 @@ public: Reader(nsIBuffer* readBuffer) : mReadBuffer(readBuffer), mBytesRead(0), mDone(PR_FALSE) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mReadBuffer); } diff --git a/mozilla/xpcom/tests/TestFactory.cpp b/mozilla/xpcom/tests/TestFactory.cpp index 294a12e63d4..f89b0a0bda6 100644 --- a/mozilla/xpcom/tests/TestFactory.cpp +++ b/mozilla/xpcom/tests/TestFactory.cpp @@ -55,7 +55,6 @@ class TestClassImpl: public ITestClass { NS_DECL_ISUPPORTS public: TestClassImpl() { - NS_INIT_ISUPPORTS(); } void Test(); @@ -76,7 +75,6 @@ class TestFactory: public nsIFactory { public: TestFactory() { - NS_INIT_ISUPPORTS(); } NS_IMETHOD CreateInstance(nsISupports *aDelegate, diff --git a/mozilla/xpcom/tests/TestObserverService.cpp b/mozilla/xpcom/tests/TestObserverService.cpp index c38bf0bdcf5..794918da9cd 100644 --- a/mozilla/xpcom/tests/TestObserverService.cpp +++ b/mozilla/xpcom/tests/TestObserverService.cpp @@ -70,7 +70,6 @@ class TestObserver : public nsIObserver, public nsSupportsWeakReference { public: TestObserver( const nsAString &name ) : mName( name ) { - NS_INIT_ISUPPORTS(); } virtual ~TestObserver() {} NS_DECL_ISUPPORTS diff --git a/mozilla/xpcom/tests/TestPipes.cpp b/mozilla/xpcom/tests/TestPipes.cpp index 7ef372ce257..6522927607c 100644 --- a/mozilla/xpcom/tests/TestPipes.cpp +++ b/mozilla/xpcom/tests/TestPipes.cpp @@ -94,7 +94,6 @@ public: } nsReceiver(nsIInputStream* in) : mIn(in), mCount(0) { - NS_INIT_ISUPPORTS(); NS_ADDREF(in); } @@ -190,7 +189,6 @@ public: } nsShortReader(nsIInputStream* in) : mIn(in), mReceived(0) { - NS_INIT_ISUPPORTS(); NS_ADDREF(in); } @@ -296,7 +294,7 @@ public: return NS_OK; } - nsPipeObserver() { NS_INIT_ISUPPORTS(); } + nsPipeObserver() { } virtual ~nsPipeObserver() {} }; @@ -445,7 +443,6 @@ public: nsPump(nsIInputStream* in, nsIOutputStream* out) : mIn(in), mOut(out), mCount(0) { - NS_INIT_ISUPPORTS(); } virtual ~nsPump() { diff --git a/mozilla/xpcom/tests/TestThreads.cpp b/mozilla/xpcom/tests/TestThreads.cpp index 9d6371edf88..e0320733452 100644 --- a/mozilla/xpcom/tests/TestThreads.cpp +++ b/mozilla/xpcom/tests/TestThreads.cpp @@ -77,7 +77,6 @@ public: } nsConcurrentRunner(){ - NS_INIT_ISUPPORTS(); mTestInt = 0; } @@ -110,7 +109,6 @@ public: } nsRunner(int num) : mNum(num) { - NS_INIT_ISUPPORTS(); } protected: @@ -234,7 +232,6 @@ public: } nsStressRunner(int num) : mNum(num), mWasRun(PR_FALSE) { - NS_INIT_ISUPPORTS(); PR_AtomicIncrement(&gNum); } diff --git a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp index 7e1e74335cb..d60134ca99d 100644 --- a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp +++ b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp @@ -49,7 +49,6 @@ class TestDynamicClassImpl: public ITestClass { NS_DECL_ISUPPORTS TestDynamicClassImpl() { - NS_INIT_ISUPPORTS(); } void Test(); }; diff --git a/mozilla/xpcom/tests/services/MyService.cpp b/mozilla/xpcom/tests/services/MyService.cpp index aa24a3969c1..3a02acf0b32 100644 --- a/mozilla/xpcom/tests/services/MyService.cpp +++ b/mozilla/xpcom/tests/services/MyService.cpp @@ -63,7 +63,6 @@ NS_IMPL_ISUPPORTS1(MyService, IMyService); MyService::MyService() { - NS_INIT_ISUPPORTS(); printf(" creating my service\n"); } diff --git a/mozilla/xpcom/tests/windows/TestCOM.cpp b/mozilla/xpcom/tests/windows/TestCOM.cpp index 9b55530adfe..466f0a67ccd 100644 --- a/mozilla/xpcom/tests/windows/TestCOM.cpp +++ b/mozilla/xpcom/tests/windows/TestCOM.cpp @@ -65,7 +65,6 @@ class nsTestCom: public nsITestCom { public: nsTestCom() { - NS_INIT_ISUPPORTS(); } virtual ~nsTestCom() { cout << "nsTestCom instance successfully deleted\n"; @@ -102,7 +101,6 @@ class nsTestComFactory: public nsIFactory { NS_DECL_ISUPPORTS public: nsTestComFactory() { - NS_INIT_ISUPPORTS(); } NS_IMETHOD CreateInstance(nsISupports *aOuter, diff --git a/mozilla/xpcom/threads/TimerThread.cpp b/mozilla/xpcom/threads/TimerThread.cpp index 3f709550541..33094f5aaec 100644 --- a/mozilla/xpcom/threads/TimerThread.cpp +++ b/mozilla/xpcom/threads/TimerThread.cpp @@ -52,7 +52,6 @@ TimerThread::TimerThread() : mMinTimerPeriod(0), mTimeoutAdjustment(0) { - NS_INIT_ISUPPORTS(); } TimerThread::~TimerThread() diff --git a/mozilla/xpcom/threads/nsEventQueue.cpp b/mozilla/xpcom/threads/nsEventQueue.cpp index 6638abc5e86..86ba9e5049d 100644 --- a/mozilla/xpcom/threads/nsEventQueue.cpp +++ b/mozilla/xpcom/threads/nsEventQueue.cpp @@ -64,7 +64,6 @@ static const char gDestroyedNotification[] = "nsIEventQueueDestroyed"; nsEventQueueImpl::nsEventQueueImpl() { - NS_INIT_ISUPPORTS(); NS_ADDREF_THIS(); /* The slightly weird ownership model for eventqueues goes like this: diff --git a/mozilla/xpcom/threads/nsEventQueueService.cpp b/mozilla/xpcom/threads/nsEventQueueService.cpp index d56d54fd704..e20ccc4506a 100644 --- a/mozilla/xpcom/threads/nsEventQueueService.cpp +++ b/mozilla/xpcom/threads/nsEventQueueService.cpp @@ -68,8 +68,6 @@ static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); nsEventQueueServiceImpl::nsEventQueueServiceImpl() { - NS_INIT_ISUPPORTS(); - mEventQMonitor = PR_NewMonitor(); #if defined(PR_LOGGING) && defined(DEBUG_danm) if (!gEventQueueLog) diff --git a/mozilla/xpcom/threads/nsProcessCommon.cpp b/mozilla/xpcom/threads/nsProcessCommon.cpp index 74d2f7f5d36..1c064070486 100644 --- a/mozilla/xpcom/threads/nsProcessCommon.cpp +++ b/mozilla/xpcom/threads/nsProcessCommon.cpp @@ -57,7 +57,6 @@ NS_IMPL_ISUPPORTS1(nsProcess, nsIProcess) nsProcess::nsProcess():mExitValue(-1), mProcess(nsnull) { - NS_INIT_ISUPPORTS(); } nsProcess::~nsProcess() diff --git a/mozilla/xpcom/threads/nsProcessMac.cpp b/mozilla/xpcom/threads/nsProcessMac.cpp index 07277ba8baa..0e14d27caec 100644 --- a/mozilla/xpcom/threads/nsProcessMac.cpp +++ b/mozilla/xpcom/threads/nsProcessMac.cpp @@ -57,7 +57,6 @@ nsProcess::nsProcess() :mExitValue(-1), mProcess(nsnull) { - NS_INIT_ISUPPORTS(); } nsProcess::~nsProcess() diff --git a/mozilla/xpcom/threads/nsThread.cpp b/mozilla/xpcom/threads/nsThread.cpp index ed2e07cb501..54ca71c56ef 100644 --- a/mozilla/xpcom/threads/nsThread.cpp +++ b/mozilla/xpcom/threads/nsThread.cpp @@ -66,8 +66,6 @@ PRLogModuleInfo* nsIThreadLog = nsnull; nsThread::nsThread() : mThread(nsnull), mDead(PR_FALSE), mStartLock(nsnull) { - NS_INIT_ISUPPORTS(); - #if defined(PR_LOGGING) // // Initialize the global PRLogModule for nsIThread logging @@ -485,7 +483,6 @@ nsThreadPool::nsThreadPool() mPendingRequestsAtZero(nsnull), mMinThreads(0), mMaxThreads(0), mBusyThreads(0), mShuttingDown(PR_TRUE) { - NS_INIT_ISUPPORTS(); } nsThreadPool::~nsThreadPool() @@ -874,7 +871,6 @@ NS_NewThreadPool(nsIThreadPool* *result, nsThreadPoolRunnable::nsThreadPoolRunnable(nsThreadPool* pool) : mPool(pool) { - NS_INIT_ISUPPORTS(); } nsThreadPoolRunnable::~nsThreadPoolRunnable() diff --git a/mozilla/xpcom/threads/nsTimerImpl.cpp b/mozilla/xpcom/threads/nsTimerImpl.cpp index f3507d8a7db..9bf17a9c0f5 100644 --- a/mozilla/xpcom/threads/nsTimerImpl.cpp +++ b/mozilla/xpcom/threads/nsTimerImpl.cpp @@ -162,7 +162,6 @@ nsTimerImpl::nsTimerImpl() : mDelay(0), mTimeout(0) { - NS_INIT_ISUPPORTS(); nsIThread::GetCurrent(getter_AddRefs(mCallingThread)); static PRCallOnceType once; @@ -541,7 +540,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsTimerManager, nsITimerManager) nsTimerManager::nsTimerManager() { - NS_INIT_ISUPPORTS(); mLock = PR_NewLock(); gManager = this; } diff --git a/mozilla/xpcom/typelib/xpidl/xpidl_header.c b/mozilla/xpcom/typelib/xpidl/xpidl_header.c index 6a0a19ea1ee..2891c1d8edd 100644 --- a/mozilla/xpcom/typelib/xpidl/xpidl_header.c +++ b/mozilla/xpcom/typelib/xpidl/xpidl_header.c @@ -522,8 +522,6 @@ interface(TreeState *state) fprintf(state->file, "%s::%s()\n", classNameImpl, classNameImpl); fputs("{\n", state->file); write_indent(state->file); - fputs("NS_INIT_ISUPPORTS();\n", state->file); - write_indent(state->file); fputs("/* member initializers and constructor code */\n", state->file); fputs("}\n\n", state->file); diff --git a/mozilla/xpfe/appshell/src/nsAbout.h b/mozilla/xpfe/appshell/src/nsAbout.h index 4dbf5d12204..39fa1c0604b 100644 --- a/mozilla/xpfe/appshell/src/nsAbout.h +++ b/mozilla/xpfe/appshell/src/nsAbout.h @@ -48,7 +48,7 @@ public: NS_DECL_NSIABOUTMODULE - nsAbout() { NS_INIT_ISUPPORTS(); } + nsAbout() {} virtual ~nsAbout() {} static NS_METHOD diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index 2d359619ab4..376b4d402fc 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -109,7 +109,6 @@ nsAppShellService::nsAppShellService() : mShuttingDown(PR_FALSE), mAttemptingQuit(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsAppShellService::~nsAppShellService() diff --git a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp index 6ed6b0ebf51..21e9aec6494 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellWindowEnumerator.cpp @@ -213,8 +213,6 @@ nsAppShellWindowEnumerator::nsAppShellWindowEnumerator ( mWindowMediator(&aMediator), mType(aTypeString), mCurrentPosition(0) { - NS_INIT_ISUPPORTS(); - mWindowMediator->AddEnumerator(this); NS_ADDREF(mWindowMediator); } diff --git a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp index 1dd490d48eb..580545a1420 100644 --- a/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsChromeTreeOwner.cpp @@ -54,7 +54,6 @@ static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); nsChromeTreeOwner::nsChromeTreeOwner() : mXULWindow(nsnull) { - NS_INIT_ISUPPORTS(); } nsChromeTreeOwner::~nsChromeTreeOwner() diff --git a/mozilla/xpfe/appshell/src/nsCommandLineService.cpp b/mozilla/xpfe/appshell/src/nsCommandLineService.cpp index 38ffd39e11f..72f1741b289 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineService.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineService.cpp @@ -50,7 +50,6 @@ nsCmdLineService::nsCmdLineService() : mArgCount(0), mArgc(0), mArgv(0) { - NS_INIT_ISUPPORTS(); } /* diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp index c8be88e16ae..f76ada49f79 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -75,8 +75,6 @@ nsContentTreeOwner::nsContentTreeOwner(PRBool fPrimary) : mXULWindow(nsnull), mPrimary(fPrimary), mContentTitleSetting(PR_FALSE), mChromeFlags(nsIWebBrowserChrome::CHROME_ALL) { - NS_INIT_ISUPPORTS(); - // note if this fails, QI on nsIEmbeddingSiteWindow(2) will simply fail mSiteWindow2 = new nsSiteWindow2(this); } @@ -728,7 +726,6 @@ nsXULWindow* nsContentTreeOwner::XULWindow() nsSiteWindow2::nsSiteWindow2(nsContentTreeOwner *aAggregator) { - NS_INIT_ISUPPORTS(); mAggregator = aAggregator; } diff --git a/mozilla/xpfe/appshell/src/nsPreloader.cpp b/mozilla/xpfe/appshell/src/nsPreloader.cpp index a119035af63..d74c5933b2d 100644 --- a/mozilla/xpfe/appshell/src/nsPreloader.cpp +++ b/mozilla/xpfe/appshell/src/nsPreloader.cpp @@ -70,7 +70,6 @@ NS_IMPL_ISUPPORTS1(nsPreloader, nsICmdLineHandler) nsPreloader::nsPreloader() { - NS_INIT_ISUPPORTS(); } nsresult diff --git a/mozilla/xpfe/appshell/src/nsTimingService.h b/mozilla/xpfe/appshell/src/nsTimingService.h index 38f10564cd8..cc89a2899a2 100644 --- a/mozilla/xpfe/appshell/src/nsTimingService.h +++ b/mozilla/xpfe/appshell/src/nsTimingService.h @@ -48,7 +48,7 @@ class nsTimingService : public nsITimingService { public: - nsTimingService() { NS_INIT_ISUPPORTS();}; + nsTimingService() {}; virtual ~nsTimingService(); NS_DECL_ISUPPORTS diff --git a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp index 57d031707c4..1506787af54 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp @@ -44,7 +44,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/appshell/src/nsUserInfoOS2.cpp b/mozilla/xpfe/appshell/src/nsUserInfoOS2.cpp index 56b9963f77a..2f224ef8bcf 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoOS2.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoOS2.cpp @@ -33,7 +33,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp index 6c6a287575c..7b3a48c10fb 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoUnix.cpp @@ -57,7 +57,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/appshell/src/nsUserInfoWin.cpp b/mozilla/xpfe/appshell/src/nsUserInfoWin.cpp index e9c4b2c7e52..22bd3f6cb9f 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoWin.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoWin.cpp @@ -45,7 +45,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp index eab990a5879..6f90ce96591 100644 --- a/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsWebShellWindow.cpp @@ -199,8 +199,6 @@ struct nsWebShellInfo { nsWebShellWindow::nsWebShellWindow() : nsXULWindow() { - NS_INIT_ISUPPORTS(); - mWebShell = nsnull; mWindow = nsnull; mLockedUntilChromeLoad = PR_FALSE; diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp index a890fd5f8e1..59540aa1410 100644 --- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp +++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp @@ -109,8 +109,6 @@ nsWindowMediator::nsWindowMediator() : mEnumeratorList(), mOldestWindow(0), mTopmostWindow(0), mTimeStamp(0), mUpdateBatchNest(0), mListLock(0) { - NS_INIT_ISUPPORTS(); - // This should really be done in the static constructor fn. nsresult rv; rv = Init(); diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp index eb95d2e1fd0..63c0fa4e3b1 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp @@ -106,7 +106,6 @@ nsXULWindow::nsXULWindow() : mChromeTreeOwner(nsnull), mHadChildWindow(PR_FALSE), mZlevel(nsIXULWindow::normalZ), mContextFlags(0) { - NS_INIT_ISUPPORTS(); } nsXULWindow::~nsXULWindow() diff --git a/mozilla/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp b/mozilla/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp index 83ff10b760e..443cc5ab908 100644 --- a/mozilla/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp +++ b/mozilla/xpfe/bootstrap/appleevents/nsAppleEventsService.cpp @@ -42,7 +42,6 @@ nsAppleEventsService::nsAppleEventsService() { - NS_INIT_ISUPPORTS(); } nsAppleEventsService::~nsAppleEventsService() diff --git a/mozilla/xpfe/bootstrap/nsDocLoadObserver.cpp b/mozilla/xpfe/bootstrap/nsDocLoadObserver.cpp index 0a4c1752c6c..3fd011c8f09 100644 --- a/mozilla/xpfe/bootstrap/nsDocLoadObserver.cpp +++ b/mozilla/xpfe/bootstrap/nsDocLoadObserver.cpp @@ -50,7 +50,6 @@ nsDocLoadObserver::nsDocLoadObserver() : mRegistered(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsDocLoadObserver::~nsDocLoadObserver() diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp index 8c57fb7528b..aa50250ab03 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportBeOS.cpp @@ -75,7 +75,6 @@ private: nsSplashScreenBeOS::nsSplashScreenBeOS() : window( NULL ) , bitmap( NULL ), textView(NULL) { - NS_INIT_ISUPPORTS(); #ifdef DEBUG_SPLASH puts("nsSplashScreenBeOS::nsSlpashScreenBeOS()"); #endif diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportGtk.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportGtk.cpp index 933fc10c412..13ca16bcb85 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportGtk.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportGtk.cpp @@ -53,7 +53,6 @@ NS_IMPL_ISUPPORTS1(nsSplashScreenGtk, nsISplashScreen) nsSplashScreenGtk::nsSplashScreenGtk() { - NS_INIT_ISUPPORTS(); // if this fails, we exit gdk_init(0, NULL); } diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp index bd63a4817ce..3aa8802a7c4 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportMac.cpp @@ -115,7 +115,6 @@ protected: nsNativeAppSupportMac::nsNativeAppSupportMac() : mDialog(nsnull) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp index 0092f3f3ac7..8adb503ab23 100644 --- a/mozilla/xpfe/bootstrap/nsWindowCreator.cpp +++ b/mozilla/xpfe/bootstrap/nsWindowCreator.cpp @@ -80,7 +80,6 @@ static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); nsWindowCreator::nsWindowCreator() { - NS_INIT_ISUPPORTS(); } nsWindowCreator::~nsWindowCreator() { diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index bfdd50147ee..2ab49fbb371 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -155,7 +155,6 @@ public: PageCycler(nsBrowserInstance* appCore, const char *aTimeoutValue = nsnull, const char *aWaitValue = nsnull) : mAppCore(appCore), mBuffer(nsnull), mCursor(nsnull), mTimeoutValue(0), mWaitValue(1 /*sec*/) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mAppCore); if (aTimeoutValue){ mTimeoutValue = atol(aTimeoutValue); @@ -403,7 +402,6 @@ nsBrowserInstance::nsBrowserInstance() : mIsClosed(PR_FALSE) { mDOMWindow = nsnull; mContentAreaDocShellWeak = nsnull; - NS_INIT_ISUPPORTS(); } nsBrowserInstance::~nsBrowserInstance() @@ -653,7 +651,6 @@ NS_INTERFACE_MAP_END nsBrowserContentHandler::nsBrowserContentHandler() { - NS_INIT_ISUPPORTS(); } nsBrowserContentHandler::~nsBrowserContentHandler() diff --git a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp index 3cedb45459e..c31756e3963 100644 --- a/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserStatusFilter.cpp @@ -57,7 +57,6 @@ nsBrowserStatusFilter::nsBrowserStatusFilter() , mDelayedStatus(PR_FALSE) , mDelayedProgress(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsBrowserStatusFilter::~nsBrowserStatusFilter() diff --git a/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp b/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp index 55a7e7b7444..513860d9800 100644 --- a/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp +++ b/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp @@ -57,7 +57,6 @@ NS_INTERFACE_MAP_END_THREADSAFE nsAlertsService::nsAlertsService() { - NS_INIT_ISUPPORTS(); } nsAlertsService::~nsAlertsService() diff --git a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp index 000b986ca1d..b4f9b935834 100644 --- a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp +++ b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.cpp @@ -49,7 +49,6 @@ NS_IMPL_ISUPPORTS1(nsAutoCompleteItem, nsIAutoCompleteItem) nsAutoCompleteItem::nsAutoCompleteItem() { - NS_INIT_ISUPPORTS(); } nsAutoCompleteItem::~nsAutoCompleteItem() @@ -117,7 +116,6 @@ nsAutoCompleteResults::nsAutoCompleteResults() : mDefaultItemIndex(0) { NS_NewISupportsArray(getter_AddRefs(mItems)); - NS_INIT_ISUPPORTS(); } nsAutoCompleteResults::~nsAutoCompleteResults() diff --git a/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp b/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp index 196df924f40..d1a9aa551a7 100644 --- a/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp +++ b/mozilla/xpfe/components/autocomplete/src/nsLDAPAutoCompleteSession.cpp @@ -69,7 +69,6 @@ nsLDAPAutoCompleteSession::nsLDAPAutoCompleteSession() : mMaxHits(100), mMinStringLength(2), mCjkMinStringLength(0), mSearchAttrs(0), mSearchAttrsSize(0) { - NS_INIT_ISUPPORTS(); } nsLDAPAutoCompleteSession::~nsLDAPAutoCompleteSession() diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index e2b03e1e1ac..9f37e87f191 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -1699,7 +1699,6 @@ nsBookmarksService::nsBookmarksService() ,mIEFavoritesAvailable(PR_FALSE) #endif { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp index 09bc6dabd7a..cd175ed5cb4 100644 --- a/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp +++ b/mozilla/xpfe/components/directory/nsDirectoryViewer.cpp @@ -549,7 +549,6 @@ nsHTTPIndex::nsHTTPIndex() : mBindToGlobalObject(PR_TRUE), mRequestor(nsnull) { - NS_INIT_ISUPPORTS(); } @@ -557,7 +556,6 @@ nsHTTPIndex::nsHTTPIndex(nsIInterfaceRequestor* aRequestor) : mBindToGlobalObject(PR_TRUE), mRequestor(aRequestor) { - NS_INIT_ISUPPORTS(); } @@ -1325,7 +1323,6 @@ nsHTTPIndex::GetAllCmds(nsIRDFResource *aSource, nsISimpleEnumerator **_retval) // nsDirectoryViewerFactory::nsDirectoryViewerFactory() { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp index 6b2926857d3..47d95043df0 100644 --- a/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp +++ b/mozilla/xpfe/components/download-manager/src/nsDownloadManager.cpp @@ -91,7 +91,6 @@ NS_IMPL_ISUPPORTS3(nsDownloadManager, nsIDownloadManager, nsIDOMEventListener, n nsDownloadManager::nsDownloadManager() : mBatches(0) { - NS_INIT_ISUPPORTS(); } nsDownloadManager::~nsDownloadManager() @@ -889,7 +888,6 @@ nsDownload::nsDownload():mDownloadState(NOTSTARTED), mStartTime(0), mLastUpdate(-500) { - NS_INIT_ISUPPORTS(); } nsDownload::~nsDownload() diff --git a/mozilla/xpfe/components/download-manager/src/nsDownloadProxy.h b/mozilla/xpfe/components/download-manager/src/nsDownloadProxy.h index 404af0eda60..abcaa3315f3 100644 --- a/mozilla/xpfe/components/download-manager/src/nsDownloadProxy.h +++ b/mozilla/xpfe/components/download-manager/src/nsDownloadProxy.h @@ -52,7 +52,7 @@ class nsDownloadProxy : public nsIDownload, { public: - nsDownloadProxy() { NS_INIT_ISUPPORTS(); } + nsDownloadProxy() { } virtual ~nsDownloadProxy() { }; NS_DECL_ISUPPORTS diff --git a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp index 686acf9170e..16a5e97a6d9 100644 --- a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp +++ b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp @@ -119,7 +119,6 @@ nsFileView::nsFileView() : mDirectoryFilter(PR_FALSE), mReverseSort(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsFileView::~nsFileView() diff --git a/mozilla/xpfe/components/find/src/nsFindService.cpp b/mozilla/xpfe/components/find/src/nsFindService.cpp index 4010234f8b0..35bbe22ae52 100644 --- a/mozilla/xpfe/components/find/src/nsFindService.cpp +++ b/mozilla/xpfe/components/find/src/nsFindService.cpp @@ -52,7 +52,6 @@ nsFindService::nsFindService() , mEntireWord(PR_FALSE) , mMatchCase(PR_FALSE) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp index ca20b626cb5..af5b606c125 100644 --- a/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ b/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -404,7 +404,6 @@ nsMdbTableEnumerator::nsMdbTableEnumerator() mCursor(nsnull), mCurrent(nsnull) { - NS_INIT_ISUPPORTS(); } @@ -518,7 +517,6 @@ nsGlobalHistory::nsGlobalHistory() mStore(nsnull), mTable(nsnull) { - NS_INIT_ISUPPORTS(); LL_I2L(mFileSizeOnDisk, 0); // commonly used prefixes that should be chopped off all diff --git a/mozilla/xpfe/components/history/src/nsHistoryLoadListener.cpp b/mozilla/xpfe/components/history/src/nsHistoryLoadListener.cpp index bb021143727..ac5a068e71b 100644 --- a/mozilla/xpfe/components/history/src/nsHistoryLoadListener.cpp +++ b/mozilla/xpfe/components/history/src/nsHistoryLoadListener.cpp @@ -46,7 +46,6 @@ static NS_DEFINE_IID(kDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID); nsHistoryLoadListener::nsHistoryLoadListener(nsIBrowserHistory *aHistory) { - NS_INIT_ISUPPORTS(); mHistory = aHistory; printf("Creating nsHistoryLoadListener\n"); } diff --git a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp index 186bbfdb5d8..a11db2115cf 100644 --- a/mozilla/xpfe/components/intl/nsCharsetMenu.cpp +++ b/mozilla/xpfe/components/intl/nsCharsetMenu.cpp @@ -346,7 +346,6 @@ public: nsCharsetMenuObserver(nsCharsetMenu * menu) : mCharsetMenu(menu) { - NS_INIT_ISUPPORTS(); } virtual ~nsCharsetMenuObserver() {} @@ -445,7 +444,6 @@ nsCharsetMenu::nsCharsetMenu() mAutoDetectInitialized(PR_FALSE), mOthersInitialized(PR_FALSE) { - NS_INIT_ISUPPORTS(); NS_TIMELINE_START_TIMER("nsCharsetMenu::nsCharsetMenu"); nsresult res = NS_OK; diff --git a/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp b/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp index 4e60814c433..8f43de3ff8c 100644 --- a/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp +++ b/mozilla/xpfe/components/intl/nsFontPackageHandler.cpp @@ -66,7 +66,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsFontPackageHandler, nsIFontPackageHandler) nsFontPackageHandler::nsFontPackageHandler() { - NS_INIT_ISUPPORTS(); } nsFontPackageHandler::~nsFontPackageHandler() diff --git a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp index 4b569bf9fb9..bdf59e769d7 100644 --- a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp +++ b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp @@ -78,7 +78,6 @@ nsIRDFLiteral* nsRegistryDataSource::kBinaryLiteral; nsRegistryDataSource::nsRegistryDataSource() { - NS_INIT_ISUPPORTS(); } @@ -692,7 +691,6 @@ nsRegistryDataSource::SubkeyEnumerator::SubkeyEnumerator(nsRegistryDataSource* a mRootKey(aRootKey), mStarted(PR_FALSE) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mViewer); } diff --git a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp index 83dfb60c180..7f193c6834c 100644 --- a/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp +++ b/mozilla/xpfe/components/related/src/nsRelatedLinksHandler.cpp @@ -178,7 +178,6 @@ NS_NewRelatedLinksStreamListener(nsIRDFDataSource* aDataSource, RelatedLinksStreamListener::RelatedLinksStreamListener(nsIRDFDataSource *aDataSource) : mDataSource(dont_QueryInterface(aDataSource)) { - NS_INIT_ISUPPORTS(); } @@ -584,7 +583,6 @@ RelatedLinksStreamListener::Unescape(nsString &text) RelatedLinksHandlerImpl::RelatedLinksHandlerImpl() : mRelatedLinksURL(nsnull) { - NS_INIT_ISUPPORTS(); } diff --git a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp index d3b3712077c..7ffd6251e05 100755 --- a/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsInternetSearchService.cpp @@ -193,7 +193,6 @@ InternetSearchContext::InternetSearchContext(PRUint32 contextType, nsIRDFResourc nsIUnicodeDecoder *aUnicodeDecoder, const PRUnichar *hint) : mContextType(contextType), mParent(aParent), mEngine(aEngine), mUnicodeDecoder(aUnicodeDecoder), mHint(hint) { - NS_INIT_ISUPPORTS(); } @@ -422,8 +421,6 @@ nsIRDFResource *InternetSearchDataSource::kNC_SearchCommand_ClearFilters; nsIRDFLiteral *InternetSearchDataSource::kTrueLiteral; InternetSearchDataSource::InternetSearchDataSource(void) { - NS_INIT_ISUPPORTS(); - if (gRefCnt++ == 0) { nsresult rv = nsServiceManager::GetService(kRDFServiceCID, diff --git a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp index 5824b17f3b3..4ebcfa55457 100755 --- a/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp +++ b/mozilla/xpfe/components/search/src/nsLocalSearchService.cpp @@ -94,8 +94,6 @@ nsIRDFResource *LocalSearchDataSource::kRDF_type; LocalSearchDataSource::LocalSearchDataSource(void) { - NS_INIT_ISUPPORTS(); - if (gRefCnt++ == 0) { nsresult rv = nsServiceManager::GetService(kRDFServiceCID, diff --git a/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp b/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp index d01dbecaf9a..0908c5a058d 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHEntry.cpp @@ -33,7 +33,6 @@ PRUint32 gEntryID=0; nsSHEntry::nsSHEntry() { - NS_INIT_ISUPPORTS(); mParent = nsnull; mID = gEntryID++; } diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp index 38ffd39e11f..72f1741b289 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineService.cpp @@ -50,7 +50,6 @@ nsCmdLineService::nsCmdLineService() : mArgCount(0), mArgc(0), mArgv(0) { - NS_INIT_ISUPPORTS(); } /* diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp index 57d031707c4..1506787af54 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp @@ -44,7 +44,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoOS2.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoOS2.cpp index 56b9963f77a..2f224ef8bcf 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoOS2.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoOS2.cpp @@ -33,7 +33,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp index 6c6a287575c..7b3a48c10fb 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoUnix.cpp @@ -57,7 +57,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo() diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoWin.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoWin.cpp index e9c4b2c7e52..22bd3f6cb9f 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoWin.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoWin.cpp @@ -45,7 +45,6 @@ nsUserInfo::nsUserInfo() { - NS_INIT_ISUPPORTS(); } nsUserInfo::~nsUserInfo()