Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

explicitly define kCharsetConversionManagerCID only in files that need it ... move to canonical scheme for defining and using IIDs and CIDs

Browse Source
This commit is contained in:
scc%netscape.com 1999-07-22 05:25:17 +00:00
parent d1e0dbad12
commit 16e2ba6a23
19 changed files with 65 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@ -48,6 +48,8 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static char* gHeaderComment = "<!-- This page was created by the Gecko output system. -->";
static char* gDocTypeHeader = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">";
const int gTabSize=2;
@ -323,7 +325,7 @@ nsresult nsHTMLContentSinkStream::InitEncoder(const nsString& aCharset)
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

4
htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@ -46,6 +46,8 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
const int gTabSize=2;
static PRBool IsInline(eHTMLTags aTag);
@ -92,7 +94,7 @@ nsresult nsHTMLToTXTSinkStream::InitEncoder(const nsString& aCharset)
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

3
htmlparser/src/nsScanner.cpp
View File

@ -26,6 +26,7 @@
#include "nsICharsetAlias.h"
#include "nsFileSpec.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
const char* kBadHTMLText="<H3>Oops...</H3>You just tried to read a non-existent document: <BR>";
const char* kUnorderedStringError = "String argument must be ordered. Don't you read API's?";
@ -150,7 +151,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

4
intl/locale/src/mac/nsDateTimeFormatMac.cpp
View File

@ -32,6 +32,8 @@ static NS_DEFINE_IID(kIDateTimeFormatIID, NS_IDATETIMEFORMAT_IID);
static NS_DEFINE_IID(kMacLocaleFactoryCID, NS_MACLOCALEFACTORY_CID);
static NS_DEFINE_IID(kIMacLocaleIID, NS_IMACLOCALE_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
////////////////////////////////////////////////////////////////////////////////
@ -333,7 +335,7 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
nsIUnicodeDecoder * decoder = nsnull;

3
intl/locale/src/nsCollation.cpp
View File

@ -29,6 +29,7 @@
NS_DEFINE_IID(kICollationFactoryIID, NS_ICOLLATIONFACTORY_IID);
NS_DEFINE_CID(kCollationCID, NS_COLLATION_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
NS_IMPL_ISUPPORTS(nsCollationFactory, kICollationFactoryIID);
@ -197,7 +198,7 @@ nsresult nsCollation::UnicodeToChar(const nsString& src, char** dst, const nsStr
nsresult res;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm)) {
nsIUnicodeEncoder* encoder = nsnull;

26
intl/uconv/public/nsICharsetConverterManager.h
View File

@ -28,13 +28,29 @@
// Interface ID for our ConverterManager interface
// {1E3F79F0-6B6B-11d2-8A86-00600811A836}
NS_DECLARE_ID(kICharsetConverterManagerIID,
0x1e3f79f0, 0x6b6b, 0x11d2, 0x8a, 0x86, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
// NS_DECLARE_ID(kICharsetConverterManagerIID,
// 0x1e3f79f0, 0x6b6b, 0x11d2, 0x8a, 0x86, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
#define NS_ICHARSETCONVERTERMANAGER_IID \
{ /* 1E3F79F0-6B6B-11d2-8A86-00600811A836 */ \
0x1e3f79f0, \
0x6b6b, \
0x11d2, \
{0x8a, 0x86, 0x00, 0x60, 0x08, 0x11, 0xa8, 0x36} \
}
// Class ID for our ConverterManager implementation
// {1E3F79F1-6B6B-11d2-8A86-00600811A836}
NS_DECLARE_ID(kCharsetConverterManagerCID,
0x1e3f79f1, 0x6b6b, 0x11d2, 0x8a, 0x86, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
// NS_DECLARE_ID(kCharsetConverterManagerCID,
// 0x1e3f79f1, 0x6b6b, 0x11d2, 0x8a, 0x86, 0x0, 0x60, 0x8, 0x11, 0xa8, 0x36);
#define NS_ICHARSETCONVERTERMANAGER_CID \
{ /* 1E3F79F1-6B6B-11d2-8A86-00600811A836 */ \
0x1e3f79f1, \
0x6b6b, \
0x11d2, \
{0x8a, 0x86, 0x00, 0x60, 0x08, 0x11, 0xa8, 0x36} \
}
#define NS_CHARSETCONVERTERMANAGER_PROGID "componment://netscape/intl/charsetconvertermanager"
@ -63,7 +79,7 @@ class nsICharsetConverterManager : public nsISupports
{
public:
static const nsIID& GetIID() { static nsIID iid = kICharsetConverterManagerIID; return iid; }
static const nsIID& GetIID() { static nsIID iid = NS_ICHARSETCONVERTERMANAGER_IID; return iid; }
/**
* Find and instantiate a Converter able to encode from Unicode into the
* destination charset.

4
intl/uconv/src/nsCharsetConverterManager.cpp
View File

@ -171,7 +171,7 @@ public:
//----------------------------------------------------------------------
// Class nsCharsetConverterManager [implementation]
NS_IMPL_ISUPPORTS(nsCharsetConverterManager, kICharsetConverterManagerIID);
NS_IMPL_ISUPPORTS(nsCharsetConverterManager, nsCOMTypeInfo<nsICharsetConverterManager>::GetIID());
nsICharsetConverterManager * nsCharsetConverterManager::mInstance = NULL;
@ -548,7 +548,7 @@ NS_IMETHODIMP nsManagerFactory::CreateInstance(nsISupports *aDelegate,
nsresult res = NS_OK;
if (aIID.Equals(kICharsetConverterManagerIID))
if (aIID.Equals(nsCOMTypeInfo<nsICharsetConverterManager>::GetIID()))
{
nsICharsetConverterManager * t = nsCharsetConverterManager::GetInstance();
if (t == NULL) return NS_ERROR_OUT_OF_MEMORY;

3
intl/uconv/src/nsUConvDll.cpp
View File

@ -33,6 +33,7 @@
#include "nsUConvDll.h"
static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
//----------------------------------------------------------------------
// Global functions and data [declaration]
@ -61,7 +62,7 @@ extern "C" NS_EXPORT nsresult NSGetFactory(nsISupports* aServMgr,
*aFactory = NULL;
// the converter manager
if (aClass.Equals(kCharsetConverterManagerCID)) {
if (aClass.Equals(nsCOMTypeInfo<nsICharsetConverterManager>::GetIID())) {
nsManagerFactory *factory = new nsManagerFactory();
if(nsnull == factory)

2
intl/uconv/ucvlatin/ns1ByteToUnicodeBase.cpp
View File

@ -25,6 +25,8 @@
#include "nsICharsetConverterManager.h"
#include "ns1ByteToUnicodeBase.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
ns1ByteToUnicodeBase::ns1ByteToUnicodeBase()
{
mUtil = nsnull;

4
layout/html/forms/src/nsFormFrame.cpp
View File

@ -98,6 +98,8 @@ static NS_DEFINE_IID(kIWebshellIID, NS_IWEB_SHELL_IID);
static NS_DEFINE_IID(kIContentViewerContainerIID, NS_ICONTENT_VIEWER_CONTAINER_IID);
static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
#ifdef SingleSignon
#define FORM_TYPE_TEXT 1
#define FORM_TYPE_PASSWORD 7
@ -726,7 +728,7 @@ NS_IMETHODIMP nsFormFrame::GetEncoder(nsIUnicodeEncoder** encoder)
// Get Charset, get the encoder.
nsICharsetConverterManager * ccm = nsnull;
rv = nsServiceManager::GetService(kCharsetConverterManagerCID ,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(rv) && (nsnull != ccm)) {
rv = ccm->GetUnicodeEncoder(&charset, encoder);

1
mailnews/compose/src/nsMsgI18N.cpp
View File

@ -32,6 +32,7 @@
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);
//
// International functions necessary for composition

1
mailnews/imap/src/nsImapProtocol.cpp
View File

@ -78,6 +78,7 @@ static NS_DEFINE_CID(kNetServiceCID, NS_NETSERVICE_CID);
static NS_DEFINE_IID(kIWebShell, NS_IWEB_SHELL_IID);
static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
static NS_DEFINE_CID(kCImapService, NS_IMAPSERVICE_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
#define OUTPUT_BUFFER_SIZE (4096*2) // mscott - i should be able to remove this if I can use nsMsgLineBuffer???

1
mailnews/mime/cthandlers/vcard/mimevcrd.cpp
View File

@ -43,6 +43,7 @@
//#include "vobject.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static int MimeInlineTextVCard_parse_line (char *, PRInt32, MimeObject *);
static int MimeInlineTextVCard_parse_eof (MimeObject *, PRBool);

1
mailnews/mime/src/comi18n.cpp
View File

@ -34,6 +34,7 @@
#include "nsIPref.h"
static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
// BEGIN EXTERNAL DEPENDANCY

4
parser/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@ -48,6 +48,8 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
static char* gHeaderComment = "<!-- This page was created by the Gecko output system. -->";
static char* gDocTypeHeader = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">";
const int gTabSize=2;
@ -323,7 +325,7 @@ nsresult nsHTMLContentSinkStream::InitEncoder(const nsString& aCharset)
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

4
parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
View File

@ -46,6 +46,8 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID);
static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
const int gTabSize=2;
static PRBool IsInline(eHTMLTags aTag);
@ -92,7 +94,7 @@ nsresult nsHTMLToTXTSinkStream::InitEncoder(const nsString& aCharset)
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

3
parser/htmlparser/src/nsScanner.cpp
View File

@ -26,6 +26,7 @@
#include "nsICharsetAlias.h"
#include "nsFileSpec.h"
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
const char* kBadHTMLText="<H3>Oops...</H3>You just tried to read a non-existent document: <BR>";
const char* kUnorderedStringError = "String argument must be ordered. Don't you read API's?";
@ -150,7 +151,7 @@ nsresult nsScanner::SetDocumentCharset(const nsString& aCharset , nsCharsetSourc
nsICharsetConverterManager * ccm = nsnull;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID,
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
(nsISupports**)&ccm);
if(NS_SUCCEEDED(res) && (nsnull != ccm))
{

10
xpcom/ds/nsCRT.h
View File

@ -23,6 +23,7 @@
#include "plstr.h"
#include "nscore.h"
#include "prtypes.h"
#include "nsCppSharedAllocator.h"
#define CR '\015'
#define LF '\012'
@ -196,12 +197,15 @@ public:
static PRInt32 strncasecmp(const PRUnichar* s1, const char* s2,
PRUint32 aMaxLen);
// Note: uses new[] to allocate memory, so you must use delete[] to
// free the memory
// Note: uses the global shared allocator |nsAllocator| through the C++
// |nsCppSharedAllocator| interface (matches C++ standard allocators).
// So must the corresponding |free|, as below, must do the same.
static PRUnichar* strdup(const PRUnichar* str);
static void free(PRUnichar* str) {
delete[] str;
nsCppSharedAllocator<PRUnichar> shared_allocator;
shared_allocator.deallocate(str, 0 /*we never new or kept the size*/);
// delete[] str;
}
/// Compute a hashcode for a C string

5
xpcom/io/nsUnicharInputStream.cpp
View File

@ -33,6 +33,7 @@
#endif
static NS_DEFINE_IID(kIUnicharInputStreamIID, NS_IUNICHAR_INPUT_STREAM_IID);
static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
class StringUnicharInputStream : public nsIUnicharInputStream {
public:
@ -142,8 +143,8 @@ NS_NewB2UConverter(nsIUnicodeDecoder** aInstancePtrResult,
nsAutoString defaultCharset("ISO-8859-1");
if (aCharSet == nsnull) aCharSet = &defaultCharset;
res = nsServiceManager::GetService(kCharsetConverterManagerCID,
kICharsetConverterManagerIID, (nsISupports**)&ccm);
res = nsServiceManager::GetService(nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(),
nsCOMTypeInfo<nsICharsetConverterManager>::GetIID(), (nsISupports**)&ccm);
if (NS_FAILED(res)) return res;
res = ccm->GetUnicodeDecoder(aCharSet, aInstancePtrResult);