diff --git a/mozilla/camino/src/application/AppDirServiceProvider.cpp b/mozilla/camino/src/application/AppDirServiceProvider.cpp index 11cc36f8af7..ff11116535b 100644 --- a/mozilla/camino/src/application/AppDirServiceProvider.cpp +++ b/mozilla/camino/src/application/AppDirServiceProvider.cpp @@ -53,7 +53,6 @@ AppDirServiceProvider::AppDirServiceProvider(const nsACString& productDirName) { - NS_INIT_ISUPPORTS(); mProductDirName.Assign(productDirName); } diff --git a/mozilla/camino/src/application/JSConsole.mm b/mozilla/camino/src/application/JSConsole.mm index 66b1a0365f5..115bb99b52c 100644 --- a/mozilla/camino/src/application/JSConsole.mm +++ b/mozilla/camino/src/application/JSConsole.mm @@ -66,7 +66,6 @@ NS_IMPL_ISUPPORTS1(nsConsoleListener, nsIConsoleListener) nsConsoleListener::nsConsoleListener() { - NS_INIT_ISUPPORTS(); } nsConsoleListener::~nsConsoleListener() diff --git a/mozilla/camino/src/browser/CocoaPromptService.mm b/mozilla/camino/src/browser/CocoaPromptService.mm index da215b67be5..006600a29ef 100644 --- a/mozilla/camino/src/browser/CocoaPromptService.mm +++ b/mozilla/camino/src/browser/CocoaPromptService.mm @@ -50,7 +50,6 @@ CocoaPromptService::CocoaPromptService() { - NS_INIT_ISUPPORTS(); } CocoaPromptService::~CocoaPromptService() diff --git a/mozilla/camino/src/browser/ContentClickListener.mm b/mozilla/camino/src/browser/ContentClickListener.mm index 860d4960731..011bef8b907 100644 --- a/mozilla/camino/src/browser/ContentClickListener.mm +++ b/mozilla/camino/src/browser/ContentClickListener.mm @@ -58,7 +58,6 @@ NS_IMPL_ISUPPORTS2(ContentClickListener, nsIDOMMouseListener, nsIDOMEventListene ContentClickListener::ContentClickListener(id aBrowserController) :mBrowserController(aBrowserController) { - NS_INIT_ISUPPORTS(); } ContentClickListener::~ContentClickListener() diff --git a/mozilla/camino/src/browser/RemoteDataProvider.mm b/mozilla/camino/src/browser/RemoteDataProvider.mm index 1faf3319b57..5d87aacae6c 100644 --- a/mozilla/camino/src/browser/RemoteDataProvider.mm +++ b/mozilla/camino/src/browser/RemoteDataProvider.mm @@ -65,7 +65,6 @@ public: , mUserData(inUserData) , mURI(inURI) { - NS_INIT_ISUPPORTS(); [mLoadListener retain]; } @@ -129,7 +128,6 @@ protected: RemoteURILoadManager::RemoteURILoadManager() { - NS_INIT_ISUPPORTS(); } RemoteURILoadManager::~RemoteURILoadManager() diff --git a/mozilla/camino/src/browser/SecurityDialogs.mm b/mozilla/camino/src/browser/SecurityDialogs.mm index 2d8c345026e..b6fb52f62b9 100644 --- a/mozilla/camino/src/browser/SecurityDialogs.mm +++ b/mozilla/camino/src/browser/SecurityDialogs.mm @@ -50,7 +50,6 @@ SecurityDialogs::SecurityDialogs() { - NS_INIT_ISUPPORTS(); } SecurityDialogs::~SecurityDialogs() diff --git a/mozilla/camino/src/download/SaveHeaderSniffer.mm b/mozilla/camino/src/download/SaveHeaderSniffer.mm index 3d55034955b..7e0d2434993 100644 --- a/mozilla/camino/src/download/SaveHeaderSniffer.mm +++ b/mozilla/camino/src/download/SaveHeaderSniffer.mm @@ -70,7 +70,6 @@ nsHeaderSniffer::nsHeaderSniffer(nsIWebBrowserPersist* aPersist, nsIFile* aFile, , mBypassCache(aBypassCache) , mFilterView(aFilterView) { - NS_INIT_ISUPPORTS(); } nsHeaderSniffer::~nsHeaderSniffer() diff --git a/mozilla/camino/src/embedding/CHBrowserListener.mm b/mozilla/camino/src/embedding/CHBrowserListener.mm index 58681e5b4ca..c5c22a0f68c 100644 --- a/mozilla/camino/src/embedding/CHBrowserListener.mm +++ b/mozilla/camino/src/embedding/CHBrowserListener.mm @@ -61,7 +61,6 @@ CHBrowserListener::CHBrowserListener(CHBrowserView* aView) : mView(aView), mContainer(nsnull), mIsModal(PR_FALSE), mChromeFlags(0) { - NS_INIT_ISUPPORTS(); mListeners = [[NSMutableArray alloc] init]; } diff --git a/mozilla/camino/src/embedding/CHClickListener.mm b/mozilla/camino/src/embedding/CHClickListener.mm index 6096ce997e7..d66dd08b113 100644 --- a/mozilla/camino/src/embedding/CHClickListener.mm +++ b/mozilla/camino/src/embedding/CHClickListener.mm @@ -106,7 +106,6 @@ NS_IMPL_ISUPPORTS2(CHClickListener, nsIDOMMouseListener, nsIDOMEventListener) CHClickListener::CHClickListener() { - NS_INIT_ISUPPORTS(); } CHClickListener::~CHClickListener() diff --git a/mozilla/camino/src/embedding/CHDownloadFactories.mm b/mozilla/camino/src/embedding/CHDownloadFactories.mm index ff0a00b0fd0..9fd64d80161 100644 --- a/mozilla/camino/src/embedding/CHDownloadFactories.mm +++ b/mozilla/camino/src/embedding/CHDownloadFactories.mm @@ -67,7 +67,6 @@ protected: DownloadListenerFactory::DownloadListenerFactory() : mControllerFactory(nil) { - NS_INIT_ISUPPORTS(); mControllerFactory = [[ChimeraDownloadControllerFactory alloc] init]; } diff --git a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm index fe2ab4bb6ab..5afa48489e7 100644 --- a/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm +++ b/mozilla/camino/src/embedding/CHDownloadProgressDisplay.mm @@ -45,7 +45,6 @@ CHDownloader::CHDownloader() , mDownloadDisplay(nil) , mIsFileSave(PR_FALSE) { - NS_INIT_ISUPPORTS(); } CHDownloader::~CHDownloader() diff --git a/mozilla/camino/src/history/HistoryDataSource.mm b/mozilla/camino/src/history/HistoryDataSource.mm index 6c0aac4ff10..1aae4770f37 100644 --- a/mozilla/camino/src/history/HistoryDataSource.mm +++ b/mozilla/camino/src/history/HistoryDataSource.mm @@ -68,7 +68,6 @@ public: HistoryRDFObserver(HistoryDataSource* dataSource) : mHistoryDataSource(dataSource) { - NS_INIT_ISUPPORTS(); } virtual ~HistoryRDFObserver() { } diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserListener.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserListener.mm index 4f55b87ccac..436dae5a5e1 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserListener.mm +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserListener.mm @@ -59,7 +59,6 @@ CHBrowserListener::CHBrowserListener(CHBrowserView* aView) : mView(aView), mContainer(nsnull), mIsModal(PR_FALSE), mChromeFlags(0) { - NS_INIT_ISUPPORTS(); mListeners = [[NSMutableArray alloc] init]; } diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm index 40c675d9c7e..fd659b35f12 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm @@ -63,7 +63,6 @@ PRBool CHBrowserService::sCanTerminate = PR_FALSE; // CHBrowserService implementation CHBrowserService::CHBrowserService() { - NS_INIT_ISUPPORTS(); } CHBrowserService::~CHBrowserService() diff --git a/mozilla/embedding/browser/cocoa/src/CHClickListener.mm b/mozilla/embedding/browser/cocoa/src/CHClickListener.mm index a8ef0a0d57f..da70b3cd326 100644 --- a/mozilla/embedding/browser/cocoa/src/CHClickListener.mm +++ b/mozilla/embedding/browser/cocoa/src/CHClickListener.mm @@ -108,7 +108,6 @@ NS_IMPL_ISUPPORTS2(CHClickListener, nsIDOMMouseListener, nsIDOMEventListener) CHClickListener::CHClickListener() { - NS_INIT_ISUPPORTS(); } CHClickListener::~CHClickListener() diff --git a/mozilla/embedding/browser/cocoa/src/CHDownloadFactories.mm b/mozilla/embedding/browser/cocoa/src/CHDownloadFactories.mm index 07fc6dcd7e5..85541235abb 100644 --- a/mozilla/embedding/browser/cocoa/src/CHDownloadFactories.mm +++ b/mozilla/embedding/browser/cocoa/src/CHDownloadFactories.mm @@ -69,7 +69,6 @@ protected: DownloadListenerFactory::DownloadListenerFactory() : mControllerFactory(nil) { - NS_INIT_ISUPPORTS(); mControllerFactory = [[ChimeraDownloadControllerFactory alloc] init]; } diff --git a/mozilla/embedding/browser/cocoa/src/CHDownloadProgressDisplay.mm b/mozilla/embedding/browser/cocoa/src/CHDownloadProgressDisplay.mm index f33349c987c..597c70187a7 100644 --- a/mozilla/embedding/browser/cocoa/src/CHDownloadProgressDisplay.mm +++ b/mozilla/embedding/browser/cocoa/src/CHDownloadProgressDisplay.mm @@ -57,7 +57,6 @@ CHDownloader::CHDownloader(DownloadControllerFactory* inControllerFactory) , mDownloadDisplay(nil) , mIsFileSave(PR_FALSE) { - NS_INIT_ISUPPORTS(); [mControllerFactory retain]; } diff --git a/mozilla/embedding/browser/cocoa/src/SaveHeaderSniffer.mm b/mozilla/embedding/browser/cocoa/src/SaveHeaderSniffer.mm index de5c7f4c5f8..2b90f513d36 100644 --- a/mozilla/embedding/browser/cocoa/src/SaveHeaderSniffer.mm +++ b/mozilla/embedding/browser/cocoa/src/SaveHeaderSniffer.mm @@ -66,7 +66,6 @@ nsHeaderSniffer::nsHeaderSniffer(nsIWebBrowserPersist* aPersist, nsIFile* aFile, , mFilterView(aFilterView) , mFilterList(aFilterList) { - NS_INIT_ISUPPORTS(); } nsHeaderSniffer::~nsHeaderSniffer() diff --git a/mozilla/embedding/browser/photon/src/EmbedEventListener.cpp b/mozilla/embedding/browser/photon/src/EmbedEventListener.cpp index 3f7a6e38fb2..1da6171c7e8 100644 --- a/mozilla/embedding/browser/photon/src/EmbedEventListener.cpp +++ b/mozilla/embedding/browser/photon/src/EmbedEventListener.cpp @@ -30,7 +30,6 @@ EmbedEventListener::EmbedEventListener(void) { - NS_INIT_ISUPPORTS(); mOwner = nsnull; } diff --git a/mozilla/embedding/browser/photon/src/EmbedProgress.cpp b/mozilla/embedding/browser/photon/src/EmbedProgress.cpp index 9ae3977cd7c..e40e2640024 100644 --- a/mozilla/embedding/browser/photon/src/EmbedProgress.cpp +++ b/mozilla/embedding/browser/photon/src/EmbedProgress.cpp @@ -47,7 +47,6 @@ EmbedProgress::EmbedProgress(void) { - NS_INIT_ISUPPORTS(); mOwner = nsnull; mSkipOnState = mDownloadDocument = 0; } diff --git a/mozilla/embedding/browser/photon/src/EmbedStream.cpp b/mozilla/embedding/browser/photon/src/EmbedStream.cpp index 2afcd90ad04..787dd619b0d 100644 --- a/mozilla/embedding/browser/photon/src/EmbedStream.cpp +++ b/mozilla/embedding/browser/photon/src/EmbedStream.cpp @@ -41,7 +41,6 @@ NS_IMPL_ISUPPORTS1(EmbedStream, nsIInputStream) EmbedStream::EmbedStream() { - NS_INIT_ISUPPORTS(); mOwner = nsnull; mOffset = 0; mDoingStream = PR_FALSE; diff --git a/mozilla/embedding/browser/photon/src/EmbedWindow.cpp b/mozilla/embedding/browser/photon/src/EmbedWindow.cpp index 02b9243378f..3d18d728a5c 100644 --- a/mozilla/embedding/browser/photon/src/EmbedWindow.cpp +++ b/mozilla/embedding/browser/photon/src/EmbedWindow.cpp @@ -51,7 +51,6 @@ PtWidget_t *EmbedWindow::sTipWindow = nsnull; EmbedWindow::EmbedWindow(void) { - NS_INIT_ISUPPORTS(); mOwner = nsnull; mVisibility = PR_FALSE; mIsModal = PR_FALSE; diff --git a/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp b/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp index e6c4f504a1f..fa166fedfbf 100644 --- a/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp +++ b/mozilla/embedding/browser/photon/src/EmbedWindowCreator.cpp @@ -29,7 +29,6 @@ EmbedWindowCreator::EmbedWindowCreator(void) { - NS_INIT_ISUPPORTS(); } EmbedWindowCreator::~EmbedWindowCreator() diff --git a/mozilla/embedding/browser/photon/src/PromptService.cpp b/mozilla/embedding/browser/photon/src/PromptService.cpp index b44631973c7..f4d23ccb493 100644 --- a/mozilla/embedding/browser/photon/src/PromptService.cpp +++ b/mozilla/embedding/browser/photon/src/PromptService.cpp @@ -84,7 +84,6 @@ NS_IMPL_ISUPPORTS2(CPromptService, nsIPromptService, nsPIPromptService) CPromptService::CPromptService() : mWWatch(do_GetService("@mozilla.org/embedcomp/window-watcher;1")) { - NS_INIT_ISUPPORTS(); } CPromptService::~CPromptService() { @@ -386,7 +385,6 @@ NS_IMPL_ISUPPORTS1(CPromptServiceFactory, nsIFactory) CPromptServiceFactory::CPromptServiceFactory() { - NS_INIT_ISUPPORTS(); } CPromptServiceFactory::~CPromptServiceFactory() { diff --git a/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp b/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp index a995963fecf..94987164922 100644 --- a/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp +++ b/mozilla/embedding/browser/photon/src/nsPrintSettingsImpl.cpp @@ -66,8 +66,6 @@ nsPrintSettings::nsPrintSettings() : mPrintPageDelay(500), mPrintSilent(PR_FALSE) { - NS_INIT_ISUPPORTS(); - /* member initializers and constructor code */ nscoord halfInch = NS_INCHES_TO_TWIPS(0.5); mMargin.SizeTo(halfInch, halfInch, halfInch, halfInch); diff --git a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp index cb600c9b513..4a44f05d533 100644 --- a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp @@ -53,7 +53,6 @@ #include nsUnknownContentTypeHandler::nsUnknownContentTypeHandler( ) { - NS_INIT_ISUPPORTS(); } nsUnknownContentTypeHandler::~nsUnknownContentTypeHandler( ) { } @@ -153,7 +152,6 @@ PtWidget_t *nsUnknownContentTypeHandler::GetWebBrowser(nsIDOMWindow *aWindow) NS_IMPL_ISUPPORTS2(nsWebProgressListener, nsIWebProgressListener, nsISupportsWeakReference) nsWebProgressListener::nsWebProgressListener() { - NS_INIT_ISUPPORTS(); } nsWebProgressListener::~nsWebProgressListener() { } diff --git a/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp b/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp index 975a576edbd..2e38e57fea9 100644 --- a/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp +++ b/mozilla/extensions/layout-debug/src/nsLayoutDebuggingTools.cpp @@ -137,8 +137,6 @@ nsLayoutDebuggingTools::nsLayoutDebuggingTools() mCrossingEventDumping(PR_FALSE), mReflowCounts(PR_FALSE) { - NS_INIT_ISUPPORTS(); - NewURILoaded(); } diff --git a/mozilla/extensions/p3p/src/nsPolicyReference.cpp b/mozilla/extensions/p3p/src/nsPolicyReference.cpp index 480587a315b..0406bb963e8 100755 --- a/mozilla/extensions/p3p/src/nsPolicyReference.cpp +++ b/mozilla/extensions/p3p/src/nsPolicyReference.cpp @@ -78,7 +78,6 @@ nsPolicyReference::nsPolicyReference() : mFlags (0), mError (0) { - NS_INIT_ISUPPORTS(); } nsPolicyReference::~nsPolicyReference() diff --git a/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp b/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp index a525807d2dc..522382a46d8 100644 --- a/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp +++ b/mozilla/extensions/spellcheck/myspell/src/mozMySpell.cpp @@ -73,7 +73,6 @@ const PRInt32 kFirstDirSize=8; mozMySpell::mozMySpell() { - NS_INIT_ISUPPORTS(); } mozMySpell::~mozMySpell() diff --git a/mozilla/extensions/spellcheck/src/mozGenericWordUtils.cpp b/mozilla/extensions/spellcheck/src/mozGenericWordUtils.cpp index 5bc32b9a3bd..ad795891852 100644 --- a/mozilla/extensions/spellcheck/src/mozGenericWordUtils.cpp +++ b/mozilla/extensions/spellcheck/src/mozGenericWordUtils.cpp @@ -42,7 +42,6 @@ NS_IMPL_ISUPPORTS1(mozGenericWordUtils, mozISpellI18NUtil) mozGenericWordUtils::mozGenericWordUtils() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/mozilla/extensions/spellcheck/src/mozSpellChecker.cpp b/mozilla/extensions/spellcheck/src/mozSpellChecker.cpp index ddd2bc7dbe3..62de8346b3b 100644 --- a/mozilla/extensions/spellcheck/src/mozSpellChecker.cpp +++ b/mozilla/extensions/spellcheck/src/mozSpellChecker.cpp @@ -44,7 +44,6 @@ NS_IMPL_ISUPPORTS1(mozSpellChecker, nsISpellChecker) mozSpellChecker::mozSpellChecker() { - NS_INIT_ISUPPORTS(); mDictionaryName.SetLength(0); nsresult rv; diff --git a/mozilla/extensions/spellcheck/src/mozSpellI18NManager.cpp b/mozilla/extensions/spellcheck/src/mozSpellI18NManager.cpp index 7f7aa3b8c0c..a60545cf4dd 100644 --- a/mozilla/extensions/spellcheck/src/mozSpellI18NManager.cpp +++ b/mozilla/extensions/spellcheck/src/mozSpellI18NManager.cpp @@ -44,7 +44,6 @@ NS_IMPL_ISUPPORTS1(mozSpellI18NManager, mozISpellI18NManager) mozSpellI18NManager::mozSpellI18NManager() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/mozilla/extensions/sql/base/src/mozSqlConnection.cpp b/mozilla/extensions/sql/base/src/mozSqlConnection.cpp index 14e3b03ece5..dea0422cdaa 100644 --- a/mozilla/extensions/sql/base/src/mozSqlConnection.cpp +++ b/mozilla/extensions/sql/base/src/mozSqlConnection.cpp @@ -9,7 +9,6 @@ mozSqlConnection::mozSqlConnection() mShutdown(PR_FALSE), mWaiting(PR_FALSE) { - NS_INIT_ISUPPORTS(); mExecLock = PR_NewLock(); } diff --git a/mozilla/extensions/sql/base/src/mozSqlRequest.cpp b/mozilla/extensions/sql/base/src/mozSqlRequest.cpp index 6a84819761f..a7bedd37bbb 100644 --- a/mozilla/extensions/sql/base/src/mozSqlRequest.cpp +++ b/mozilla/extensions/sql/base/src/mozSqlRequest.cpp @@ -6,7 +6,6 @@ mozSqlRequest::mozSqlRequest(mozISqlConnection* aConnection) mIsQuery(PR_TRUE), mStatus(mozISqlRequest::STATUS_NONE) { - NS_INIT_ISUPPORTS(); mConnection = do_GetWeakReference(aConnection); } diff --git a/mozilla/extensions/sql/base/src/mozSqlResult.cpp b/mozilla/extensions/sql/base/src/mozSqlResult.cpp index c3c4bc51715..2fe076c6da8 100644 --- a/mozilla/extensions/sql/base/src/mozSqlResult.cpp +++ b/mozilla/extensions/sql/base/src/mozSqlResult.cpp @@ -31,7 +31,6 @@ mozSqlResult::mozSqlResult(mozISqlConnection* aConnection, mCanUpdate(-1), mCanDelete(-1) { - NS_INIT_ISUPPORTS(); } nsresult @@ -1177,7 +1176,6 @@ mozSqlResultEnumerator::mozSqlResultEnumerator(mozSqlResult* aResult) mCurrentIndex(-1), mCurrentRow(nsnull) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mResult); mBuffer = Row::Create(mResult->mAllocator, nsnull, mResult->mColumnInfo); @@ -1778,7 +1776,6 @@ mozSqlResultStream::mozSqlResultStream(mozSqlResult* aResult) mLength(0), mPosition(0) { - NS_INIT_ISUPPORTS(); NS_ADDREF(mResult); } diff --git a/mozilla/extensions/sql/base/src/mozSqlService.cpp b/mozilla/extensions/sql/base/src/mozSqlService.cpp index 298b2575314..674033b0334 100644 --- a/mozilla/extensions/sql/base/src/mozSqlService.cpp +++ b/mozilla/extensions/sql/base/src/mozSqlService.cpp @@ -33,7 +33,6 @@ nsIRDFResource* mozSqlService::kSQL_Database; mozSqlService::mozSqlService() : mConnectionCache(nsnull) { - NS_INIT_ISUPPORTS(); } mozSqlService::~mozSqlService() diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp index a439179f21e..352ac767b4b 100644 --- a/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp +++ b/mozilla/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp @@ -49,7 +49,6 @@ nsDeviceContextSpecFactoryPh :: nsDeviceContextSpecFactoryPh() { - NS_INIT_ISUPPORTS(); } nsDeviceContextSpecFactoryPh :: ~nsDeviceContextSpecFactoryPh() diff --git a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp index a44d9e2451d..823053d8af7 100644 --- a/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/mozilla/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -58,7 +58,6 @@ nsDeviceContextSpecPh :: nsDeviceContextSpecPh() { - NS_INIT_ISUPPORTS(); mPC = PpCreatePC(); } @@ -186,7 +185,6 @@ PpPrintContext_t *nsDeviceContextSpecPh :: GetPrintContext() //*********************************************************** nsPrinterEnumeratorPh::nsPrinterEnumeratorPh() { - NS_INIT_ISUPPORTS(); } nsPrinterEnumeratorPh::~nsPrinterEnumeratorPh() diff --git a/mozilla/gfx/src/photon/nsDrawingSurfacePh.cpp b/mozilla/gfx/src/photon/nsDrawingSurfacePh.cpp index 74bf3656f61..8042e8b16e6 100644 --- a/mozilla/gfx/src/photon/nsDrawingSurfacePh.cpp +++ b/mozilla/gfx/src/photon/nsDrawingSurfacePh.cpp @@ -72,8 +72,6 @@ NS_IMPL_ISUPPORTS2( nsDrawingSurfacePh, nsIDrawingSurface, nsIDrawingSurfacePh ) nsDrawingSurfacePh :: nsDrawingSurfacePh( ) { - NS_INIT_ISUPPORTS(); - mDrawContext = nsnull; mGC = nsnull; mWidth = 0; diff --git a/mozilla/gfx/src/photon/nsFontMetricsPh.cpp b/mozilla/gfx/src/photon/nsFontMetricsPh.cpp index c2d8ddae39f..18c38b2a971 100644 --- a/mozilla/gfx/src/photon/nsFontMetricsPh.cpp +++ b/mozilla/gfx/src/photon/nsFontMetricsPh.cpp @@ -61,7 +61,6 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); nsFontMetricsPh::nsFontMetricsPh() { - NS_INIT_ISUPPORTS(); mDeviceContext = nsnull; mFont = nsnull; @@ -300,7 +299,6 @@ struct nsFontFamily // The Font Enumerator nsFontEnumeratorPh::nsFontEnumeratorPh() { - NS_INIT_ISUPPORTS(); } NS_IMPL_ISUPPORTS1(nsFontEnumeratorPh, nsIFontEnumerator) diff --git a/mozilla/gfx/src/photon/nsImagePh.cpp b/mozilla/gfx/src/photon/nsImagePh.cpp index 5f76939b6c9..e2e0873e384 100644 --- a/mozilla/gfx/src/photon/nsImagePh.cpp +++ b/mozilla/gfx/src/photon/nsImagePh.cpp @@ -187,7 +187,6 @@ NS_IMPL_ISUPPORTS1(nsImagePh, nsIImage) // ---------------------------------------------------------------- nsImagePh :: nsImagePh() { - NS_INIT_ISUPPORTS(); mImageBits = nsnull; mWidth = 0; mHeight = 0; diff --git a/mozilla/gfx/src/photon/nsRegionPh.h b/mozilla/gfx/src/photon/nsRegionPh.h index 42e1e1db721..c778828af2c 100644 --- a/mozilla/gfx/src/photon/nsRegionPh.h +++ b/mozilla/gfx/src/photon/nsRegionPh.h @@ -48,14 +48,12 @@ class nsRegionPh : public nsIRegion public: inline nsRegionPh() { - NS_INIT_ISUPPORTS(); mRegion = NULL; mRegionType = eRegionComplexity_empty; } inline nsRegionPh(PhTile_t *tiles) { - NS_INIT_ISUPPORTS(); mRegion = tiles; /* assume ownership */ mRegionType = (mRegion == NULL) ? eRegionComplexity_empty : eRegionComplexity_complex; } diff --git a/mozilla/gfx/src/photon/nsRenderingContextPh.cpp b/mozilla/gfx/src/photon/nsRenderingContextPh.cpp index 941d5103ac1..1db13dbb779 100644 --- a/mozilla/gfx/src/photon/nsRenderingContextPh.cpp +++ b/mozilla/gfx/src/photon/nsRenderingContextPh.cpp @@ -62,8 +62,6 @@ NS_IMPL_ISUPPORTS1(nsRenderingContextPh, nsIRenderingContext) nsRenderingContextPh :: nsRenderingContextPh() { - NS_INIT_ISUPPORTS(); - mGC = nsnull; mTranMatrix = nsnull; mClipRegion = nsnull; diff --git a/mozilla/gfx/src/photon/nsScreenManagerPh.cpp b/mozilla/gfx/src/photon/nsScreenManagerPh.cpp index d9afbac9da9..4132430c73e 100644 --- a/mozilla/gfx/src/photon/nsScreenManagerPh.cpp +++ b/mozilla/gfx/src/photon/nsScreenManagerPh.cpp @@ -42,7 +42,6 @@ #include "nsPhGfxLog.h" nsScreenManagerPh :: nsScreenManagerPh( ) { - NS_INIT_ISUPPORTS(); // nothing else to do. I guess we could cache a bunch of information // here, but we want to ask the device at runtime in case anything // has changed. diff --git a/mozilla/gfx/src/photon/nsScreenPh.cpp b/mozilla/gfx/src/photon/nsScreenPh.cpp index 1cf9b5ffa38..bb7e5b6bc62 100644 --- a/mozilla/gfx/src/photon/nsScreenPh.cpp +++ b/mozilla/gfx/src/photon/nsScreenPh.cpp @@ -49,8 +49,6 @@ nsScreenPh :: nsScreenPh ( ) { PhRid_t rid; PhRegion_t region; - NS_INIT_ISUPPORTS(); - p = NULL; /* Initialize the data members */ diff --git a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp index d4e836917cd..545a5c3a456 100644 --- a/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp +++ b/mozilla/intl/ctl/src/nsUnicodeToSunIndic.cpp @@ -50,8 +50,6 @@ nsUnicodeToSunIndic::nsUnicodeToSunIndic() static NS_DEFINE_CID(kLECID, NS_ULE_CID); nsresult rv; - NS_INIT_ISUPPORTS(); - mCtlObj = do_CreateInstance(kLECID, &rv); if (NS_FAILED(rv)) { diff --git a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp index 15914e486b0..1bf535e2a3b 100644 --- a/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp +++ b/mozilla/intl/ctl/src/nsUnicodeToTIS620.cpp @@ -48,8 +48,6 @@ nsUnicodeToTIS620::nsUnicodeToTIS620() static NS_DEFINE_CID(kLECID, NS_ULE_CID); nsresult rv; - NS_INIT_ISUPPORTS(); - mCtlObj = do_CreateInstance(kLECID, &rv); if (NS_FAILED(rv)) { #ifdef DEBUG_prabhath diff --git a/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp b/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp index 252c64bf685..e239c307044 100644 --- a/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp +++ b/mozilla/intl/unicharutil/src/nsUnicodeNormalizer.cpp @@ -98,7 +98,6 @@ NS_IMPL_ISUPPORTS1(nsUnicodeNormalizer, nsIUnicodeNormalizer) nsUnicodeNormalizer::nsUnicodeNormalizer() { - NS_INIT_ISUPPORTS(); } nsUnicodeNormalizer::~nsUnicodeNormalizer() diff --git a/mozilla/ipc/ipcd/client/src/ipcService.cpp b/mozilla/ipc/ipcd/client/src/ipcService.cpp index 0ea7b5d8b9b..10287a64f6d 100644 --- a/mozilla/ipc/ipcd/client/src/ipcService.cpp +++ b/mozilla/ipc/ipcd/client/src/ipcService.cpp @@ -152,8 +152,6 @@ ipcService::ipcService() : mTransport(nsnull) , mClientID(0) { - NS_INIT_ISUPPORTS(); - IPC_InitLog(">>>"); } diff --git a/mozilla/ipc/ipcd/test/TestIPC.cpp b/mozilla/ipc/ipcd/test/TestIPC.cpp index 0fe0ee95e34..44de0440775 100644 --- a/mozilla/ipc/ipcd/test/TestIPC.cpp +++ b/mozilla/ipc/ipcd/test/TestIPC.cpp @@ -96,7 +96,7 @@ public: NS_DECL_ISUPPORTS NS_DECL_IPCIMESSAGEOBSERVER - myIpcMessageObserver() { NS_INIT_ISUPPORTS(); } + myIpcMessageObserver() {} }; NS_IMPL_ISUPPORTS1(myIpcMessageObserver, ipcIMessageObserver) diff --git a/mozilla/mailnews/base/src/nsMessengerContentHandler.cpp b/mozilla/mailnews/base/src/nsMessengerContentHandler.cpp index b43da8855f0..f1f95cbc941 100644 --- a/mozilla/mailnews/base/src/nsMessengerContentHandler.cpp +++ b/mozilla/mailnews/base/src/nsMessengerContentHandler.cpp @@ -50,7 +50,6 @@ nsMessengerContentHandler::nsMessengerContentHandler() { - NS_INIT_ISUPPORTS(); } /* the following macro actually implement addref, release and query interface for our component. */ diff --git a/mozilla/netwerk/dns/src/nsIDNService.cpp b/mozilla/netwerk/dns/src/nsIDNService.cpp index 51b0eaa564f..c9aaf87f9dd 100644 --- a/mozilla/netwerk/dns/src/nsIDNService.cpp +++ b/mozilla/netwerk/dns/src/nsIDNService.cpp @@ -106,8 +106,6 @@ NS_IMETHODIMP nsIDNService::Observe(nsISupports *aSubject, nsIDNService::nsIDNService() { - NS_INIT_ISUPPORTS(); - nsresult rv; // initialize to the official prefix (RFC 3490 "5. ACE prefix") diff --git a/mozilla/widget/src/photon/nsAppShell.cpp b/mozilla/widget/src/photon/nsAppShell.cpp index 23c2868fd13..c1800afa2a9 100644 --- a/mozilla/widget/src/photon/nsAppShell.cpp +++ b/mozilla/widget/src/photon/nsAppShell.cpp @@ -81,7 +81,6 @@ static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); //------------------------------------------------------------------------- nsAppShell::nsAppShell() { - NS_INIT_ISUPPORTS(); mEventQueue = nsnull; mFD = -1; } diff --git a/mozilla/widget/src/photon/nsBidiKeyboard.cpp b/mozilla/widget/src/photon/nsBidiKeyboard.cpp index 01ee6bc749e..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 5fcb234ebaa..80ee8f33d16 100644 --- a/mozilla/widget/src/photon/nsButton.cpp +++ b/mozilla/widget/src/photon/nsButton.cpp @@ -61,7 +61,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 f93e0421cd4..f7413243450 100644 --- a/mozilla/widget/src/photon/nsCheckButton.cpp +++ b/mozilla/widget/src/photon/nsCheckButton.cpp @@ -64,7 +64,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 d9c226d8c10..4e72cbe50a9 100644 --- a/mozilla/widget/src/photon/nsClipboard.cpp +++ b/mozilla/widget/src/photon/nsClipboard.cpp @@ -79,7 +79,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 446caf586d9..5cad6ba00a8 100644 --- a/mozilla/widget/src/photon/nsDragService.cpp +++ b/mozilla/widget/src/photon/nsDragService.cpp @@ -60,7 +60,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/nsFilePicker.cpp b/mozilla/widget/src/photon/nsFilePicker.cpp index 0b131de7fbe..64a38bee8e7 100644 --- a/mozilla/widget/src/photon/nsFilePicker.cpp +++ b/mozilla/widget/src/photon/nsFilePicker.cpp @@ -55,7 +55,6 @@ nsFilePicker::nsFilePicker() , mUnicodeEncoder(nsnull) , mUnicodeDecoder(nsnull) { - NS_INIT_ISUPPORTS(); mDisplayDirectory = do_CreateInstance("@mozilla.org/file/local;1"); char *path = getenv( "HOME" ); if( path ) { diff --git a/mozilla/widget/src/photon/nsLabel.cpp b/mozilla/widget/src/photon/nsLabel.cpp index 44ad91e4046..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/nsSound.cpp b/mozilla/widget/src/photon/nsSound.cpp index a9115cac9c6..c1e9a547275 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 7ab2cb5ee53..9a3c736749a 100644 --- a/mozilla/widget/src/photon/nsTextWidget.cpp +++ b/mozilla/widget/src/photon/nsTextWidget.cpp @@ -63,7 +63,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 04202d71cd9..c5bfdfb8e1e 100644 --- a/mozilla/widget/src/photon/nsToolkit.cpp +++ b/mozilla/widget/src/photon/nsToolkit.cpp @@ -55,7 +55,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 4ec53cd1130..aa411a1cd41 100644 --- a/mozilla/widget/src/photon/nsWidget.cpp +++ b/mozilla/widget/src/photon/nsWidget.cpp @@ -90,9 +90,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,