Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing code that relied on implicit string construction

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76750 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2000-08-20 06:59:07 +00:00
parent a5293d2dbe
commit 20f047d01b
16 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/xpcom/string/obsolete/nsString.h
View File

@@ -110,9 +110,9 @@ public:
nsCString(const nsCString& aString);
#ifdef NEW_STRING_APIS
nsCString( const nsAReadableCString& );
explicit nsCString( const nsAReadableCString& );
nsCString(const char*);
explicit nsCString(const char*);
nsCString(const char*, PRInt32);
#else
/**
@@ -833,10 +833,11 @@ public:
virtual ~nsCAutoString();
nsCAutoString();
nsCAutoString(const nsCString& );
nsCAutoString(const char* aString);
// why does this class have no copy constructor? nsCAutoString( const nsCAutoString& );
explicit nsCAutoString(const nsCString& );
explicit nsCAutoString(const char* aString);
nsCAutoString(const char* aString,PRInt32 aLength);
nsCAutoString(const CBufDescriptor& aBuffer);
explicit nsCAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsCAutoString(const PRUnichar* aString,PRInt32 aLength=-1);
@@ -895,6 +896,7 @@ class NS_COM NS_ConvertUCS2toUTF8
*/
{
public:
explicit
NS_ConvertUCS2toUTF8( const PRUnichar* aString )
{
Init( aString, ~PRUint32(0) /* MAXINT */);
@@ -905,6 +907,7 @@ class NS_COM NS_ConvertUCS2toUTF8
Init( aString, aLength );
}
explicit
NS_ConvertUCS2toUTF8( PRUnichar aChar )
{
Init( &aChar, 1 );
@@ -939,7 +942,7 @@ class NS_COM NS_ConvertUCS2toUTF8
***************************************************************/
class NS_COM nsSubsumeCStr : public nsCString {
public:
nsSubsumeCStr(nsStr& aString);
explicit nsSubsumeCStr(nsStr& aString);
nsSubsumeCStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeCStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);

25
mozilla/xpcom/string/obsolete/nsString2.h
View File

@@ -104,9 +104,9 @@ public:
nsString(const nsString& aString);
#ifdef NEW_STRING_APIS
nsString(const nsAReadableString&);
explicit nsString(const nsAReadableString&);
nsString(const PRUnichar*);
explicit nsString(const PRUnichar*);
nsString(const PRUnichar*, PRInt32);
#else
/**
@@ -924,11 +924,11 @@ public:
virtual ~nsAutoString();
nsAutoString();
nsAutoString(const nsAutoString& aString);
nsAutoString(const nsString& aString);
nsAutoString(const PRUnichar* aString);
explicit nsAutoString(const nsString& aString);
explicit nsAutoString(const PRUnichar* aString);
nsAutoString(const PRUnichar* aString,PRInt32 aLength);
nsAutoString(PRUnichar aChar);
nsAutoString(const CBufDescriptor& aBuffer);
explicit nsAutoString(PRUnichar aChar);
explicit nsAutoString(const CBufDescriptor& aBuffer);
#ifndef NEW_STRING_APIS
// nsAutoString(const char* aCString,PRInt32 aLength=-1);
@@ -979,15 +979,15 @@ class NS_COM NS_ConvertASCIItoUCS2
*/
{
public:
NS_ConvertASCIItoUCS2( const char* );
explicit NS_ConvertASCIItoUCS2( const char* );
NS_ConvertASCIItoUCS2( const char*, PRUint32 );
NS_ConvertASCIItoUCS2( char );
explicit NS_ConvertASCIItoUCS2( char );
#if 0
#ifdef NEW_STRING_APIS
NS_ConvertASCIItoUCS2( const nsAReadableCString& );
explicit NS_ConvertASCIItoUCS2( const nsAReadableCString& );
#else
class nsCString;
NS_ConvertASCIItoUCS2( const nsCString& );
explicit NS_ConvertASCIItoUCS2( const nsCString& );
#endif
#endif
@@ -997,6 +997,7 @@ class NS_COM NS_ConvertASCIItoUCS2
return GetUnicode();
}
// is this really a good idea? I'm getting very paranoid about automatic conversions
operator nsLiteralString() const
{
return nsLiteralString(mUStr, mLength);
@@ -1035,6 +1036,7 @@ class NS_COM NS_ConvertUTF8toUCS2
: public nsAutoString
{
public:
explicit
NS_ConvertUTF8toUCS2( const char* aCString )
{
Init( aCString, ~PRUint32(0) /* MAXINT */ );
@@ -1045,6 +1047,7 @@ class NS_COM NS_ConvertUTF8toUCS2
Init( aCString, aLength );
}
explicit
NS_ConvertUTF8toUCS2( char aChar )
{
Init( &aChar, 1 );
@@ -1078,7 +1081,7 @@ class NS_COM NS_ConvertUTF8toUCS2
class NS_COM nsSubsumeStr : public nsString {
public:
nsSubsumeStr();
nsSubsumeStr(nsStr& aString);
explicit nsSubsumeStr(nsStr& aString);
nsSubsumeStr(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
nsSubsumeStr(char* aString,PRBool assumeOwnership,PRInt32 aLength=-1);
int Subsume(PRUnichar* aString,PRBool assumeOwnership,PRInt32 aLength=-1);