X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e2e1bb254efcdd67241dfebc3bfd6476ff16b69..931d6a47c32a5b4c283243cb553ce71ee2b535d5:/src/common/ustring.cpp

diff --git a/src/common/ustring.cpp b/src/common/ustring.cpp
index f198c386ea..ab70ce5ae2 100644
--- a/src/common/ustring.cpp
+++ b/src/common/ustring.cpp
@@ -3,7 +3,6 @@
 // Purpose:     wxUString class
 // Author:      Robert Roebling
 // Created:     2008-07-25
-// RCS-ID:      $Id$
 // Copyright:   (c) 2008 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -399,7 +398,7 @@ wxUString &wxUString::assignFromCString( const char* str )
     if (!str)
         return assign( wxUString() );
 
-    wxWCharBuffer buffer = wxConvLibc.cMB2WC( str );
+    wxScopedWCharBuffer buffer = wxConvLibc.cMB2WC( str );
 
     return assign( buffer );
 }
@@ -409,12 +408,12 @@ 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();
@@ -491,7 +490,7 @@ wxCharBuffer wxUString::utf8_str() const
     return result;
 }
 
-wxU16CharBuffer wxUString::utf16_str() const
+wxScopedU16CharBuffer wxUString::utf16_str() const
 {
     size_type utf16_length = 0;
     const wxChar32 *ptr = data();