From d73584dce20a4c584ff3bd53f5afbc3401a22227 Mon Sep 17 00:00:00 2001 From: "sspitzer%netscape.com" Date: Wed, 2 Oct 2002 07:46:46 +0000 Subject: [PATCH] code cleanup. replace static cid with contract id. --- mailnews/base/src/nsMessenger.cpp | 6 +----- mailnews/base/src/nsMessengerMigrator.cpp | 3 +-- mailnews/base/src/nsMsgDBView.cpp | 4 +--- mailnews/base/src/nsMsgFolderCompactor.cpp | 1 - mailnews/base/src/nsMsgOfflineManager.cpp | 3 +-- mailnews/base/src/nsMsgPrintEngine.cpp | 4 +--- 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index c0691b4294f1..7cd139f5cb7b 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -138,10 +138,6 @@ static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID); static NS_DEFINE_CID(kMsgCopyServiceCID, NS_MSGCOPYSERVICE_CID); static NS_DEFINE_CID(kMsgPrintEngineCID, NS_MSG_PRINTENGINE_CID); - -/* This is the next generation string retrieval call */ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - #if defined(DEBUG_seth_) || defined(DEBUG_sspitzer_) || defined(DEBUG_jefft) #define DEBUG_MESSENGER #endif @@ -1893,7 +1889,7 @@ nsMessenger::InitStringBundle() const char propertyURL[] = MESSENGER_STRING_URL; nsCOMPtr sBundleService = - do_GetService(kStringBundleServiceCID, &res); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, diff --git a/mailnews/base/src/nsMessengerMigrator.cpp b/mailnews/base/src/nsMessengerMigrator.cpp index c7f96bd3e2d2..b5b0340863a6 100644 --- a/mailnews/base/src/nsMessengerMigrator.cpp +++ b/mailnews/base/src/nsMessengerMigrator.cpp @@ -99,7 +99,6 @@ static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID); static NS_DEFINE_CID(kAB4xUpgraderServiceCID, NS_AB4xUPGRADER_CID); static NS_DEFINE_CID(kAddressBookCID, NS_ADDRESSBOOK_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #define IMAP_SCHEMA "imap:/" #define IMAP_SCHEMA_LENGTH 6 @@ -447,7 +446,7 @@ nsMessengerMigrator::initializeStrings() { nsresult rv; nsCOMPtr bundleService = - do_GetService(kStringBundleServiceCID, &rv); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); nsCOMPtr bundle; diff --git a/mailnews/base/src/nsMsgDBView.cpp b/mailnews/base/src/nsMsgDBView.cpp index e06a6f31e96c..d69c3ca29ecb 100644 --- a/mailnews/base/src/nsMsgDBView.cpp +++ b/mailnews/base/src/nsMsgDBView.cpp @@ -64,8 +64,6 @@ #include "nsIMsgCopyService.h" #include "nsMsgBaseCID.h" -/* Implementation file */ -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); nsrefcnt nsMsgDBView::gInstanceCount = 0; @@ -372,7 +370,7 @@ PRUnichar * nsMsgDBView::GetString(const PRUnichar *aStringName) if (!mMessengerStringBundle) { static const char propertyURL[] = MESSENGER_STRING_URL; - nsCOMPtr sBundleService = do_GetService(kStringBundleServiceCID, &res); + nsCOMPtr sBundleService = do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && sBundleService) res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mMessengerStringBundle)); } diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp index ded5ee7e8fce..b9740956ea4f 100644 --- a/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -59,7 +59,6 @@ static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); ////////////////////////////////////////////////////////////////////////////// // nsFolderCompactState ////////////////////////////////////////////////////////////////////////////// diff --git a/mailnews/base/src/nsMsgOfflineManager.cpp b/mailnews/base/src/nsMsgOfflineManager.cpp index aa700b80b5af..1b7e8e97438f 100644 --- a/mailnews/base/src/nsMsgOfflineManager.cpp +++ b/mailnews/base/src/nsMsgOfflineManager.cpp @@ -58,7 +58,6 @@ static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID); static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); NS_IMPL_THREADSAFE_ISUPPORTS5(nsMsgOfflineManager, nsIMsgOfflineManager, @@ -281,7 +280,7 @@ nsresult nsMsgOfflineManager::ShowStatus(const char *statusMsgName) static const char propertyURL[] = MESSENGER_STRING_URL; nsCOMPtr sBundleService = - do_GetService(kStringBundleServiceCID, &res); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle)); diff --git a/mailnews/base/src/nsMsgPrintEngine.cpp b/mailnews/base/src/nsMsgPrintEngine.cpp index 46876f858460..831a67281f15 100644 --- a/mailnews/base/src/nsMsgPrintEngine.cpp +++ b/mailnews/base/src/nsMsgPrintEngine.cpp @@ -59,8 +59,6 @@ // nsMsgPrintEngine implementation ///////////////////////////////////////////////////////////////////////// -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - nsMsgPrintEngine::nsMsgPrintEngine() { mCurrentlyPrintingURI = -1; @@ -520,7 +518,7 @@ nsMsgPrintEngine::GetString(const PRUnichar *aStringName) static const char propertyURL[] = MESSENGER_STRING_URL; nsCOMPtr sBundleService = - do_GetService(kStringBundleServiceCID, &res); + do_GetService(NS_STRINGBUNDLE_CONTRACTID, &res); if (NS_SUCCEEDED(res) && (nsnull != sBundleService)) { res = sBundleService->CreateBundle(propertyURL, getter_AddRefs(mStringBundle));