X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01a9232b5e06fc1e24cbd051661d37a46827379d..ab52bac815bed0189bb0ba3b52a15e093c354533:/src/common/convauto.cpp

diff --git a/src/common/convauto.cpp b/src/common/convauto.cpp
index d23fad635e..f4e394d04d 100644
--- a/src/common/convauto.cpp
+++ b/src/common/convauto.cpp
@@ -44,7 +44,7 @@ wxFontEncoding wxConvAuto::ms_defaultMBEncoding = wxFONTENCODING_ISO8859_1;
 void wxConvAuto::SetFallbackEncoding(wxFontEncoding enc)
 {
     wxASSERT_MSG( enc != wxFONTENCODING_DEFAULT,
-                  _T("wxFONTENCODING_DEFAULT doesn't make sense here") );
+                  wxT("wxFONTENCODING_DEFAULT doesn't make sense here") );
 
     ms_defaultMBEncoding = enc;
 }
@@ -137,7 +137,7 @@ void wxConvAuto::InitFromBOM(BOMType bomType)
             break;
 
         default:
-            wxFAIL_MSG( _T("unexpected BOM type") );
+            wxFAIL_MSG( wxT("unexpected BOM type") );
             // fall through: still need to create something
 
         case BOM_None:
@@ -166,7 +166,7 @@ void wxConvAuto::SkipBOM(const char **src, size_t *len) const
             break;
 
         default:
-            wxFAIL_MSG( _T("unexpected BOM type") );
+            wxFAIL_MSG( wxT("unexpected BOM type") );
             // fall through: still need to create something
 
         case BOM_None:
@@ -194,7 +194,7 @@ wxConvAuto::ToWChar(wchar_t *dst, size_t dstLen,
     // during this initial call but also during the first call with non-NULL
     // dst as typically we're first called with NULL dst to calculate the
     // needed buffer size
-    wxConvAuto *self = wx_const_cast(wxConvAuto *, this);
+    wxConvAuto *self = const_cast<wxConvAuto *>(this);
     if ( !m_conv )
     {
         self->InitFromInput(&src, &srcLen);
@@ -238,7 +238,7 @@ wxConvAuto::FromWChar(char *dst, size_t dstLen,
     if ( !m_conv )
     {
         // default to UTF-8 for the multibyte output
-        wx_const_cast(wxConvAuto *, this)->InitWithUTF8();
+        const_cast<wxConvAuto *>(this)->InitWithUTF8();
     }
 
     return m_conv->FromWChar(dst, dstLen, src, srcLen);