Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / common / ustring.cpp

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index b3176323ee998ecd8885eb23abaa750ea2d8a5ba..1da0c9256a5a63334941179f76256cf1f2d5722e 100644 (file)
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -3,7 +3,7 @@
 // Purpose:     wxUString class
 // Author:      Robert Roebling
 // Created:     2008-07-25
-// RCS-ID:      $Id:$
+// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,23 +15,20 @@
     #pragma hdrstop
 #endif
 
+#include "wx/ustring.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/strconv.h"  // wxConvLibc
+    #include "wx/crt.h"
     #include "wx/log.h"
 #endif
 
-#include "wx/ustring.h"
-#include "wx/unichar.h"
-#include "wx/string.h"
-
-
 wxUString &wxUString::assignFromAscii( const char *str )
 {
    size_type len = wxStrlen( str );
-   
+
    wxU32CharBuffer buffer( len );
    wxChar32 *ptr = buffer.data();
-   
+
    size_type i;
    for (i = 0; i < len; i++)
    {
@@ -39,7 +36,7 @@ wxUString &wxUString::assignFromAscii( const char *str )
        ptr++;
        str++;
    }
-   
+
    return assign( buffer );
 }
 
@@ -52,10 +49,10 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
        len++;
        s++;
    }
-   
+
    wxU32CharBuffer buffer( len );
    wxChar32 *ptr = buffer.data();
-   
+
    size_type i;
    for (i = 0; i < len; i++)
    {
@@ -63,7 +60,7 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
        ptr++;
        str++;
    }
-   
+
    return *this;
 }
 
@@ -71,9 +68,6 @@ wxUString &wxUString::assignFromAscii( const char *str, size_type n )
 // UTF-8
 // ----------------------------------------------------------------------------
 
-static const wxUint32 utf8_max[]=
-    { 0x7f, 0x7ff, 0xffff, 0x1fffff, 0x3ffffff, 0x7fffffff, 0xffffffff };
-
 // this table gives the length of the UTF-8 encoding from its first character:
 const unsigned char tableUtf8Lengths[256] = {
     // single-byte sequences (ASCII):
@@ -113,7 +107,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
 {
     if (!str)
         return assign( wxUString() );
-     
+
     size_type ucs4_len = 0;
     const char *p = str;
     while (*p)
@@ -128,7 +122,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
 
     wxU32CharBuffer buffer( ucs4_len );
     wxChar32 *out = buffer.data();
-    
+
     p = str;
     while (*p)
     {
@@ -181,7 +175,7 @@ wxUString &wxUString::assignFromUTF8( const char *str )
                 code <<= 6;
                 code |= c & 0x3F;
             }
-            
+
             *out = code;
             p++;
         }
@@ -195,7 +189,7 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
 {
     if (!str)
         return assign( wxUString() );
-     
+
     size_type ucs4_len = 0;
     size_type utf8_pos = 0;
     const char *p = str;
@@ -211,10 +205,10 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
         ucs4_len ++;
         p += len;
     }
-    
+
     wxU32CharBuffer buffer( ucs4_len );
     wxChar32 *out = buffer.data();
-    
+
     utf8_pos = 0;
     p = str;
     while (*p)
@@ -225,7 +219,7 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
             if (utf8_pos + 1 > n)
                 break;
             utf8_pos++;
-                
+
             *out = c;
             p++;
         }
@@ -275,13 +269,13 @@ wxUString &wxUString::assignFromUTF8( const char *str, size_type n )
                 code <<= 6;
                 code |= c & 0x3F;
             }
-            
+
             *out = code;
             p++;
         }
         out++;
     }
-    
+
     *out = 0;
 
     return assign( buffer.data() );
@@ -291,7 +285,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
 {
     if (!str)
         return assign( wxUString() );
-     
+
     size_type ucs4_len = 0;
     size_type utf16_pos = 0;
     const wxChar16 *p = str;
@@ -310,10 +304,10 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
         {
            len = 2;
         }
-    
+
         if (utf16_pos + len > n)
             break;
-            
+
         ucs4_len++;
         p += len;
         utf16_pos += len;
@@ -323,7 +317,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
     wxChar32 *out = buffer.data();
 
     utf16_pos = 0;
-    
+
     p = str;
     while (*p)
     {
@@ -331,7 +325,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
         {
             if (utf16_pos + 1 > n)
                 break;
-        
+
             *out = *p;
             p++;
             utf16_pos++;
@@ -340,14 +334,14 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str, size_type n )
         {
             if (utf16_pos + 2 > n)
                 break;
-        
+
            *out = ((p[0] - 0xd7c0) << 10) + (p[1] - 0xdc00);
            p += 2;
            utf16_pos += 2;
         }
         out++;
     }
-    
+
     return assign( buffer.data() );
 }
 
@@ -355,7 +349,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
 {
     if (!str)
         return assign( wxUString() );
-     
+
     size_type ucs4_len = 0;
     const wxChar16 *p = str;
     while (*p)
@@ -373,14 +367,14 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
         {
            len = 2;
         }
-    
+
         ucs4_len++;
         p += len;
     }
 
     wxU32CharBuffer buffer( ucs4_len );
     wxChar32 *out = buffer.data();
-    
+
     p = str;
     while (*p)
     {
@@ -396,7 +390,7 @@ wxUString &wxUString::assignFromUTF16( const wxChar16* str )
         }
         out++;
     }
-    
+
     return assign( buffer.data() );
 }
 
@@ -404,9 +398,9 @@ wxUString &wxUString::assignFromCString( const char* str )
 {
     if (!str)
         return assign( wxUString() );
-        
-    wxWCharBuffer buffer = wxConvLibc.cMB2WC( str );
-     
+
+    wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str );
+
     return assign( buffer );
 }
 
@@ -414,22 +408,22 @@ wxUString &wxUString::assignFromCString( const char* str, const wxMBConv &conv )
 {
     if (!str)
         return assign( wxUString() );
-     
-    wxWCharBuffer buffer = conv.cMB2WC( str );
-     
+
+    wxScopedWCharBuffer buffer = conv.cMB2WC( str );
+
     return assign( buffer );
 }
 
-wxCharBuffer wxUString::utf8_str() const
+wxScopedCharBuffer wxUString::utf8_str() const
 {
     size_type utf8_length = 0;
     const wxChar32 *ptr = data();
-    
+
     while (*ptr)
     {
         wxChar32 code = *ptr;
         ptr++;
-    
+
         if ( code <= 0x7F )
         {
             utf8_length++;
@@ -451,17 +445,17 @@ wxCharBuffer wxUString::utf8_str() const
             // invalid range, skip
         }
     }
-    
+
     wxCharBuffer result( utf8_length );
-    
+
     char *out = result.data();
-    
+
     ptr = data();
     while (*ptr)
     {
         wxChar32 code = *ptr;
         ptr++;
-    
+
         if ( code <= 0x7F )
         {
             out[0] = (char)code;
@@ -494,42 +488,39 @@ wxCharBuffer wxUString::utf8_str() const
         }
     }
 
-    wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
-    wxPrintf( "utf8_str %s len %d\n", result, wxStrlen( result.data() ) );
-    
     return result;
 }
-    
-wxU16CharBuffer wxUString::utf16_str() const
+
+wxScopedU16CharBuffer wxUString::utf16_str() const
 {
     size_type utf16_length = 0;
     const wxChar32 *ptr = data();
-    
+
     while (*ptr)
     {
         wxChar32 code = *ptr;
         ptr++;
-        
+
         // TODO: error range checks
-        
+
         if (code < 0x10000)
            utf16_length++;
         else
            utf16_length += 2;
     }
-    
+
     wxU16CharBuffer result( utf16_length );
     wxChar16 *out = result.data();
-    
+
     ptr = data();
-    
+
     while (*ptr)
     {
         wxChar32 code = *ptr;
         ptr++;
-        
+
         // TODO: error range checks
-        
+
         if (code < 0x10000)
         {
            out[0] = code;
@@ -542,19 +533,6 @@ wxU16CharBuffer wxUString::utf16_str() const
            out += 2;
         }
     }
-    
-    return result;    
-}
-
-
-#if SIZEOF_WCHAR_T != 2
-template<>
-wxCharTypeBuffer<wxChar16>::Data
-wxCharTypeBuffer<wxChar16>::NullData(NULL);
-#endif
 
-#if SIZEOF_WCHAR_T != 4
-template<>
-wxCharTypeBuffer<wxChar32>::Data
-wxCharTypeBuffer<wxChar32>::NullData(NULL);
-#endif
+    return result;
+}