Changed capitalization style of wxConv*

(e.g. wxConv_current is now wxConvCurrent, although I put some #defines
in to still have it compile)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2290 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/string.h b/include/wx/string.h
index a32b75f9461d648563092f499de18202de3f5f94..20149977f0237b8033be05e5ec4be3c58e24b0f5 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -206,7 +206,8 @@ class WXDLLEXPORT wxMBConv
   const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif
 };
   const wxWCharBuffer cWX2WC(const char *psz) const { return cMB2WC(psz); }
 #endif
 };

-WXDLLEXPORT_DATA(extern wxMBConv) wxConv_libc;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;
+#define wxConv_libc wxConvLibc

 
 #define wxANOTHER_MBCONV(type) \
 class type : public wxMBConv { \
 
 #define wxANOTHER_MBCONV(type) \
 class type : public wxMBConv { \


@@ -215,11 +216,14 @@ class type : public wxMBConv { \
   virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; \
 }
 
   virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const; \
 }
 

-WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_file)) wxConv_file;
-WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_UTF7)) wxConv_UTF7;
-WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_UTF8)) wxConv_UTF8;
+WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvFile)) wxConvFile;
+#define wxConv_file wxConvFile
+WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF7)) wxConvUTF7;
+WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvUTF8)) wxConvUTF8;
+#define wxConv_UTF8 wxConvUTF8

 #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)
 #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)

-    WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConv_gdk)) wxConv_gdk;
+    WXDLLEXPORT_DATA(extern wxANOTHER_MBCONV(wxMBConvGdk)) wxConvGdk;
+    #define wxConv_gdk wxConvGdk

 #endif // GTK > 1.0
 
 class wxCharacterSet;
 #endif // GTK > 1.0
 
 class wxCharacterSet;


@@ -238,9 +242,11 @@ class WXDLLEXPORT wxCSConv : public wxMBConv
   virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
 };
 
   virtual size_t WC2MB(char *buf, const wchar_t *psz, size_t n) const;
 };
 

-WXDLLEXPORT_DATA(extern wxCSConv) wxConv_local;
+WXDLLEXPORT_DATA(extern wxCSConv) wxConvLocal;
+#define wxConv_local wxConvLocal

 
 

-WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current;
+WXDLLEXPORT_DATA(extern wxMBConv *) wxConvCurrent;
+#define wxConv_current wxConvCurrent

 
 // filenames are multibyte on Unix and probably widechar on Windows?
 #if defined(__UNIX__) || defined(__BORLANDC__)
 
 // filenames are multibyte on Unix and probably widechar on Windows?
 #if defined(__UNIX__) || defined(__BORLANDC__)


@@ -250,7 +256,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current;
 #endif
 
 #if wxMBFILES
 #endif
 
 #if wxMBFILES

-#define wxFNCONV(name) wxConv_file.cWX2MB(name)
+#define wxFNCONV(name) wxConvFile.cWX2MB(name)

 #define FNSTRINGCAST MBSTRINGCAST
 #else
 #define wxFNCONV(name) name
 #define FNSTRINGCAST MBSTRINGCAST
 #else
 #define wxFNCONV(name) name


@@ -258,7 +264,7 @@ WXDLLEXPORT_DATA(extern wxMBConv *) wxConv_current;
 #endif
 #else//!wxUSE_WCHAR_T
 class WXDLLEXPORT wxMBConv {};
 #endif
 #else//!wxUSE_WCHAR_T
 class WXDLLEXPORT wxMBConv {};

-WXDLLEXPORT_DATA(extern wxMBConv) wxConv_libc;
+WXDLLEXPORT_DATA(extern wxMBConv) wxConvLibc;

 #endif//wxUSE_WCHAR_T
 
 // ---------------------------------------------------------------------------
 #endif//wxUSE_WCHAR_T
 
 // ---------------------------------------------------------------------------


@@ -365,7 +371,7 @@ public:
     // from multibyte string
     // (NB: nLength is right now number of Unicode characters, not
     //  characters in psz! So try not to use it yet!)
     // from multibyte string
     // (NB: nLength is right now number of Unicode characters, not
     //  characters in psz! So try not to use it yet!)

-  wxString(const char *psz, wxMBConv& conv = wxConv_libc, size_t nLength = wxSTRING_MAXLEN);
+  wxString(const char *psz, wxMBConv& conv = wxConvLibc, size_t nLength = wxSTRING_MAXLEN);

     // from wxWCharBuffer (i.e. return from wxGetString)
   wxString(const wxWCharBuffer& psz)
     { InitWith(psz, 0, wxSTRING_MAXLEN); }
     // from wxWCharBuffer (i.e. return from wxGetString)
   wxString(const wxWCharBuffer& psz)
     { InitWith(psz, 0, wxSTRING_MAXLEN); }


@@ -464,22 +470,22 @@ public:
     //
     const wxChar* GetData() const { return m_pchData; }
 #if wxUSE_UNICODE
     //
     const wxChar* GetData() const { return m_pchData; }
 #if wxUSE_UNICODE

-    const wxCharBuffer mb_str(wxMBConv& conv = wxConv_libc) const { return conv.cWC2MB(m_pchData); }
-    const wxChar* wc_str(wxMBConv& WXUNUSED(conv) = wxConv_libc) const { return m_pchData; }
+    const wxCharBuffer mb_str(wxMBConv& conv = wxConvLibc) const { return conv.cWC2MB(m_pchData); }
+    const wxChar* wc_str(wxMBConv& WXUNUSED(conv) = wxConvLibc) const { return m_pchData; }

 #if wxMBFILES
 #if wxMBFILES

-    const wxCharBuffer fn_str() const { return mb_str(wxConv_file); }
+    const wxCharBuffer fn_str() const { return mb_str(wxConvFile); }

 #else
     const wxChar* fn_str() const { return m_pchData; }
 #endif
 #else
 #else
     const wxChar* fn_str() const { return m_pchData; }
 #endif
 #else

-    const wxChar* mb_str(wxMBConv& WXUNUSED(conv) = wxConv_libc ) const { return m_pchData; }
+    const wxChar* mb_str(wxMBConv& WXUNUSED(conv) = wxConvLibc ) const { return m_pchData; }

 #if wxUSE_WCHAR_T
     const wxWCharBuffer wc_str(wxMBConv& conv) const { return conv.cMB2WC(m_pchData); }
 #endif
     const wxChar* fn_str() const { return m_pchData; }
 #endif
     // for convenience
 #if wxUSE_WCHAR_T
     const wxWCharBuffer wc_str(wxMBConv& conv) const { return conv.cMB2WC(m_pchData); }
 #endif
     const wxChar* fn_str() const { return m_pchData; }
 #endif
     // for convenience

-    const wxWX2MBbuf mbc_str() const { return mb_str(*wxConv_current); }
+    const wxWX2MBbuf mbc_str() const { return mb_str(*wxConvCurrent); }

 
   // overloaded assignment
     // from another wxString
 
   // overloaded assignment
     // from another wxString

diff --git a/src/common/string.cpp b/src/common/string.cpp
index a7d9a36ede21476c7a036988fac4fe71b6922d37..291d8f90ebb73702077fe07e9a3d9c59392e4289 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -1824,15 +1824,15 @@ size_t wxMBConv::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // standard file conversion
 // ----------------------------------------------------------------------------
 
 // standard file conversion
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(wxMBConv_file) wxConv_file;
+WXDLLEXPORT_DATA(wxMBConvFile) wxConvFile;

 
 // just use the libc conversion for now
 
 // just use the libc conversion for now

-size_t wxMBConv_file::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvFile::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
   return wxMB2WC(buf, psz, n);
 }
 
 {
   return wxMB2WC(buf, psz, n);
 }
 

-size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvFile::WC2MB(char *buf, const wchar_t *psz, size_t n) const

 {
   return wxWC2MB(buf, psz, n);
 }
 {
   return wxWC2MB(buf, psz, n);
 }


@@ -1842,11 +1842,11 @@ size_t wxMBConv_file::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // ----------------------------------------------------------------------------
 
 #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)
 // ----------------------------------------------------------------------------
 
 #if defined(__WXGTK__) && (GTK_MINOR_VERSION > 0)

-WXDLLEXPORT_DATA(wxMBConv_gdk) wxConv_gdk;
+WXDLLEXPORT_DATA(wxMBConvGdk) wxConvGdk;

 
 #include <gdk/gdk.h>
 
 
 #include <gdk/gdk.h>
 

-size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvGdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
   if (buf) {
     return gdk_mbstowcs((GdkWChar *)buf, psz, n);
 {
   if (buf) {
     return gdk_mbstowcs((GdkWChar *)buf, psz, n);


@@ -1858,7 +1858,7 @@ size_t wxMBConv_gdk::MB2WC(wchar_t *buf, const char *psz, size_t n) const
   }
 }
 
   }
 }
 

-size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvGdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const

 {
   char *mbstr = gdk_wcstombs((GdkWChar *)psz);
   size_t len = mbstr ? strlen(mbstr) : 0;
 {
   char *mbstr = gdk_wcstombs((GdkWChar *)psz);
   size_t len = mbstr ? strlen(mbstr) : 0;


@@ -1875,7 +1875,7 @@ size_t wxMBConv_gdk::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // UTF-7
 // ----------------------------------------------------------------------------
 
 // UTF-7
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(wxMBConv_UTF7) wxConv_UTF7;
+WXDLLEXPORT_DATA(wxMBConvUTF7) wxConvUTF7;

 
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 #if 0
 static char utf7_setD[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"


@@ -1888,12 +1888,12 @@ static char utf7_setB[]="ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 #endif
 
 // TODO: write actual implementations of UTF-7 here
 #endif
 
 // TODO: write actual implementations of UTF-7 here

-size_t wxMBConv_UTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvUTF7::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
   return 0;
 }
 
 {
   return 0;
 }
 

-size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvUTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const

 {
   return 0;
 }
 {
   return 0;
 }


@@ -1902,11 +1902,11 @@ size_t wxMBConv_UTF7::WC2MB(char *buf, const wchar_t *psz, size_t n) const
 // UTF-8
 // ----------------------------------------------------------------------------
 
 // UTF-8
 // ----------------------------------------------------------------------------
 

-WXDLLEXPORT_DATA(wxMBConv_UTF8) wxConv_UTF8;
+WXDLLEXPORT_DATA(wxMBConvUTF8) wxConvUTF8;

 
 static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff};
 
 
 static unsigned long utf8_max[]={0x7f,0x7ff,0xffff,0x1fffff,0x3ffffff,0x7fffffff,0xffffffff};
 

-size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
+size_t wxMBConvUTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const

 {
   size_t len = 0;
 
 {
   size_t len = 0;
 


@@ -1947,7 +1947,7 @@ size_t wxMBConv_UTF8::MB2WC(wchar_t *buf, const char *psz, size_t n) const
   return len;
 }
 
   return len;
 }
 

-size_t wxMBConv_UTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const
+size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const

 {
   size_t len = 0;
 
 {
   size_t len = 0;
 


@@ -2026,12 +2026,8 @@ static void wxLoadCharacterSets(void)
        wxStringTokenizer token(line);
        wxString cmd = token.GetNextToken();
        if (cmd == comchar) {
        wxStringTokenizer token(line);
        wxString cmd = token.GetNextToken();
        if (cmd == comchar) {

-         if (token.GetNextToken() == _T("alias")) {
-           wxStringTokenizer names(token.GetNextToken(),_T("/"));
-           wxString name;
-           while (!(name = names.GetNextToken()).IsEmpty())
-             cset->names.Add(name);
-         }
+         if (token.GetNextToken() == _T("alias"))
+           cset->names.Add(token.GetNextToken());

        }
        else if (cmd == _T("<code_set_name>"))
          cset->names.Add(token.GetNextToken());
        }
        else if (cmd == _T("<code_set_name>"))
          cset->names.Add(token.GetNextToken());


@@ -2095,7 +2091,7 @@ static wxCharacterSet *wxFindCharacterSet(const wxChar *charset)
   return (wxCharacterSet *)NULL;
 }
 
   return (wxCharacterSet *)NULL;
 }
 

-WXDLLEXPORT_DATA(wxCSConv) wxConv_local((const wxChar *)NULL);
+WXDLLEXPORT_DATA(wxCSConv) wxConvLocal((const wxChar *)NULL);

 
 wxCSConv::wxCSConv(const wxChar *charset)
 {
 
 wxCSConv::wxCSConv(const wxChar *charset)
 {