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

No real changes, just remove the ugly CONST_CAST macro.

Browse Source 
Use const_cast<> directly, we don't support compilers which don't have it any
more. And CONST_CAST macro conflicts with a macro with the same name (and
similar purpose) defined in Symbian headers.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62640 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-11-14 16:11:09 +00:00
parent 9e9cfb9115
commit a57bfed905
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/fileconf.cpp
View File

@@ -57,11 +57,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <ctype.h> #include <ctype.h>
// ----------------------------------------------------------------------------
// macros
// ----------------------------------------------------------------------------
#define CONST_CAST ((wxFileConfig *)this)->
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@@ -791,12 +786,14 @@ size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const
{ {
size_t n = m_pCurrentGroup->Entries().GetCount(); size_t n = m_pCurrentGroup->Entries().GetCount();
if ( bRecursive ) { if ( bRecursive ) {
wxFileConfig * const self = const_cast<wxFileConfig *>(this);
wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup; wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().GetCount(); size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
n += GetNumberOfEntries(true); n += GetNumberOfEntries(true);
CONST_CAST m_pCurrentGroup = pOldCurrentGroup; self->m_pCurrentGroup = pOldCurrentGroup;
} }
} }
@@ -807,12 +804,14 @@ size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const
{ {
size_t n = m_pCurrentGroup->Groups().GetCount(); size_t n = m_pCurrentGroup->Groups().GetCount();
if ( bRecursive ) { if ( bRecursive ) {
wxFileConfig * const self = const_cast<wxFileConfig *>(this);
wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup; wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().GetCount(); size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) {
CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; self->m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
n += GetNumberOfGroups(true); n += GetNumberOfGroups(true);
CONST_CAST m_pCurrentGroup = pOldCurrentGroup; self->m_pCurrentGroup = pOldCurrentGroup;
} }
} }