From 481ff2b35ee33d71955ae41611fc5dfec8856adc Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com"
 <jaggernaut%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 25 Sep 2001 09:37:13 +0000
Subject: [PATCH] Bug 100764: remove NS_ConvertABCtoXYZ(CharT). r=dbaron,
 rs=scc

git-svn-id: svn://10.0.0.236/trunk@103710 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp    | 2 +-
 mozilla/string/obsolete/nsString.h                         | 6 ------
 mozilla/string/obsolete/nsString2.cpp                      | 7 -------
 mozilla/string/obsolete/nsString2.h                        | 7 -------
 mozilla/xpcom/string/obsolete/nsString.h                   | 6 ------
 mozilla/xpcom/string/obsolete/nsString2.cpp                | 7 -------
 mozilla/xpcom/string/obsolete/nsString2.h                  | 7 -------
 7 files changed, 1 insertion(+), 41 deletions(-)

diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp b/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
index e45f931b5a8..2ce5d523204 100644
--- a/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp
@@ -557,7 +557,7 @@ nsAbLDAPAutoCompFormatter::ProcessFormat(const nsAReadableString & aFormat,
 
                 // this character gets treated as a literal
                 //
-                (*aValue).Append(NS_ConvertUCS2toUTF8(*iter));
+                (*aValue).Append(NS_ConvertUCS2toUTF8(nsDependentString(iter.get(), 1))); //XXXjag poke me about string generators
             }
         }
 
diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index 5f5328ebfff..8ff7ff65e1f 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -524,12 +524,6 @@ class NS_COM NS_ConvertUCS2toUTF8
           Append( aString, aLength );
         }
 
-      explicit
-      NS_ConvertUCS2toUTF8( PRUnichar aChar )
-        {
-          Append( &aChar, 1 );
-        }
-
       explicit NS_ConvertUCS2toUTF8( const nsAString& aString );
 
     protected:
diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index f035e9a9ba1..1d12fc7187b 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1653,13 +1653,6 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const char* aCString )
     AppendWithConversion(aCString);
   }
 
-NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( char aChar )
-  {
-    Initialize(*this,mBuffer,(sizeof(mBuffer)>>eTwoByte)-1,0,eTwoByte,PR_FALSE);
-    AddNullTerminator(*this);
-    AppendWithConversion(aChar);
-  }
-
 void
 NS_ConvertUTF8toUCS2::Init( const char* aCString, PRUint32 aLength )
 {
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index c74c59f8970..1256968d350 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -582,7 +582,6 @@ class NS_COM NS_ConvertASCIItoUCS2
     public:
       explicit NS_ConvertASCIItoUCS2( const char* );
       NS_ConvertASCIItoUCS2( const char*, PRUint32 );
-      explicit NS_ConvertASCIItoUCS2( char );
 
 #if 0
       operator const nsDependentString() const
@@ -611,12 +610,6 @@ class NS_COM NS_ConvertUTF8toUCS2
           Init( aCString, aLength );
         }
 
-      explicit
-      NS_ConvertUTF8toUCS2( char aChar )
-        {
-          Init( &aChar, 1 );
-        }
-
     protected:
       void Init( const char* aCString, PRUint32 aLength );
 
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index 5f5328ebfff..8ff7ff65e1f 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -524,12 +524,6 @@ class NS_COM NS_ConvertUCS2toUTF8
           Append( aString, aLength );
         }
 
-      explicit
-      NS_ConvertUCS2toUTF8( PRUnichar aChar )
-        {
-          Append( &aChar, 1 );
-        }
-
       explicit NS_ConvertUCS2toUTF8( const nsAString& aString );
 
     protected:
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index f035e9a9ba1..1d12fc7187b 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1653,13 +1653,6 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const char* aCString )
     AppendWithConversion(aCString);
   }
 
-NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( char aChar )
-  {
-    Initialize(*this,mBuffer,(sizeof(mBuffer)>>eTwoByte)-1,0,eTwoByte,PR_FALSE);
-    AddNullTerminator(*this);
-    AppendWithConversion(aChar);
-  }
-
 void
 NS_ConvertUTF8toUCS2::Init( const char* aCString, PRUint32 aLength )
 {
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index c74c59f8970..1256968d350 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -582,7 +582,6 @@ class NS_COM NS_ConvertASCIItoUCS2
     public:
       explicit NS_ConvertASCIItoUCS2( const char* );
       NS_ConvertASCIItoUCS2( const char*, PRUint32 );
-      explicit NS_ConvertASCIItoUCS2( char );
 
 #if 0
       operator const nsDependentString() const
@@ -611,12 +610,6 @@ class NS_COM NS_ConvertUTF8toUCS2
           Init( aCString, aLength );
         }
 
-      explicit
-      NS_ConvertUTF8toUCS2( char aChar )
-        {
-          Init( &aChar, 1 );
-        }
-
     protected:
       void Init( const char* aCString, PRUint32 aLength );