Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make array data fully const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62764 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2009-12-02 17:28:45 +00:00
parent d1750c03ce
commit a243da29c8
29 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/strconv.cpp
View File

@@ -2144,9 +2144,9 @@ wxMBConv_iconv::wxMBConv_iconv(const char *name)
wxLogTrace(TRACE_STRCONV, wxT("Looking for wide char codeset:"));
#if wxUSE_FONTMAP
const wxChar **names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
const wxChar *const *names = wxFontMapperBase::GetAllEncodingNames(WC_ENC);
#else // !wxUSE_FONTMAP
static const wxChar *names_static[] =
static const wxChar *const names_static[] =
{
#if SIZEOF_WCHAR_T == 4
wxT("UCS-4"),
@@ -2155,7 +2155,7 @@ wxMBConv_iconv::wxMBConv_iconv(const char *name)
#endif
NULL
};
const wxChar **names = names_static;
const wxChar *const *names = names_static;
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
for ( ; *names && ms_wcCharsetName.empty(); ++names )
@@ -3068,7 +3068,7 @@ wxMBConv *wxCSConv::DoCreate() const
delete conv;
}
const wxChar** names = wxFontMapperBase::GetAllEncodingNames(encoding);
const wxChar* const* names = wxFontMapperBase::GetAllEncodingNames(encoding);
// CS : in case this does not return valid names (eg for MacRoman)
// encoding got a 'failure' entry in the cache all the same,
// although it just has to be created using a different method, so