fix a log of unix warnning- 1) make sure all XPCOM class destructor are virtual and fix warnning in new file

git-svn-id: svn://10.0.0.236/trunk@22115 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com 1999-02-26 16:32:08 +00:00
parent a859c35703
commit 9fa4a5ec6a
11 changed files with 19 additions and 17 deletions

View File

@ -58,6 +58,7 @@ private:
nsString iso2022jp;
nsString utf8;
nsString xmacroman;
nsString unknown;
};
NS_IMPL_ISUPPORTS(nsCharsetAlias, kICharsetAliasIID);
@ -74,6 +75,7 @@ nsCharsetAlias::nsCharsetAlias()
iso2022jp = "ISO-2022-JP";
xmacroman = "x-mac-roman";
utf8 = "UTF8";
unknown = "";
}
nsCharsetAlias::~nsCharsetAlias()
@ -126,7 +128,7 @@ const nsString& nsCharsetAlias::GetPreferred(
return utf8;
}
return "";
return unknown;
}
NS_IMETHODIMP nsCharsetAlias::GetPreferred(
@ -157,7 +159,7 @@ NS_IMETHODIMP nsCharsetAlias::GetPreferred(
const nsString& res = GetPreferred(aAlias);
if(res.Equals(""))
{
*oResult = NULL;
*oResult = (char) NULL;
return NS_ERROR_NOT_AVAILABLE;
}
res.ToCString(oResult, aBufLength);
@ -202,7 +204,7 @@ public:
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
}
~nsCharsetAliasFactory() {
virtual ~nsCharsetAliasFactory() {
PR_AtomicDecrement(&g_InstanceCount);
}

View File

@ -47,7 +47,7 @@ struct ConverterInfo
ConverterInfo() {}
~ConverterInfo()
virtual ~ConverterInfo()
{
if (mCharset != NULL) delete mCharset;
}
@ -141,7 +141,7 @@ public:
/**
* Class destructor.
*/
~nsCharsetConverterManager();
virtual ~nsCharsetConverterManager();
/**
* Unique factory method for this class (the constructor is private).

View File

@ -45,7 +45,7 @@ public:
/**
* Class destructor.
*/
~nsManagerFactory();
virtual ~nsManagerFactory();
//--------------------------------------------------------------------
// Interface nsIFactory [declaration]

View File

@ -35,7 +35,7 @@ class nsMacCharset : public nsIPlatformCharset
public:
nsMacCharset();
~nsMacCharset();
virtual ~nsMacCharset();
NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsString& oResult);
@ -68,7 +68,7 @@ public:
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
}
~nsMacCharsetFactory() {
virtual ~nsMacCharsetFactory() {
PR_AtomicDecrement(&g_InstanceCount);
}

View File

@ -35,7 +35,7 @@ class nsUNIXCharset : public nsIPlatformCharset
public:
nsUNIXCharset();
~nsUNIXCharset();
virtual ~nsUNIXCharset();
NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsString& oResult);
@ -68,7 +68,7 @@ public:
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
}
~nsUNIXCharsetFactory() {
virtual ~nsUNIXCharsetFactory() {
PR_AtomicDecrement(&g_InstanceCount);
}

View File

@ -38,7 +38,7 @@ public:
*/
nsUnicodeDecodeUtil();
~nsUnicodeDecodeUtil();
virtual ~nsUnicodeDecodeUtil();
public:
NS_IMETHOD Convert(

View File

@ -47,7 +47,7 @@ public:
/**
* Class destructor.
*/
~nsUnicodeEncodeHelper();
virtual ~nsUnicodeEncodeHelper();
//--------------------------------------------------------------------
// Interface nsIUnicodeEncodeHelper [declaration]

View File

@ -45,7 +45,7 @@ public:
/**
* Class destructor.
*/
~nsEncodeHelperFactory();
virtual ~nsEncodeHelperFactory();
//--------------------------------------------------------------------
// Interface nsIFactory [declaration]

View File

@ -61,7 +61,7 @@ class nsWinCharset : public nsIPlatformCharset
public:
nsWinCharset();
~nsWinCharset();
virtual ~nsWinCharset();
NS_IMETHOD GetCharset(nsPlatformCharsetSel selector, nsString& oResult);
@ -94,7 +94,7 @@ public:
NS_INIT_REFCNT();
PR_AtomicIncrement(&g_InstanceCount);
}
~nsWinCharsetFactory() {
virtual ~nsWinCharsetFactory() {
PR_AtomicDecrement(&g_InstanceCount);
}

View File

@ -47,7 +47,7 @@ public:
/**
* Class destructor.
*/
~nsUnicodeEncodeHelper();
virtual ~nsUnicodeEncodeHelper();
//--------------------------------------------------------------------
// Interface nsIUnicodeEncodeHelper [declaration]

View File

@ -45,7 +45,7 @@ public:
/**
* Class destructor.
*/
~nsEncodeHelperFactory();
virtual ~nsEncodeHelperFactory();
//--------------------------------------------------------------------
// Interface nsIFactory [declaration]