From 4440bdbb28996b45e67cdabb9ae8725b8030b29d Mon Sep 17 00:00:00 2001
From: "disttsc%bart.nl" <disttsc%bart.nl@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 7 Oct 2000 00:08:47 +0000
Subject: [PATCH] Add |.get()| to NS_ConvertUCS2toUTF8 to make getting rid of
 some MLKs easier, bug=54740, r=scc, a=waterson

git-svn-id: svn://10.0.0.236/trunk@80623 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsString.h       | 9 +++++++--
 mozilla/xpcom/ds/nsString.h              | 9 +++++++--
 mozilla/xpcom/string/obsolete/nsString.h | 9 +++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/mozilla/string/obsolete/nsString.h b/mozilla/string/obsolete/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/string/obsolete/nsString.h
+++ b/mozilla/string/obsolete/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected:
diff --git a/mozilla/xpcom/ds/nsString.h b/mozilla/xpcom/ds/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/xpcom/ds/nsString.h
+++ b/mozilla/xpcom/ds/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected:
diff --git a/mozilla/xpcom/string/obsolete/nsString.h b/mozilla/xpcom/string/obsolete/nsString.h
index f3dda1b5ce2..446200f3855 100644
--- a/mozilla/xpcom/string/obsolete/nsString.h
+++ b/mozilla/xpcom/string/obsolete/nsString.h
@@ -576,9 +576,14 @@ class NS_COM NS_ConvertUCS2toUTF8
 
       explicit NS_ConvertUCS2toUTF8( const nsAReadableString& aString );
 
-      operator const char*() const
+      const char* get() const
         {
-          return GetBuffer();
+          return mStr;
+        }
+
+      operator const char*() const  // to be deprecated, prefer |get()|
+        {
+          return get();
         }
 
     protected: