X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a6d14383a57771a334f6d0b6376dd47bf24049d..95b4a59e67af301bb6ff061055ac5a9a09b96d6c:/interface/wx/ustring.h?ds=inline

diff --git a/interface/wx/ustring.h b/interface/wx/ustring.h
index 3a0ab2bc8c..a6587f3d7b 100644
--- a/interface/wx/ustring.h
+++ b/interface/wx/ustring.h
@@ -22,8 +22,8 @@
     class that has O(1) access to its content, to be identical on all 
     platforms and to be easily convertable to wxString as well as other
     ways to store strings (C string literals, wide character
-    string literals, character buffer, etc) by providing many overload
-    and built-in conversion to and from the various format.
+    string literals, character buffer, etc) by providing several overloads
+    and built-in conversions to and from the various string formats.
     
     wxUString derives from @c std::basic_string<wxChar32> and therefore
     offers the complete API of @c std::string.
@@ -46,83 +46,83 @@ public:
     /**
         Copy constructor.
     */
-    wxUString( const wxUString &str )                         
+    wxUString( const wxUString &str );
     /**
         Constructs a string from a 32-bit string literal.
     */
-    wxUString( const wxChar32 *str )                            
+    wxUString( const wxChar32 *str );                            
     /**
         Constructs a string from 32-bit string buffer.
     */
-    wxUString( const wxU32CharBuffer &buf )                   
+    wxUString( const wxU32CharBuffer &buf );                   
     /**
         Constructs a string from C string literal using wxConvLibc to convert it to Unicode.
     */
-    wxUString( const char *str )                              
+    wxUString( const char *str );
     /**
         Constructs a string from C string buffer using wxConvLibc to convert it to Unicode.
     */
-    wxUString( const wxCharBuffer &buf )        
+    wxUString( const wxCharBuffer &buf );
     /**
         Constructs a string from C string literal using @a conv to convert it to Unicode.
     */
-    wxUString( const char *str, const wxMBConv &conv )          
+    wxUString( const char *str, const wxMBConv &conv );
     /**
         Constructs a string from C string literal using @a conv to convert it to Unicode.
     */
-    wxUString( const wxCharBuffer &buf, const wxMBConv &conv )  
+    wxUString( const wxCharBuffer &buf, const wxMBConv &conv );
     /**
         Constructs a string from UTF-16 string literal
     */
-    wxUString( const wxChar16 *str )                          
+    wxUString( const wxChar16 *str );
     /**
         Constructs a string from UTF-16 string buffer
     */
-    wxUString( const wxU16CharBuffer &buf )                  
+    wxUString( const wxU16CharBuffer &buf );
     /**
         Constructs a string from wxString.
     */
-    wxUString( const wxString &str )                          
+    wxUString( const wxString &str );
     /**
         Constructs a string from using wxConvLibc to convert it to Unicode.
     */
-    wxUString( char ch )                                       
+    wxUString( char ch );
     /**
         Constructs a string from a UTF-16 character.
     */
-    wxUString( wxChar16 ch )                                    
+    wxUString( wxChar16 ch );
     /**
         Constructs a string from 32-bit Unicode character.
     */
-    wxUString( wxChar32 ch )                                    
+    wxUString( wxChar32 ch );
     /**
         Constructs a string from wxUniChar (returned by wxString's access operator)
     */
-    wxUString( wxUniChar ch )                                 
+    wxUString( wxUniChar ch );
     /**
         Constructs a string from wxUniCharRef (returned by wxString's access operator)
     */
-    wxUString( wxUniCharRef ch )                              
+    wxUString( wxUniCharRef ch );
     /**
         Constructs a string from @a n characters @a ch.
     */
-    wxUString( size_type n, char ch )                          
+    wxUString( size_type n, char ch );
     /**
         Constructs a string from @a n characters @a ch.
     */
-    wxUString( size_type n, wxChar16 ch )                     
+    wxUString( size_type n, wxChar16 ch );
     /**
         Constructs a string from @a n characters @a ch.
     */
-    wxUString( size_type n, wxChar32 ch )                      
+    wxUString( size_type n, wxChar32 ch );
     /**
         Constructs a string from @a n characters @a ch.
     */
-    wxUString( size_type n, wxUniChar ch )                     
+    wxUString( size_type n, wxUniChar ch );
     /**
         Constructs a string from @a n characters @a ch.
     */
-    wxUString( size_type n, wxUniCharRef ch )                 
+    wxUString( size_type n, wxUniCharRef ch );
     
     /**
         Static construction of a wxUString from a 7-bit ASCII string
@@ -204,35 +204,35 @@ public:
     operator wxString() const;
 
     /**
-       wxUString assignment. wxUString addtionally provides overloads for
+       wxUString assignment. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single and repeated characters etc.
     */
     wxUString &assign( const wxUString &str );
      
     /**
-       Appending. wxUString addtionally provides overloads for
+       Appending. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single and repeated characters etc.
     */
     wxUString &append( const wxUString &s );
     
     /**
-       Insertion. wxUString addtionally provides overloads for
+       Insertion. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
     wxUString &insert( size_type pos, const wxUString &s );
 
     /**
-       Assignment operator. wxUString addtionally provides overloads for
+       Assignment operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
     inline wxUString& operator=(const wxUString& s);
     
     /**
-       Concatenation operator. wxUString addtionally provides overloads for
+       Concatenation operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
@@ -241,49 +241,45 @@ public:
 };
 
     /**
-       Concatenation operator. wxUString addtionally provides overloads for
+       Concatenation operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline wxUString operator+(const wxUString &s1, const wxUString &s2);
 
     /**
-       Equality operator. wxUString addtionally provides overloads for
+       Equality operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator==(const wxUString& s1, const wxUString& s2);
     /**
-       Inequality operator. wxUString addtionally provides overloads for
+       Inequality operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator!=(const wxUString& s1, const wxUString& s2);
     /**
-       Comparison operator. wxUString addtionally provides overloads for
+       Comparison operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator< (const wxUString& s1, const wxUString& s2);
     /**
-       Comparison operator. wxUString addtionally provides overloads for
+       Comparison operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator> (const wxUString& s1, const wxUString& s2);
     /**
-       Comparison operator. wxUString addtionally provides overloads for
+       Comparison operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator<=(const wxUString& s1, const wxUString& s2);
     /**
-       Comparison operator. wxUString addtionally provides overloads for
+       Comparison operator. wxUString additionally provides overloads for
        wxString, C string, UTF-16 strings, 32-bit strings, char buffers,
        single characters etc.
     */
 inline bool operator>=(const wxUString& s1, const wxUString& s2);
-
-
-#endif
-    // _WX_USTRING_H_BASE_