From 700d0e8fd2f58968f8618708c02c3efb95ba27bf Mon Sep 17 00:00:00 2001
From: "alecf%netscape.com"
 <alecf%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Nov 2001 02:53:48 +0000
Subject: [PATCH] move UTF8traits to the public realm for later consumption
 r=dbaron r=jag (the string experts) for bug 110531

git-svn-id: svn://10.0.0.236/trunk@109171 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/string/obsolete/nsString2.cpp       | 12 ------------
 mozilla/string/obsolete/nsString2.h         | 12 ++++++++++++
 mozilla/xpcom/string/obsolete/nsString2.cpp | 12 ------------
 mozilla/xpcom/string/obsolete/nsString2.h   | 12 ++++++++++++
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp
index 9552e628a41..8efa3dcd2ca 100644
--- a/mozilla/string/obsolete/nsString2.cpp
+++ b/mozilla/string/obsolete/nsString2.cpp
@@ -1519,18 +1519,6 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsACString& aCString )
       }
   }
 
-class UTF8traits
-  {
-    public:
-      static PRBool isASCII(char c) { return (c & 0x80) == 0x00; }
-      static PRBool isInSeq(char c) { return (c & 0xC0) == 0x80; }
-      static PRBool is2byte(char c) { return (c & 0xE0) == 0xC0; }
-      static PRBool is3byte(char c) { return (c & 0xF0) == 0xE0; }
-      static PRBool is4byte(char c) { return (c & 0xF8) == 0xF0; }
-      static PRBool is5byte(char c) { return (c & 0xFC) == 0xF8; }
-      static PRBool is6byte(char c) { return (c & 0xFE) == 0xFC; }
-  };
-
 class CalculateUTF8Length
   {
     public:
diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h
index 97ddf7e2889..fb141b3a630 100644
--- a/mozilla/string/obsolete/nsString2.h
+++ b/mozilla/string/obsolete/nsString2.h
@@ -72,6 +72,18 @@
 #endif
 #include "nsXPIDLString.h"
 
+class UTF8traits
+  {
+    public:
+      static PRBool isASCII(char c) { return (c & 0x80) == 0x00; }
+      static PRBool isInSeq(char c) { return (c & 0xC0) == 0x80; }
+      static PRBool is2byte(char c) { return (c & 0xE0) == 0xC0; }
+      static PRBool is3byte(char c) { return (c & 0xF0) == 0xE0; }
+      static PRBool is4byte(char c) { return (c & 0xF8) == 0xF0; }
+      static PRBool is5byte(char c) { return (c & 0xFC) == 0xF8; }
+      static PRBool is6byte(char c) { return (c & 0xFE) == 0xFC; }
+  };
+
 #ifdef STANDALONE_MI_STRING_TESTS
   class nsAFlatString { public: virtual ~nsAString() { } };
 #endif
diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp
index 9552e628a41..8efa3dcd2ca 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.cpp
+++ b/mozilla/xpcom/string/obsolete/nsString2.cpp
@@ -1519,18 +1519,6 @@ NS_ConvertASCIItoUCS2::NS_ConvertASCIItoUCS2( const nsACString& aCString )
       }
   }
 
-class UTF8traits
-  {
-    public:
-      static PRBool isASCII(char c) { return (c & 0x80) == 0x00; }
-      static PRBool isInSeq(char c) { return (c & 0xC0) == 0x80; }
-      static PRBool is2byte(char c) { return (c & 0xE0) == 0xC0; }
-      static PRBool is3byte(char c) { return (c & 0xF0) == 0xE0; }
-      static PRBool is4byte(char c) { return (c & 0xF8) == 0xF0; }
-      static PRBool is5byte(char c) { return (c & 0xFC) == 0xF8; }
-      static PRBool is6byte(char c) { return (c & 0xFE) == 0xFC; }
-  };
-
 class CalculateUTF8Length
   {
     public:
diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h
index 97ddf7e2889..fb141b3a630 100644
--- a/mozilla/xpcom/string/obsolete/nsString2.h
+++ b/mozilla/xpcom/string/obsolete/nsString2.h
@@ -72,6 +72,18 @@
 #endif
 #include "nsXPIDLString.h"
 
+class UTF8traits
+  {
+    public:
+      static PRBool isASCII(char c) { return (c & 0x80) == 0x00; }
+      static PRBool isInSeq(char c) { return (c & 0xC0) == 0x80; }
+      static PRBool is2byte(char c) { return (c & 0xE0) == 0xC0; }
+      static PRBool is3byte(char c) { return (c & 0xF0) == 0xE0; }
+      static PRBool is4byte(char c) { return (c & 0xF8) == 0xF0; }
+      static PRBool is5byte(char c) { return (c & 0xFC) == 0xF8; }
+      static PRBool is6byte(char c) { return (c & 0xFE) == 0xFC; }
+  };
+
 #ifdef STANDALONE_MI_STRING_TESTS
   class nsAFlatString { public: virtual ~nsAString() { } };
 #endif