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

16
src/common/fmapbase.cpp
View File

@@ -55,7 +55,7 @@
// ----------------------------------------------------------------------------
// encodings supported by GetEncodingDescription
static wxFontEncoding gs_encodings[] =
static const wxFontEncoding gs_encodings[] =
{
wxFONTENCODING_ISO8859_1,
wxFONTENCODING_ISO8859_2,
@@ -144,7 +144,7 @@ static wxFontEncoding gs_encodings[] =
};
// the descriptions for them
static const char* gs_encodingDescs[] =
static const char* const gs_encodingDescs[] =
{
wxTRANSLATE( "Western European (ISO-8859-1)" ),
wxTRANSLATE( "Central European (ISO-8859-2)" ),
@@ -240,7 +240,7 @@ static const char* gs_encodingDescs[] =
};
// and the internal names (these are not translated on purpose!)
static const wxChar* gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
static const wxChar* const gs_encodingNames[WXSIZEOF(gs_encodingDescs)][9] =
{
// names from the columns correspond to these OS:
// Linux Solaris and IRIX HP-UX AIX
@@ -642,7 +642,7 @@ wxFontMapperBase::NonInteractiveCharsetToEncoding(const wxString& charset)
for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); ++i )
{
for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName )
{
if ( cs.CmpNoCase(*encName) == 0 )
return gs_encodings[i];
@@ -831,17 +831,17 @@ wxString wxFontMapperBase::GetEncodingName(wxFontEncoding encoding)
/* static */
const wxChar** wxFontMapperBase::GetAllEncodingNames(wxFontEncoding encoding)
{
static const wxChar* dummy[] = { NULL };
static const wxChar* const dummy[] = { NULL };
for ( size_t i = 0; i < WXSIZEOF(gs_encodingNames); i++ )
{
if ( gs_encodings[i] == encoding )
{
return gs_encodingNames[i];
return const_cast<const wxChar**>(gs_encodingNames[i]);
}
}
return dummy;
return const_cast<const wxChar**>(dummy);
}
/* static */
@@ -851,7 +851,7 @@ wxFontEncoding wxFontMapperBase::GetEncodingFromName(const wxString& name)
for ( size_t i = 0; i < count; i++ )
{
for ( const wxChar** encName = gs_encodingNames[i]; *encName; ++encName )
for ( const wxChar* const* encName = gs_encodingNames[i]; *encName; ++encName )
{
if ( name.CmpNoCase(*encName) == 0 )
return gs_encodings[i];