mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

cid to progid cleanup. no bug.

This commit is contained in:
sspitzer%netscape.com 2002-09-27 09:32:06 +00:00
Родитель b4409afb0e
Коммит f60bd335f1
12 изменённых файлов: 19 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
mailnews/base/util/nsMsgI18N.cpp
Просмотреть файл

@ -63,7 +63,6 @@
#include "nsUnicharUtils.h"
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID);
@ -395,7 +394,7 @@ char * nsMsgI18NEncodeMimePartIIStr(const char *header, PRBool structured, const
char *encodedString = nsnull;
nsresult res;
nsCOMPtr<nsIMimeConverter> converter = do_GetService(kCMimeConverterCID, &res);
nsCOMPtr<nsIMimeConverter> converter = do_GetService(NS_MIME_CONVERTER_CONTRACTID, &res);
if (NS_SUCCEEDED(res) && nsnull != converter)
res = converter->EncodeMimePartIIStr_UTF8(header, structured, charset, fieldnamelen, kMIME_ENCODED_WORD_SIZE, &encodedString);

3
mailnews/base/util/nsMsgUtils.cpp
Просмотреть файл

@ -65,7 +65,6 @@
static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID);
static NS_DEFINE_CID(kCMailboxUrl, NS_MAILBOXURL_CID);
static NS_DEFINE_CID(kCNntpUrlCID, NS_NNTPURL_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
#define NS_PASSWORDMANAGER_CATEGORY "passwordmanager"
static PRBool gInitPasswordManager = PR_FALSE;
@ -366,7 +365,7 @@ PRBool NS_MsgStripRE(const char **stringP, PRUint32 *lengthP, char **modifiedSub
// we cannot strip "Re:" for MIME encoded subject without modifying the original
if (modifiedSubject && strstr(*stringP, "=?"))
{
mimeConverter = do_GetService(kCMimeConverterCID, &rv);
mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
rv = mimeConverter->DecodeMimeHeader(*stringP, getter_Copies(decodedString));
}

7
mailnews/compose/src/nsMsgCompose.cpp
Просмотреть файл

@ -114,7 +114,6 @@
// Defines....
static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
static PRInt32 GetReplyOnTop()
@ -1441,7 +1440,7 @@ nsresult nsMsgCompose::CreateMessage(const char * originalMsgURI,
if (!uriList)
return NS_ERROR_OUT_OF_MEMORY;
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(kCMimeConverterCID);
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);
nsXPIDLCString charset;
// use a charset of the original message
@ -1788,7 +1787,7 @@ QuotingOutputStreamListener::QuotingOutputStreamListener(const char * originalMs
if (NS_SUCCEEDED(rv))
{
nsXPIDLCString decodedString;
mMimeConverter = do_GetService(kCMimeConverterCID);
mMimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);
// Decode header, the result string is null if the input is non MIME encoded ASCII.
if (mMimeConverter)
mMimeConverter->DecodeMimeHeader(author.get(), getter_Copies(decodedString), charset, charetOverride);
@ -1918,7 +1917,7 @@ NS_IMETHODIMP QuotingOutputStreamListener::OnStopRequest(nsIRequest *request, ns
PRBool needToRemoveDup = PR_FALSE;
if (!mMimeConverter)
{
mMimeConverter = do_GetService(kCMimeConverterCID, &rv);
mMimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
}
nsXPIDLCString charset;

11
mailnews/compose/src/nsMsgEncoders.cpp
Просмотреть файл

@ -45,14 +45,13 @@
#include "nsIMimeConverter.h"
/* This is the next generation string retrieval call */
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
extern "C" MimeEncoderData *
MIME_B64EncoderInit(nsresult (*output_fn) (const char *buf, PRInt32 size, void *closure), void *closure)
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -67,7 +66,7 @@ MIME_QPEncoderInit(nsresult (*output_fn) (const char *buf, PRInt32 size, void *c
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -82,7 +81,7 @@ MIME_UUEncoderInit(char *filename, nsresult (*output_fn) (const char *buf, PRInt
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -97,7 +96,7 @@ MIME_EncoderDestroy(MimeEncoderData *data, PRBool abort_p)
{
//MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -114,7 +113,7 @@ MIME_EncoderWrite(MimeEncoderData *data, const char *buffer, PRInt32 size)
// MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
PRInt32 written = 0;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter) {
res = converter->EncoderWrite(data, buffer, size, &written);

3
mailnews/compose/src/nsMsgSendLater.cpp
Просмотреть файл

@ -76,7 +76,6 @@ static NS_DEFINE_CID(kSmtpServiceCID, NS_SMTPSERVICE_CID);
static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID);
static NS_DEFINE_CID(kMsgSendCID, NS_MSGSEND_CID);
static NS_DEFINE_CID(kISupportsArrayCID, NS_SUPPORTSARRAY_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
NS_IMPL_ISUPPORTS2(nsMsgSendLater, nsIMsgSendLater, nsIStreamListener)
@ -503,7 +502,7 @@ nsCOMPtr<nsIMsgSend> pMsgSend = nsnull;
return NS_ERROR_FACTORY_NOT_LOADED;
}
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(kCMimeConverterCID, &rv);
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
// Since we have already parsed all of the headers, we are simply going to

2
mailnews/compose/src/nsMsgSendPart.cpp
Просмотреть файл

@ -57,8 +57,6 @@ static char *mime_mailto_stream_read_buffer = 0;
PRInt32 nsMsgSendPart::M_counter = 0;
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
nsMsgSendPart::nsMsgSendPart(nsIMsgSend* state, const char *part_charset)
{
m_state = nsnull;

3
mailnews/compose/src/nsSmtpUrl.cpp
Просмотреть файл

@ -49,7 +49,6 @@
#include "nsISupportsObsolete.h"
static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
/////////////////////////////////////////////////////////////////////////////////////
// mailto url definition
@ -194,7 +193,7 @@ nsresult nsMailtoUrl::ParseMailtoUrl(char * searchPart)
} // while we still have part of the url to parse...
} // if rest && *rest
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(kCMimeConverterCID);
nsCOMPtr<nsIMimeConverter> mimeConverter = do_GetService(NS_MIME_CONVERTER_CONTRACTID);
nsXPIDLCString decodedString;
// Now unescape any fields that need escaped...

3
mailnews/db/msgdb/src/nsMsgDatabase.cpp
Просмотреть файл

@ -89,7 +89,6 @@ static NS_DEFINE_CID(kCMorkFactory, NS_MORK_CID);
#endif
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID);
#define MSG_HASH_SIZE 512
@ -2839,7 +2838,7 @@ nsIMimeConverter *nsMsgDatabase::GetMimeConverter()
if (!m_mimeConverter)
{
// apply mime decode
nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), getter_AddRefs(m_mimeConverter));
}
return m_mimeConverter;

2
mailnews/db/msgdb/src/nsMsgHdr.cpp
Просмотреть файл

@ -47,8 +47,6 @@
NS_IMPL_ISUPPORTS1(nsMsgHdr, nsIMsgDBHdr)
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
#define FLAGS_INITED 0x1
#define CACHED_VALUES_INITED 0x2
#define REFERENCES_INITED 0x4

11
mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
Просмотреть файл

@ -71,14 +71,13 @@ static char *mime_make_separator(const char *prefix);
#include "nsIMimeConverter.h"
/* This is the next generation string retrieval call */
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
MimeEncoderData *
MIME_B64EncoderInit(nsresult (*PR_CALLBACK output_fn) (const char *buf, PRInt32 size, void *closure), void *closure)
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -93,7 +92,7 @@ MIME_QPEncoderInit(nsresult (*PR_CALLBACK output_fn) (const char *buf, PRInt32 s
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -108,7 +107,7 @@ MIME_UUEncoderInit(char *filename, nsresult (*PR_CALLBACK output_fn) (const char
{
MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -123,7 +122,7 @@ MIME_EncoderDestroy(MimeEncoderData *data, PRBool abort_p)
{
//MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter)
{
@ -140,7 +139,7 @@ MIME_EncoderWrite(MimeEncoderData *data, const char *buffer, PRInt32 size)
// MimeEncoderData *returnEncoderData = nsnull;
nsIMimeConverter *converter;
PRInt32 written = 0;
nsresult res = nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsresult res = nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter), (void **)&converter);
if (NS_SUCCEEDED(res) && nsnull != converter) {
res = converter->EncoderWrite(data, buffer, size, &written);

3
mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp
Просмотреть файл

@ -71,7 +71,6 @@ static PRLogModuleInfo * gMimeEmitterLogModule = nsnull;
#define MIME_URL "chrome://messenger/locale/mimeheader.properties"
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
NS_IMPL_THREADSAFE_ADDREF(nsMimeBaseEmitter)
NS_IMPL_THREADSAFE_RELEASE(nsMimeBaseEmitter)
@ -125,7 +124,7 @@ nsMimeBaseEmitter::nsMimeBaseEmitter()
// mBody = "";
// This is needed for conversion of I18N Strings...
nsComponentManager::CreateInstance(kCMimeConverterCID, nsnull,
nsComponentManager::CreateInstance(NS_MIME_CONVERTER_CONTRACTID, nsnull,
NS_GET_IID(nsIMimeConverter),
getter_AddRefs(mUnicodeConverter));

1
mailnews/mime/emitters/src/nsMimeHtmlEmitter.cpp
Просмотреть файл

@ -60,7 +60,6 @@
#include "nsMsgMimeCID.h"
#include "nsDateTimeFormatCID.h"
static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID);
static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
#define VIEW_ALL_HEADERS 2