X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/874dbd3a4a318bd7f34548b84cfe0aed9efa42d5..032e024c1c6ab6a20226604baab9d00558620e72:/include/wx/wxcrt.h?ds=sidebyside

diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h
index a348b14711..b99543cf3b 100644
--- a/include/wx/wxcrt.h
+++ b/include/wx/wxcrt.h
@@ -82,7 +82,7 @@ inline bool wxIsEmpty(const wxCStrData& s) { return s.AsString().empty(); }
         for(;l && *s != c;--l, ++s) {}
 
         if(l)
-            return (wxChar*)s;
+            return const_cast<wxChar*>(s);
         return NULL;
     }
 
@@ -656,13 +656,13 @@ inline const char* wxStrchr(const wxString& s, int c)
 inline const char* wxStrrchr(const wxString& s, int c)
     { return wxCRT_StrrchrA((const char*)s.c_str(), c); }
 inline const char* wxStrchr(const wxString& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
 inline const char* wxStrrchr(const wxString& s, const wxUniChar& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }
 inline const char* wxStrchr(const wxString& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s, c) : NULL; }
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrchrA(s.c_str(), c) : NULL; }
 inline const char* wxStrrchr(const wxString& s, const wxUniCharRef& uc)
-    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s, c) : NULL; }
+    { char c; return uc.GetAsChar(&c) ? wxCRT_StrrchrA(s.c_str(), c) : NULL; }
 inline const wchar_t* wxStrchr(const wxString& s, wchar_t c)
     { return wxCRT_StrchrW((const wchar_t*)s.c_str(), c); }
 inline const wchar_t* wxStrrchr(const wxString& s, wchar_t c)
@@ -724,30 +724,30 @@ inline const T *wxStrpbrk(const S& s, const wxScopedCharTypeBuffer<T>& accept)
 /* inlined non-const versions */
 template <typename T>
 inline char *wxStrstr(char *haystack, T needle)
-    { return (char *)wxStrstr((const char *)haystack, needle); }
+    { return const_cast<char*>(wxStrstr(const_cast<const char*>(haystack), needle)); }
 template <typename T>
 inline wchar_t *wxStrstr(wchar_t *haystack, T needle)
-    { return (wchar_t *)wxStrstr((const wchar_t *)haystack, needle); }
+    { return const_cast<wchar_t*>(wxStrstr(const_cast<const wchar_t*>(haystack), needle)); }
 
 template <typename T>
 inline char * wxStrchr(char *s, T c)
-    { return (char *)wxStrchr((const char *)s, c); }
+    { return const_cast<char*>(wxStrchr(const_cast<const char*>(s), c)); }
 template <typename T>
 inline wchar_t * wxStrchr(wchar_t *s, T c)
     { return (wchar_t *)wxStrchr((const wchar_t *)s, c); }
 template <typename T>
 inline char * wxStrrchr(char *s, T c)
-    { return (char *)wxStrrchr((const char *)s, c); }
+    { return const_cast<char*>(wxStrrchr(const_cast<const char*>(s), c)); }
 template <typename T>
 inline wchar_t * wxStrrchr(wchar_t *s, T c)
-    { return (wchar_t *)wxStrrchr((const wchar_t *)s, c); }
+    { return const_cast<wchar_t*>(wxStrrchr(const_cast<const wchar_t*>(s), c)); }
 
 template <typename T>
 inline char * wxStrpbrk(char *s, T accept)
-    { return (char *)wxStrpbrk((const char *)s, accept); }
+    { return const_cast<char*>(wxStrpbrk(const_cast<const char*>(s), accept)); }
 template <typename T>
 inline wchar_t * wxStrpbrk(wchar_t *s, T accept)
-    { return (wchar_t *)wxStrpbrk((const wchar_t *)s, accept); }
+    { return const_cast<wchar_t*>(wxStrpbrk(const_cast<const wchar_t*>(s), accept)); }
 
 
 // ----------------------------------------------------------------------------