Make wxString::WorstEncodingCase take a const wxMBConv&

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

diff --git a/include/wx/string.h b/include/wx/string.h
index 0562d9a91570d0f5b26f514b66c31b56f53c9472..2bc8b54afdba9d2115dfa8060492514a752c294a 100644 (file)
--- a/include/wx/string.h
+++ b/include/wx/string.h
@@ -1078,7 +1078,7 @@ public:
   static wxString FormatV(const wxChar *pszFormat, va_list argptr);
 
     // returns the highest possible memory allocation for encoding
   static wxString FormatV(const wxChar *pszFormat, va_list argptr);
 
     // returns the highest possible memory allocation for encoding

-  static size_t WorstEncodingCase(size_t len, wxMBConv& conv);
+  static size_t WorstEncodingCase(size_t len, const wxMBConv& conv);

 
   // raw access to string memory
     // ensure that string has space for at least nLen characters
 
   // raw access to string memory
     // ensure that string has space for at least nLen characters

diff --git a/src/common/string.cpp b/src/common/string.cpp
index 51acab0189dd02f71fda5d38eae637df5f7deeb0..f6b388e45b4beec140603d250197c56a5524aa65 100644 (file)
--- a/src/common/string.cpp
+++ b/src/common/string.cpp
@@ -988,7 +988,7 @@ int STRINGCLASS::compare(size_t nStart, size_t nLen,
 // common conversion routines
 // ---------------------------------------------------------------------------
 
 // common conversion routines
 // ---------------------------------------------------------------------------
 

-size_t wxString::WorstEncodingCase(size_t len, wxMBConv& WXUNUSED(conv))
+size_t wxString::WorstEncodingCase(size_t len, const wxMBConv& WXUNUSED(conv))

 {
     //Worst case for UTF7
     return len * 5;
 {
     //Worst case for UTF7
     return len * 5;