From f1dd4019c162877e12bdbc3d7753da0f0efcb66b Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 8 Jan 2003 21:33:27 +0000 Subject: [PATCH] Bug 178643: Remove uses of NS_INIT_ISUPPORTS, since it is no longer needed. r=timeless sr=jag --- mailnews/absync/src/nsAbSync.cpp | 2 -- mailnews/absync/src/nsAbSyncPostEngine.cpp | 3 --- mailnews/addrbook/src/nsABSyncDriver.cpp | 1 - mailnews/addrbook/src/nsAbAddressCollecter.cpp | 1 - mailnews/addrbook/src/nsAbAutoCompleteSession.cpp | 1 - mailnews/addrbook/src/nsAbAutoCompleteSession.h | 1 - mailnews/addrbook/src/nsAbBooleanExpression.cpp | 2 -- mailnews/addrbook/src/nsAbCardProperty.cpp | 2 -- mailnews/addrbook/src/nsAbDirFactoryService.cpp | 1 - mailnews/addrbook/src/nsAbDirProperty.cpp | 3 --- mailnews/addrbook/src/nsAbDirSearchListener.cpp | 1 - mailnews/addrbook/src/nsAbDirectoryQuery.cpp | 11 ----------- mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp | 1 - mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp | 1 - mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp | 1 - mailnews/addrbook/src/nsAbLDAPDirFactory.cpp | 1 - mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp | 4 ---- mailnews/addrbook/src/nsAbLDAPReplicationData.cpp | 1 - mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp | 1 - mailnews/addrbook/src/nsAbLDAPReplicationService.cpp | 1 - mailnews/addrbook/src/nsAbMDBDirFactory.cpp | 1 - mailnews/addrbook/src/nsAbOutlookDirFactory.cpp | 1 - mailnews/addrbook/src/nsAbRDFDataSource.cpp | 1 - mailnews/addrbook/src/nsAbRDFResource.cpp | 1 - mailnews/addrbook/src/nsAbView.cpp | 1 - mailnews/addrbook/src/nsAddbookProtocolHandler.cpp | 1 - mailnews/addrbook/src/nsAddbookUrl.cpp | 2 -- mailnews/addrbook/src/nsAddrBookSession.cpp | 1 - mailnews/addrbook/src/nsAddrDatabase.cpp | 3 --- mailnews/addrbook/src/nsAddressBook.cpp | 1 - mailnews/base/search/src/nsMsgFilter.cpp | 2 -- mailnews/base/search/src/nsMsgFilterDataSource.cpp | 2 -- .../base/search/src/nsMsgFilterDelegateFactory.cpp | 1 - mailnews/base/search/src/nsMsgFilterList.cpp | 2 -- mailnews/base/search/src/nsMsgFilterService.cpp | 2 -- mailnews/base/search/src/nsMsgSearchAdapter.cpp | 3 --- mailnews/base/search/src/nsMsgSearchSession.cpp | 1 - mailnews/base/search/src/nsMsgSearchTerm.cpp | 5 ----- mailnews/base/search/src/nsMsgSearchValue.cpp | 1 - mailnews/base/src/nsCopyMessageStreamListener.cpp | 2 -- 40 files changed, 74 deletions(-) diff --git a/mailnews/absync/src/nsAbSync.cpp b/mailnews/absync/src/nsAbSync.cpp index 4d470dbfb525..dd53198930d1 100644 --- a/mailnews/absync/src/nsAbSync.cpp +++ b/mailnews/absync/src/nsAbSync.cpp @@ -75,8 +75,6 @@ NS_IMPL_ISUPPORTS1(nsAbSync, nsIAbSync) nsAbSync::nsAbSync() { - NS_INIT_ISUPPORTS(); - // For listener array stuff... mListenerArrayCount = 0; mListenerArray = nsnull; diff --git a/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mailnews/absync/src/nsAbSyncPostEngine.cpp index 5199fb117b94..d484540cb2c8 100644 --- a/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -103,9 +103,6 @@ NS_INTERFACE_MAP_END */ nsAbSyncPostEngine::nsAbSyncPostEngine() { - /* the following macro is used to initialize the ref counting data */ - NS_INIT_ISUPPORTS(); - // Init member variables... mTotalWritten = 0; mStillRunning = PR_TRUE; diff --git a/mailnews/addrbook/src/nsABSyncDriver.cpp b/mailnews/addrbook/src/nsABSyncDriver.cpp index 78f2c572d81a..87da5cbcb755 100644 --- a/mailnews/addrbook/src/nsABSyncDriver.cpp +++ b/mailnews/addrbook/src/nsABSyncDriver.cpp @@ -43,7 +43,6 @@ NS_IMPL_ISUPPORTS1(nsAbSyncDriver, nsIAbSyncDriver) nsAbSyncDriver::nsAbSyncDriver() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ mTransactionID = -1; diff --git a/mailnews/addrbook/src/nsAbAddressCollecter.cpp b/mailnews/addrbook/src/nsAbAddressCollecter.cpp index 12196c914c3d..3746c360b44b 100644 --- a/mailnews/addrbook/src/nsAbAddressCollecter.cpp +++ b/mailnews/addrbook/src/nsAbAddressCollecter.cpp @@ -60,7 +60,6 @@ NS_IMPL_ISUPPORTS1(nsAbAddressCollecter, nsIAbAddressCollecter) nsAbAddressCollecter::nsAbAddressCollecter() { - NS_INIT_ISUPPORTS(); } nsAbAddressCollecter::~nsAbAddressCollecter() diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp index 7d3a8f28e588..44fbf6d29444 100644 --- a/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp +++ b/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp @@ -58,7 +58,6 @@ NS_IMPL_ISUPPORTS2(nsAbAutoCompleteSession, nsIAbAutoCompleteSession, nsIAutoCom nsAbAutoCompleteSession::nsAbAutoCompleteSession() { - NS_INIT_ISUPPORTS(); mParser = do_GetService(NS_MAILNEWS_MIME_HEADER_PARSER_CONTRACTID); } diff --git a/mailnews/addrbook/src/nsAbAutoCompleteSession.h b/mailnews/addrbook/src/nsAbAutoCompleteSession.h index 4d2f5815bff0..048ffba7be78 100644 --- a/mailnews/addrbook/src/nsAbAutoCompleteSession.h +++ b/mailnews/addrbook/src/nsAbAutoCompleteSession.h @@ -156,7 +156,6 @@ public: PRBool isMailList, nsAbAutoCompleteSession::MatchType type) { - NS_INIT_ISUPPORTS(); mNickName = nsCRT::strdup(nickName ? nickName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); mDisplayName = nsCRT::strdup(displayName ? displayName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); mFirstName = nsCRT::strdup(firstName ? firstName : NS_STATIC_CAST(const PRUnichar*, NS_LITERAL_STRING("").get())); diff --git a/mailnews/addrbook/src/nsAbBooleanExpression.cpp b/mailnews/addrbook/src/nsAbBooleanExpression.cpp index 3cf5ebe9480e..cc415be2448b 100644 --- a/mailnews/addrbook/src/nsAbBooleanExpression.cpp +++ b/mailnews/addrbook/src/nsAbBooleanExpression.cpp @@ -44,7 +44,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbBooleanConditionString, nsIAbBooleanConditionS nsAbBooleanConditionString::nsAbBooleanConditionString() : mCondition (nsIAbBooleanConditionTypes::Exists) { - NS_INIT_ISUPPORTS(); } nsAbBooleanConditionString::~nsAbBooleanConditionString() @@ -119,7 +118,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbBooleanExpression, nsIAbBooleanExpression) nsAbBooleanExpression::nsAbBooleanExpression() : mOperation (nsIAbBooleanOperationTypes::AND) { - NS_INIT_ISUPPORTS(); } nsAbBooleanExpression::~nsAbBooleanExpression() diff --git a/mailnews/addrbook/src/nsAbCardProperty.cpp b/mailnews/addrbook/src/nsAbCardProperty.cpp index 30da08e3001a..ce261ebd3ee2 100644 --- a/mailnews/addrbook/src/nsAbCardProperty.cpp +++ b/mailnews/addrbook/src/nsAbCardProperty.cpp @@ -119,8 +119,6 @@ static AppendItem CUSTOM_ATTRS_ARRAY[] = { nsAbCardProperty::nsAbCardProperty(void) { - NS_INIT_ISUPPORTS(); - m_LastModDate = 0; m_PreferMailFormat = nsIAbPreferMailFormat::unknown; diff --git a/mailnews/addrbook/src/nsAbDirFactoryService.cpp b/mailnews/addrbook/src/nsAbDirFactoryService.cpp index c4077279b3c3..a410203b3f5e 100644 --- a/mailnews/addrbook/src/nsAbDirFactoryService.cpp +++ b/mailnews/addrbook/src/nsAbDirFactoryService.cpp @@ -54,7 +54,6 @@ NS_IMPL_ISUPPORTS1(nsAbDirFactoryService, nsIAbDirFactoryService) nsAbDirFactoryService::nsAbDirFactoryService() { - NS_INIT_ISUPPORTS(); } nsAbDirFactoryService::~nsAbDirFactoryService() diff --git a/mailnews/addrbook/src/nsAbDirProperty.cpp b/mailnews/addrbook/src/nsAbDirProperty.cpp index cd3d7ee54bb5..7bbe6a5845db 100644 --- a/mailnews/addrbook/src/nsAbDirProperty.cpp +++ b/mailnews/addrbook/src/nsAbDirProperty.cpp @@ -55,8 +55,6 @@ nsAbDirProperty::nsAbDirProperty(void) : m_LastModifiedDate(0) { - NS_INIT_ISUPPORTS(); - m_IsMailList = PR_FALSE; } @@ -293,7 +291,6 @@ NS_IMETHODIMP nsAbDirProperty::GetSearchDuringLocalAutocomplete(PRBool *aSearchD nsAbDirectoryProperties::nsAbDirectoryProperties(void) { - NS_INIT_ISUPPORTS(); } nsAbDirectoryProperties::~nsAbDirectoryProperties(void) diff --git a/mailnews/addrbook/src/nsAbDirSearchListener.cpp b/mailnews/addrbook/src/nsAbDirSearchListener.cpp index f68bc7ac7aab..e7db1f449d26 100644 --- a/mailnews/addrbook/src/nsAbDirSearchListener.cpp +++ b/mailnews/addrbook/src/nsAbDirSearchListener.cpp @@ -49,7 +49,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirSearchListener, nsIAbDirectoryQueryResultLi nsAbDirSearchListener::nsAbDirSearchListener (nsAbDirSearchListenerContext* searchContext) : mSearchContext (searchContext) { - NS_INIT_ISUPPORTS(); } nsAbDirSearchListener::~nsAbDirSearchListener () diff --git a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp index 08383ef62a00..8036393eee99 100644 --- a/mailnews/addrbook/src/nsAbDirectoryQuery.cpp +++ b/mailnews/addrbook/src/nsAbDirectoryQuery.cpp @@ -53,7 +53,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirectoryQuerySimpleBooleanExpression, nsIAbBo nsAbDirectoryQuerySimpleBooleanExpression::nsAbDirectoryQuerySimpleBooleanExpression() : mOperation (nsIAbBooleanOperationTypes::AND) { - NS_INIT_ISUPPORTS(); } nsAbDirectoryQuerySimpleBooleanExpression::~nsAbDirectoryQuerySimpleBooleanExpression() @@ -136,7 +135,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirectoryQueryArguments, nsIAbDirectoryQueryAr nsAbDirectoryQueryArguments::nsAbDirectoryQueryArguments() : mQuerySubDirectories(PR_TRUE) { - NS_INIT_ISUPPORTS(); } nsAbDirectoryQueryArguments::~nsAbDirectoryQueryArguments() @@ -202,14 +200,11 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbDirectoryQueryPropertyValue, nsIAbDirectoryQue nsAbDirectoryQueryPropertyValue::nsAbDirectoryQueryPropertyValue() { - NS_INIT_ISUPPORTS(); } nsAbDirectoryQueryPropertyValue::nsAbDirectoryQueryPropertyValue(const char* aName, const PRUnichar* aValue) { - NS_INIT_ISUPPORTS(); - mName = aName; mValue = aValue; } @@ -217,8 +212,6 @@ nsAbDirectoryQueryPropertyValue::nsAbDirectoryQueryPropertyValue(const char* aNa nsAbDirectoryQueryPropertyValue::nsAbDirectoryQueryPropertyValue(const char* aName, nsISupports* aValueISupports) { - NS_INIT_ISUPPORTS(); - mName = aName; mValueISupports = aValueISupports; } @@ -267,7 +260,6 @@ nsAbDirectoryQueryResult::nsAbDirectoryQueryResult() : mContextID (-1), mType (queryResultError) { - NS_INIT_ISUPPORTS(); } nsAbDirectoryQueryResult::nsAbDirectoryQueryResult(PRInt32 aContextID, @@ -275,8 +267,6 @@ nsAbDirectoryQueryResult::nsAbDirectoryQueryResult(PRInt32 aContextID, PRInt32 aType, nsCOMPtr aResult) { - NS_INIT_ISUPPORTS(); - mContextID = aContextID; mContextArgs = aContextArgs; mType = aType; @@ -339,7 +329,6 @@ NS_IMPL_ISUPPORTS1(nsAbDirectoryQuery, nsIAbDirectoryQuery) nsAbDirectoryQuery::nsAbDirectoryQuery(nsIAbDirectory* aDirectory) { - NS_INIT_ISUPPORTS(); mDirectory = aDirectory; } diff --git a/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp b/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp index 3f63a5c5a163..0ad1e29ad20d 100644 --- a/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp +++ b/mailnews/addrbook/src/nsAbDirectoryQueryProxy.cpp @@ -44,7 +44,6 @@ NS_IMPL_ISUPPORTS2(nsAbDirectoryQueryProxy, nsIAbDirectoryQueryProxy, nsIAbDirec nsAbDirectoryQueryProxy::nsAbDirectoryQueryProxy() : mInitiated (PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsAbDirectoryQueryProxy::~nsAbDirectoryQueryProxy() diff --git a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp index aa3090daf23e..d48fd1f256b8 100644 --- a/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp +++ b/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp @@ -49,7 +49,6 @@ nsAbLDAPAutoCompFormatter::nsAbLDAPAutoCompFormatter() : mNameFormat(NS_LITERAL_STRING("[cn]")), mAddressFormat(NS_LITERAL_STRING("{mail}")) { - NS_INIT_ISUPPORTS(); } nsAbLDAPAutoCompFormatter::~nsAbLDAPAutoCompFormatter() diff --git a/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp b/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp index 76126c1c4a58..6ed52a460489 100644 --- a/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp +++ b/mailnews/addrbook/src/nsAbLDAPChangeLogQuery.cpp @@ -53,7 +53,6 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsAbLDAPChangeLogQuery, nsAbLDAPReplicationQuery, n nsAbLDAPChangeLogQuery::nsAbLDAPChangeLogQuery() { - NS_INIT_ISUPPORTS(); } nsAbLDAPChangeLogQuery::~nsAbLDAPChangeLogQuery() diff --git a/mailnews/addrbook/src/nsAbLDAPDirFactory.cpp b/mailnews/addrbook/src/nsAbLDAPDirFactory.cpp index c60921998d08..d9a7575cb1cd 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirFactory.cpp +++ b/mailnews/addrbook/src/nsAbLDAPDirFactory.cpp @@ -60,7 +60,6 @@ NS_IMPL_ISUPPORTS1(nsAbLDAPDirFactory, nsIAbDirFactory); nsAbLDAPDirFactory::nsAbLDAPDirFactory() { - NS_INIT_ISUPPORTS(); } nsAbLDAPDirFactory::~nsAbLDAPDirFactory() diff --git a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp index d94ecee9eedb..f06b4f85307c 100644 --- a/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp +++ b/mailnews/addrbook/src/nsAbLDAPDirectoryQuery.cpp @@ -137,8 +137,6 @@ nsAbQueryLDAPMessageListener::nsAbQueryLDAPMessageListener ( mLock(0) { - NS_INIT_ISUPPORTS(); - NS_ADDREF(mDirectoryQuery); } @@ -637,8 +635,6 @@ nsAbLDAPDirectoryQuery::nsAbLDAPDirectoryQuery() : mCounter (1), mLock (nsnull) { - NS_INIT_ISUPPORTS(); - } nsAbLDAPDirectoryQuery::~nsAbLDAPDirectoryQuery() diff --git a/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp b/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp index fe4e56a965f5..e526f7dc0ddb 100644 --- a/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp +++ b/mailnews/addrbook/src/nsAbLDAPReplicationData.cpp @@ -65,7 +65,6 @@ nsAbLDAPProcessReplicationData::nsAbLDAPProcessReplicationData() mInitialized(PR_FALSE), mDirServerInfo(nsnull) { - NS_INIT_ISUPPORTS(); } nsAbLDAPProcessReplicationData::~nsAbLDAPProcessReplicationData() diff --git a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp index 3fb7bec8d787..797a72068e7b 100644 --- a/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp +++ b/mailnews/addrbook/src/nsAbLDAPReplicationQuery.cpp @@ -56,7 +56,6 @@ nsAbLDAPReplicationQuery::nsAbLDAPReplicationQuery() : mInitialized(PR_FALSE), mDirServer(nsnull) { - NS_INIT_ISUPPORTS(); } nsAbLDAPReplicationQuery::~nsAbLDAPReplicationQuery() diff --git a/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp b/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp index 118ce7f6da07..77cddcc933d2 100644 --- a/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp +++ b/mailnews/addrbook/src/nsAbLDAPReplicationService.cpp @@ -52,7 +52,6 @@ NS_IMPL_ISUPPORTS1(nsAbLDAPReplicationService, nsIAbLDAPReplicationService) nsAbLDAPReplicationService::nsAbLDAPReplicationService() : mReplicating(PR_FALSE) { - NS_INIT_ISUPPORTS(); } nsAbLDAPReplicationService::~nsAbLDAPReplicationService() diff --git a/mailnews/addrbook/src/nsAbMDBDirFactory.cpp b/mailnews/addrbook/src/nsAbMDBDirFactory.cpp index 636e15e3a2c5..993c21483491 100644 --- a/mailnews/addrbook/src/nsAbMDBDirFactory.cpp +++ b/mailnews/addrbook/src/nsAbMDBDirFactory.cpp @@ -60,7 +60,6 @@ NS_IMPL_ISUPPORTS1(nsAbMDBDirFactory, nsIAbDirFactory); nsAbMDBDirFactory::nsAbMDBDirFactory() { - NS_INIT_ISUPPORTS(); } nsAbMDBDirFactory::~nsAbMDBDirFactory() diff --git a/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp b/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp index 926e31089b12..e86cf56b9d48 100644 --- a/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp +++ b/mailnews/addrbook/src/nsAbOutlookDirFactory.cpp @@ -69,7 +69,6 @@ NS_IMPL_ISUPPORTS1(nsAbOutlookDirFactory, nsIAbDirFactory) nsAbOutlookDirFactory::nsAbOutlookDirFactory(void) { - NS_INIT_ISUPPORTS() ; } nsAbOutlookDirFactory::~nsAbOutlookDirFactory(void) diff --git a/mailnews/addrbook/src/nsAbRDFDataSource.cpp b/mailnews/addrbook/src/nsAbRDFDataSource.cpp index 0ce7f3af57ff..677976b50ad8 100644 --- a/mailnews/addrbook/src/nsAbRDFDataSource.cpp +++ b/mailnews/addrbook/src/nsAbRDFDataSource.cpp @@ -291,7 +291,6 @@ nsAbRDFDataSource::nsAbRDFDataSource(): mProxyObservers(nsnull), mLock(nsnull) { - NS_INIT_ISUPPORTS(); mLock = PR_NewLock (); } diff --git a/mailnews/addrbook/src/nsAbRDFResource.cpp b/mailnews/addrbook/src/nsAbRDFResource.cpp index 4db6183bf5c5..9a1200403e9d 100644 --- a/mailnews/addrbook/src/nsAbRDFResource.cpp +++ b/mailnews/addrbook/src/nsAbRDFResource.cpp @@ -49,7 +49,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); nsAbRDFResource::nsAbRDFResource(void) { - NS_INIT_ISUPPORTS(); mDatabase = nsnull; } diff --git a/mailnews/addrbook/src/nsAbView.cpp b/mailnews/addrbook/src/nsAbView.cpp index adaddb36cd76..1e6e7f3524b5 100644 --- a/mailnews/addrbook/src/nsAbView.cpp +++ b/mailnews/addrbook/src/nsAbView.cpp @@ -77,7 +77,6 @@ NS_IMPL_ISUPPORTS4(nsAbView, nsIAbView, nsITreeView, nsIAbListener, nsIObserver) nsAbView::nsAbView() { - NS_INIT_ISUPPORTS(); mMailListAtom = getter_AddRefs(NS_NewAtom("MailList")); mSuppressSelectionChange = PR_FALSE; mSuppressCountChange = PR_FALSE; diff --git a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp index 855b9574b03c..fbba59b10d36 100644 --- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp +++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp @@ -68,7 +68,6 @@ nsAddbookProtocolHandler::nsAddbookProtocolHandler() { - NS_INIT_ISUPPORTS(); mAddbookOperation = nsIAddbookUrlOperation::InvalidUrl; } diff --git a/mailnews/addrbook/src/nsAddbookUrl.cpp b/mailnews/addrbook/src/nsAddbookUrl.cpp index db51301ac441..f1ebb878ba63 100644 --- a/mailnews/addrbook/src/nsAddbookUrl.cpp +++ b/mailnews/addrbook/src/nsAddbookUrl.cpp @@ -48,8 +48,6 @@ ///////////////////////////////////////////////////////////////////////////////////// nsAddbookUrl::nsAddbookUrl() { - NS_INIT_ISUPPORTS(); - m_baseURL = do_CreateInstance(NS_SIMPLEURI_CONTRACTID); mOperationType = nsIAddbookUrlOperation::InvalidUrl; diff --git a/mailnews/addrbook/src/nsAddrBookSession.cpp b/mailnews/addrbook/src/nsAddrBookSession.cpp index 4d69cc19e9ff..c096ba782cf6 100644 --- a/mailnews/addrbook/src/nsAddrBookSession.cpp +++ b/mailnews/addrbook/src/nsAddrBookSession.cpp @@ -50,7 +50,6 @@ NS_IMPL_THREADSAFE_ISUPPORTS1(nsAddrBookSession, nsIAddrBookSession) nsAddrBookSession::nsAddrBookSession() { - NS_INIT_ISUPPORTS(); } nsAddrBookSession::~nsAddrBookSession() diff --git a/mailnews/addrbook/src/nsAddrDatabase.cpp b/mailnews/addrbook/src/nsAddrDatabase.cpp index 9d57069a0512..939af70be397 100644 --- a/mailnews/addrbook/src/nsAddrDatabase.cpp +++ b/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -167,7 +167,6 @@ nsAddrDatabase::nsAddrDatabase() m_LastRecordKey(0), m_dbDirectory(nsnull) { - NS_INIT_ISUPPORTS(); } nsAddrDatabase::~nsAddrDatabase() @@ -3021,7 +3020,6 @@ protected: nsAddrDBEnumerator::nsAddrDBEnumerator(nsAddrDatabase* db) : mDB(db), mRowCursor(nsnull), mCurrentRow(nsnull), mDone(PR_FALSE) { - NS_INIT_ISUPPORTS(); mDbTable = mDB->GetPabTable(); mCurrentRowIsList = PR_FALSE; } @@ -3145,7 +3143,6 @@ protected: nsListAddressEnumerator::nsListAddressEnumerator(nsAddrDatabase* db, mdb_id rowID) : mDB(db), mCurrentRow(nsnull), mListRowID(rowID), mDone(PR_FALSE) { - NS_INIT_ISUPPORTS(); mDbTable = mDB->GetPabTable(); mDB->GetListRowByRowID(mListRowID, &mListRow); mAddressTotal = mDB->GetListAddressTotal(mListRow); diff --git a/mailnews/addrbook/src/nsAddressBook.cpp b/mailnews/addrbook/src/nsAddressBook.cpp index 3ccfcb9b561a..0128f6b93328 100644 --- a/mailnews/addrbook/src/nsAddressBook.cpp +++ b/mailnews/addrbook/src/nsAddressBook.cpp @@ -104,7 +104,6 @@ // nsAddressBook::nsAddressBook() { - NS_INIT_ISUPPORTS(); } nsAddressBook::~nsAddressBook() diff --git a/mailnews/base/search/src/nsMsgFilter.cpp b/mailnews/base/search/src/nsMsgFilter.cpp index 7e361003b4cd..49b544a4bfdb 100644 --- a/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mailnews/base/search/src/nsMsgFilter.cpp @@ -66,7 +66,6 @@ static const char *kWhitespace = "\b\t\r\n "; nsMsgRuleAction::nsMsgRuleAction() { - NS_INIT_ISUPPORTS(); } nsMsgRuleAction::~nsMsgRuleAction() @@ -139,7 +138,6 @@ nsMsgFilter::nsMsgFilter(): m_unparseable(PR_FALSE), m_filterList(nsnull) { - NS_INIT_ISUPPORTS(); NS_NewISupportsArray(getter_AddRefs(m_termList)); NS_NewISupportsArray(getter_AddRefs(m_actionList)); diff --git a/mailnews/base/search/src/nsMsgFilterDataSource.cpp b/mailnews/base/search/src/nsMsgFilterDataSource.cpp index 96f34af87f2d..3fb620dfc806 100644 --- a/mailnews/base/search/src/nsMsgFilterDataSource.cpp +++ b/mailnews/base/search/src/nsMsgFilterDataSource.cpp @@ -64,8 +64,6 @@ nsCOMPtr nsMsgFilterDataSource::mFilterArcsOut; nsMsgFilterDataSource::nsMsgFilterDataSource() { - NS_INIT_ISUPPORTS(); - if (mGlobalRefCount++ == 0) initGlobalObjects(getRDFService()); } diff --git a/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp b/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp index c1483539554d..16d7a9c6bf9c 100644 --- a/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp +++ b/mailnews/base/search/src/nsMsgFilterDelegateFactory.cpp @@ -64,7 +64,6 @@ NS_IMPL_ISUPPORTS1(nsMsgFilterDelegateFactory, nsIRDFDelegateFactory) nsMsgFilterDelegateFactory::nsMsgFilterDelegateFactory() { - NS_INIT_ISUPPORTS(); /* member initializers and constructor code */ } diff --git a/mailnews/base/search/src/nsMsgFilterList.cpp b/mailnews/base/search/src/nsMsgFilterList.cpp index b6caa6b1cc65..5cc7b56da238 100644 --- a/mailnews/base/search/src/nsMsgFilterList.cpp +++ b/mailnews/base/search/src/nsMsgFilterList.cpp @@ -75,8 +75,6 @@ nsMsgFilterList::nsMsgFilterList() : m_startWritingToBuffer = PR_FALSE; m_curFilter = nsnull; m_arbitraryHeaders.SetLength(0); - - NS_INIT_ISUPPORTS(); } NS_IMPL_ADDREF(nsMsgFilterList) diff --git a/mailnews/base/search/src/nsMsgFilterService.cpp b/mailnews/base/search/src/nsMsgFilterService.cpp index 2f2ed910d007..6b0a9c9ff8e9 100644 --- a/mailnews/base/search/src/nsMsgFilterService.cpp +++ b/mailnews/base/search/src/nsMsgFilterService.cpp @@ -66,7 +66,6 @@ NS_IMPL_ISUPPORTS1(nsMsgFilterService, nsIMsgFilterService) nsMsgFilterService::nsMsgFilterService() { - NS_INIT_ISUPPORTS(); } nsMsgFilterService::~nsMsgFilterService() @@ -344,7 +343,6 @@ NS_IMPL_ISUPPORTS3(nsMsgFilterAfterTheFact, nsIUrlListener, nsIMsgSearchNotify, nsMsgFilterAfterTheFact::nsMsgFilterAfterTheFact(nsIMsgWindow *aMsgWindow, nsIMsgFilterList *aFilterList, nsISupportsArray *aFolderList) { - NS_INIT_ISUPPORTS(); m_curFilterIndex = m_curFolderIndex = 0; m_msgWindow = aMsgWindow; m_filters = aFilterList; diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp index d6caf641309f..6cd99ba78397 100644 --- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -101,7 +101,6 @@ NS_IMPL_ISUPPORTS1(nsMsgSearchAdapter, nsIMsgSearchAdapter) nsMsgSearchAdapter::nsMsgSearchAdapter(nsIMsgSearchScopeTerm *scope, nsISupportsArray *searchTerms) : m_searchTerms(searchTerms) { - NS_INIT_ISUPPORTS(); m_scope = scope; } @@ -852,7 +851,6 @@ char *nsMsgSearchAdapter::TransformSpacesToStars (const char *spaceString, msg_T nsMsgSearchValidityTable::nsMsgSearchValidityTable () { - NS_INIT_ISUPPORTS(); // Set everything to be unavailable and disabled for (int i = 0; i < nsMsgSearchAttrib::kNumMsgSearchAttributes; i++) for (int j = 0; j < nsMsgSearchOp::kNumMsgSearchOperators; j++) @@ -1004,7 +1002,6 @@ nsMsgSearchValidityTable::SetDefaultAttrib(nsMsgSearchAttribValue aAttribute) nsMsgSearchValidityManager::nsMsgSearchValidityManager () { - NS_INIT_ISUPPORTS(); } diff --git a/mailnews/base/search/src/nsMsgSearchSession.cpp b/mailnews/base/search/src/nsMsgSearchSession.cpp index 0b981024fc07..285a5a6eef61 100644 --- a/mailnews/base/search/src/nsMsgSearchSession.cpp +++ b/mailnews/base/search/src/nsMsgSearchSession.cpp @@ -55,7 +55,6 @@ NS_IMPL_ISUPPORTS4(nsMsgSearchSession, nsIMsgSearchSession, nsIUrlListener, nsIF nsMsgSearchSession::nsMsgSearchSession() { - NS_INIT_ISUPPORTS(); m_sortAttribute = nsMsgSearchAttrib::Sender; m_descending = PR_FALSE; m_idxRunningScope = 0; diff --git a/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mailnews/base/search/src/nsMsgSearchTerm.cpp index 5ba6e55cd1b4..3ff6bf1b622a 100644 --- a/mailnews/base/search/src/nsMsgSearchTerm.cpp +++ b/mailnews/base/search/src/nsMsgSearchTerm.cpp @@ -319,8 +319,6 @@ PRInt32 NS_MsgGetStatusValueFromName(char *name) // Needed for DeStream method. nsMsgSearchTerm::nsMsgSearchTerm() { - NS_INIT_ISUPPORTS(); - // initialize this to zero m_value.string=nsnull; m_value.attribute=0; @@ -337,7 +335,6 @@ nsMsgSearchTerm::nsMsgSearchTerm ( nsMsgSearchBooleanOperator boolOp, const char * arbitraryHeader) { - NS_INIT_ISUPPORTS(); m_operator = op; m_attribute = attrib; m_booleanOp = boolOp; @@ -1429,7 +1426,6 @@ nsMsgSearchScopeTerm::nsMsgSearchScopeTerm (nsIMsgSearchSession *session, nsMsgSearchScopeValue attribute, nsIMsgFolder *folder) { - NS_INIT_ISUPPORTS(); m_attribute = attribute; m_folder = folder; m_searchServer = PR_TRUE; @@ -1438,7 +1434,6 @@ nsMsgSearchScopeTerm::nsMsgSearchScopeTerm (nsIMsgSearchSession *session, nsMsgSearchScopeTerm::nsMsgSearchScopeTerm () { - NS_INIT_ISUPPORTS(); m_searchServer = PR_TRUE; } diff --git a/mailnews/base/search/src/nsMsgSearchValue.cpp b/mailnews/base/search/src/nsMsgSearchValue.cpp index afbec9915818..9f221b6cd966 100644 --- a/mailnews/base/search/src/nsMsgSearchValue.cpp +++ b/mailnews/base/search/src/nsMsgSearchValue.cpp @@ -43,7 +43,6 @@ nsMsgSearchValueImpl::nsMsgSearchValueImpl(nsMsgSearchValue *aInitialValue) { - NS_INIT_ISUPPORTS(); mValue = *aInitialValue; if (IS_STRING_ATTRIBUTE(aInitialValue->attribute)) mValue.string = nsCRT::strdup(aInitialValue->string); diff --git a/mailnews/base/src/nsCopyMessageStreamListener.cpp b/mailnews/base/src/nsCopyMessageStreamListener.cpp index 83b38a2bcb60..0dbf31db3965 100644 --- a/mailnews/base/src/nsCopyMessageStreamListener.cpp +++ b/mailnews/base/src/nsCopyMessageStreamListener.cpp @@ -95,8 +95,6 @@ static nsresult GetMessage(nsIURI *aURL, nsIMsgDBHdr **message) nsCopyMessageStreamListener::nsCopyMessageStreamListener() { - /* the following macro is used to initialize the ref counting data */ - NS_INIT_ISUPPORTS(); } nsCopyMessageStreamListener::~nsCopyMessageStreamListener()