Index: mozilla/camino/src/history/nsSimpleGlobalHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/camino/src/history/nsSimpleGlobalHistory.cpp,v retrieving revision 1.24 diff -pU1 -r1.24 mozilla/camino/src/history/nsSimpleGlobalHistory.cpp --- mozilla/camino/src/history/nsSimpleGlobalHistory.cpp +++ mozilla/camino/src/history/nsSimpleGlobalHistory.cpp @@ -1738,4 +1738,3 @@ nsSimpleGlobalHistory::OpenDB() - static NS_DEFINE_CID(kMorkCID, NS_MORK_CID); - nsCOMPtr factoryfactory = do_CreateInstance(kMorkCID, &rv); + nsCOMPtr factoryfactory = do_CreateInstance(NS_MORK_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); Index: mozilla/db/mork/build/nsMorkCID.h =================================================================== RCS file: /cvsroot/mozilla/db/mork/build/nsMorkCID.h,v retrieving revision 1.6 diff -pU1 -r1.6 mozilla/db/mork/build/nsMorkCID.h --- mozilla/db/mork/build/nsMorkCID.h +++ mozilla/db/mork/build/nsMorkCID.h @@ -44,2 +44,5 @@ +#define NS_MORK_CONTRACTID \ + "@mozilla.org/db/mork;1" + // 36d90300-27f5-11d3-8d74-00805f8a6617 Index: mozilla/db/mork/build/nsMorkFactory.cpp =================================================================== RCS file: /cvsroot/mozilla/db/mork/build/nsMorkFactory.cpp,v retrieving revision 1.21 diff -pU1 -r1.21 mozilla/db/mork/build/nsMorkFactory.cpp --- mozilla/db/mork/build/nsMorkFactory.cpp +++ mozilla/db/mork/build/nsMorkFactory.cpp @@ -63,3 +63,3 @@ static const nsModuleComponentInfo compo NS_MORK_CID, - nsnull, + NS_MORK_CONTRACTID, nsMorkFactoryFactoryConstructor Index: mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp,v retrieving revision 1.142 diff -pU1 -r1.142 mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp --- mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp +++ mozilla/mailnews/addrbook/src/nsAddrDatabase.cpp @@ -103,4 +103,2 @@ static const char kMailListAddressFormat -static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID); - nsAddrDatabase::nsAddrDatabase() @@ -448,3 +446,3 @@ nsIMdbFactory *nsAddrDatabase::GetMDBFac nsresult rv; - nsCOMPtr factoryfactory = do_CreateInstance(kCMorkFactory, &rv); + nsCOMPtr factoryfactory = do_CreateInstance(NS_MORK_CONTRACTID, &rv); Index: mozilla/mailnews/base/src/nsMsgFolderCache.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/base/src/nsMsgFolderCache.cpp,v retrieving revision 1.47 diff -pU1 -r1.47 mozilla/mailnews/base/src/nsMsgFolderCache.cpp --- mozilla/mailnews/base/src/nsMsgFolderCache.cpp +++ mozilla/mailnews/base/src/nsMsgFolderCache.cpp @@ -50,4 +50,2 @@ -static NS_DEFINE_CID(kMorkCID, NS_MORK_CID); - const char *kFoldersScope = "ns:msg:db:row:scope:folders:all"; // scope for all folders table @@ -55,3 +53,2 @@ const char *kFoldersTableKind = "ns:msg: - nsMsgFolderCache::nsMsgFolderCache() @@ -113,3 +110,3 @@ nsMsgFolderCache::QueryInterface(const n nsresult rv; - nsCOMPtr factoryfactory = do_CreateInstance(kMorkCID, &rv); + nsCOMPtr factoryfactory = do_CreateInstance(NS_MORK_CONTRACTID, &rv); if (NS_SUCCEEDED(rv) && factoryfactory) Index: mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp,v retrieving revision 1.362 diff -pU1 -r1.362 mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp --- mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -78,4 +78,2 @@ -static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID); - #if defined(XP_MAC) && defined(CompareString) @@ -997,3 +995,3 @@ NS_IMETHODIMP nsMsgDatabase::QueryInterf { - nsCOMPtr factoryfactory = do_CreateInstance(kCMorkFactory); + nsCOMPtr factoryfactory = do_CreateInstance(NS_MORK_CONTRACTID); if (factoryfactory) Index: mozilla/toolkit/components/history/src/nsGlobalHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/components/history/src/nsGlobalHistory.cpp,v retrieving revision 1.73 diff -pU1 -r1.73 mozilla/toolkit/components/history/src/nsGlobalHistory.cpp --- mozilla/toolkit/components/history/src/nsGlobalHistory.cpp +++ mozilla/toolkit/components/history/src/nsGlobalHistory.cpp @@ -2675,5 +2675,4 @@ nsGlobalHistory::OpenDB() - static NS_DEFINE_CID(kMorkCID, NS_MORK_CID); nsCOMPtr factoryfactory = - do_CreateInstance(kMorkCID, &rv); + do_CreateInstance(NS_MORK_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); Index: mozilla/toolkit/components/satchel/src/nsFormHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/toolkit/components/satchel/src/nsFormHistory.cpp,v retrieving revision 1.31 diff -pU1 -r1.31 mozilla/toolkit/components/satchel/src/nsFormHistory.cpp --- mozilla/toolkit/components/satchel/src/nsFormHistory.cpp +++ mozilla/toolkit/components/satchel/src/nsFormHistory.cpp @@ -352,4 +352,3 @@ nsFormHistory::OpenDatabase() // Get an Mdb Factory - static NS_DEFINE_CID(kMorkCID, NS_MORK_CID); - nsCOMPtr mdbFactory = do_CreateInstance(kMorkCID, &rv); + nsCOMPtr mdbFactory = do_CreateInstance(NS_MORK_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv); Index: mozilla/xpfe/components/history/src/nsGlobalHistory.cpp =================================================================== RCS file: /cvsroot/mozilla/xpfe/components/history/src/nsGlobalHistory.cpp,v retrieving revision 1.219 diff -pU1 -r1.219 mozilla/xpfe/components/history/src/nsGlobalHistory.cpp --- mozilla/xpfe/components/history/src/nsGlobalHistory.cpp +++ mozilla/xpfe/components/history/src/nsGlobalHistory.cpp @@ -2576,5 +2576,4 @@ nsGlobalHistory::OpenDB() - static NS_DEFINE_CID(kMorkCID, NS_MORK_CID); nsCOMPtr factoryfactory = - do_CreateInstance(kMorkCID, &rv); + do_CreateInstance(NS_MORK_CONTRACTID, &rv); NS_ENSURE_SUCCESS(rv, rv);