From 58b0747a46fff81c9ce9820fa49ff0cac116d0d6 Mon Sep 17 00:00:00 2001 From: "scc%mozilla.org" Date: Tue, 20 Jun 2000 04:25:20 +0000 Subject: [PATCH] fix for bug #43085. r=waterson, a=waterson --- string/obsolete/nsString.h | 17 ++++++++++++++--- string/obsolete/nsString2.h | 22 +++++++++++++++++++--- xpcom/ds/nsString.h | 17 ++++++++++++++--- xpcom/ds/nsString2.h | 22 +++++++++++++++++++--- xpcom/string/obsolete/nsString.h | 17 ++++++++++++++--- xpcom/string/obsolete/nsString2.h | 22 +++++++++++++++++++--- 6 files changed, 99 insertions(+), 18 deletions(-) diff --git a/string/obsolete/nsString.h b/string/obsolete/nsString.h index 61169ff2833..0e9430a14ca 100644 --- a/string/obsolete/nsString.h +++ b/string/obsolete/nsString.h @@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8 { public: NS_ConvertUCS2toUTF8( const PRUnichar* aString ) - { Init( aString, ~PRUint32(0) /* MAXINT */); } + { + Init( aString, ~PRUint32(0) /* MAXINT */); + } NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength ) - { Init( aString, aLength ); } + { + Init( aString, aLength ); + } NS_ConvertUCS2toUTF8( PRUnichar aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const char*() const + { + return GetBuffer(); + } protected: void Init( const PRUnichar* aString, PRUint32 aLength ); diff --git a/string/obsolete/nsString2.h b/string/obsolete/nsString2.h index 2c0d4a83c72..d41271e09d2 100644 --- a/string/obsolete/nsString2.h +++ b/string/obsolete/nsString2.h @@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2 #endif #ifdef NEW_STRING_APIS + operator const PRUnichar*() const + { + return GetUnicode(); + } + operator nsLiteralString() const { return nsLiteralString(mUStr, mLength); @@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2 { public: NS_ConvertUTF8toUCS2( const char* aCString ) - { Init( aCString, ~PRUint32(0) /* MAXINT */ ); } + { + Init( aCString, ~PRUint32(0) /* MAXINT */ ); + } NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength ) - { Init( aCString, aLength ); } + { + Init( aCString, aLength ); + } NS_ConvertUTF8toUCS2( char aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const PRUnichar*() const + { + return GetUnicode(); + } protected: void Init( const char* aCString, PRUint32 aLength ); diff --git a/xpcom/ds/nsString.h b/xpcom/ds/nsString.h index 61169ff2833..0e9430a14ca 100644 --- a/xpcom/ds/nsString.h +++ b/xpcom/ds/nsString.h @@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8 { public: NS_ConvertUCS2toUTF8( const PRUnichar* aString ) - { Init( aString, ~PRUint32(0) /* MAXINT */); } + { + Init( aString, ~PRUint32(0) /* MAXINT */); + } NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength ) - { Init( aString, aLength ); } + { + Init( aString, aLength ); + } NS_ConvertUCS2toUTF8( PRUnichar aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const char*() const + { + return GetBuffer(); + } protected: void Init( const PRUnichar* aString, PRUint32 aLength ); diff --git a/xpcom/ds/nsString2.h b/xpcom/ds/nsString2.h index 2c0d4a83c72..d41271e09d2 100644 --- a/xpcom/ds/nsString2.h +++ b/xpcom/ds/nsString2.h @@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2 #endif #ifdef NEW_STRING_APIS + operator const PRUnichar*() const + { + return GetUnicode(); + } + operator nsLiteralString() const { return nsLiteralString(mUStr, mLength); @@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2 { public: NS_ConvertUTF8toUCS2( const char* aCString ) - { Init( aCString, ~PRUint32(0) /* MAXINT */ ); } + { + Init( aCString, ~PRUint32(0) /* MAXINT */ ); + } NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength ) - { Init( aCString, aLength ); } + { + Init( aCString, aLength ); + } NS_ConvertUTF8toUCS2( char aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const PRUnichar*() const + { + return GetUnicode(); + } protected: void Init( const char* aCString, PRUint32 aLength ); diff --git a/xpcom/string/obsolete/nsString.h b/xpcom/string/obsolete/nsString.h index 61169ff2833..0e9430a14ca 100644 --- a/xpcom/string/obsolete/nsString.h +++ b/xpcom/string/obsolete/nsString.h @@ -895,13 +895,24 @@ class NS_COM NS_ConvertUCS2toUTF8 { public: NS_ConvertUCS2toUTF8( const PRUnichar* aString ) - { Init( aString, ~PRUint32(0) /* MAXINT */); } + { + Init( aString, ~PRUint32(0) /* MAXINT */); + } NS_ConvertUCS2toUTF8( const PRUnichar* aString, PRUint32 aLength ) - { Init( aString, aLength ); } + { + Init( aString, aLength ); + } NS_ConvertUCS2toUTF8( PRUnichar aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const char*() const + { + return GetBuffer(); + } protected: void Init( const PRUnichar* aString, PRUint32 aLength ); diff --git a/xpcom/string/obsolete/nsString2.h b/xpcom/string/obsolete/nsString2.h index 2c0d4a83c72..d41271e09d2 100644 --- a/xpcom/string/obsolete/nsString2.h +++ b/xpcom/string/obsolete/nsString2.h @@ -990,6 +990,11 @@ class NS_COM NS_ConvertASCIItoUCS2 #endif #ifdef NEW_STRING_APIS + operator const PRUnichar*() const + { + return GetUnicode(); + } + operator nsLiteralString() const { return nsLiteralString(mUStr, mLength); @@ -1029,13 +1034,24 @@ class NS_COM NS_ConvertUTF8toUCS2 { public: NS_ConvertUTF8toUCS2( const char* aCString ) - { Init( aCString, ~PRUint32(0) /* MAXINT */ ); } + { + Init( aCString, ~PRUint32(0) /* MAXINT */ ); + } NS_ConvertUTF8toUCS2( const char* aCString, PRUint32 aLength ) - { Init( aCString, aLength ); } + { + Init( aCString, aLength ); + } NS_ConvertUTF8toUCS2( char aChar ) - { Init( &aChar, 1 ); } + { + Init( &aChar, 1 ); + } + + operator const PRUnichar*() const + { + return GetUnicode(); + } protected: void Init( const char* aCString, PRUint32 aLength );