X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7228ab483e3b0fc1d341d4cf1723e5c39096c63e..518f33a4e50585cab19757375a2c348e61d2594f:/src/common/fileconf.cpp?ds=sidebyside diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 5ae5d75b8a..92ca337641 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -28,16 +28,19 @@ #endif //__BORLANDC__ #ifndef WX_PRECOMP - #include - #include + #include "wx/string.h" + #include "wx/intl.h" #endif //WX_PRECOMP -#include -#include -#include -#include -#include -#include +#include "wx/app.h" +#include "wx/dynarray.h" +#include "wx/file.h" +#include "wx/log.h" +#include "wx/textfile.h" +#include "wx/config.h" +#include "wx/fileconf.h" + +#include "wx/utils.h" // for wxGetHomeDir // _WINDOWS_ is defined when windows.h is included, // __WXMSW__ is defined for MS Windows compilation @@ -53,12 +56,19 @@ // ---------------------------------------------------------------------------- #define CONST_CAST ((wxFileConfig *)this)-> +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- +#ifndef MAX_PATH + #define MAX_PATH 512 +#endif + // ---------------------------------------------------------------------------- // global functions declarations // ---------------------------------------------------------------------------- // is 'c' a valid character in group name? -// NB: APPCONF_IMMUTABLE_PREFIX and APPCONF_PATH_SEPARATOR must be valid chars, +// NB: wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR must be valid chars, // but _not_ ']' (group name delimiter) inline bool IsValid(char c) { return isalnum(c) || strchr("@_/-!.*%", c); } @@ -79,26 +89,50 @@ static wxString FilterOut(const wxString& str); // ---------------------------------------------------------------------------- // static functions // ---------------------------------------------------------------------------- -wxString wxFileConfig::GetGlobalFileName(const char *szFile) +wxString wxFileConfig::GetGlobalDir() { - wxString str; + wxString strDir; + + #ifdef __UNIX__ + strDir = "/etc/"; + #elif defined(__WXSTUBS__) + wxASSERT_MSG( FALSE, "TODO" ) ; + #else // Windows + char szWinDir[MAX_PATH]; + ::GetWindowsDirectory(szWinDir, MAX_PATH); + + strDir = szWinDir; + strDir << '\\'; + #endif // Unix/Windows + + return strDir; +} - bool bNoExt = strchr(szFile, '.') == NULL; +wxString wxFileConfig::GetLocalDir() +{ + wxString strDir; + + wxGetHomeDir(&strDir); + +#ifdef __UNIX__ + if (strDir.Last() != '/') strDir << '/'; +#else + if (strDir.Last() != '\\') strDir << '\\'; +#endif + + return strDir; +} +wxString wxFileConfig::GetGlobalFileName(const char *szFile) +{ + wxString str = GetGlobalDir(); + str << szFile; + + if ( strchr(szFile, '.') == NULL ) #ifdef __UNIX__ - str << "/etc/" << szFile; - if ( bNoExt ) - str << ".conf"; + str << ".conf"; #else // Windows - #ifndef _MAX_PATH - #define _MAX_PATH 512 - #endif - - char szWinDir[_MAX_PATH]; - ::GetWindowsDirectory(szWinDir, _MAX_PATH); - str << szWinDir << "\\" << szFile; - if ( bNoExt ) - str << ".ini"; + str << ".ini"; #endif // UNIX/Win return str; @@ -106,32 +140,18 @@ wxString wxFileConfig::GetGlobalFileName(const char *szFile) wxString wxFileConfig::GetLocalFileName(const char *szFile) { - wxString str; + wxString str = GetLocalDir(); #ifdef __UNIX__ - const char *szHome = getenv("HOME"); - if ( szHome == NULL ) { - // we're homeless... - wxLogWarning(_("can't find user's HOME, using current directory.")); - szHome = "."; - } - str << szHome << "/." << szFile; - #else // Windows - #ifdef __WIN32__ - const char *szHome = getenv("HOMEDRIVE"); - if ( szHome != NULL ) - str << szHome; - szHome = getenv("HOMEPATH"); - if ( szHome != NULL ) - str << szHome; - str << szFile; - if ( strchr(szFile, '.') == NULL ) - str << ".ini"; - #else // Win16 - // Win16 has no idea about home, so use the current directory instead - str << ".\\" << szFile; - #endif // WIN16/32 - #endif // UNIX/Win + str << '.'; + #endif + + str << szFile; + + #ifdef __WXMSW__ + if ( strchr(szFile, '.') == NULL ) + str << ".ini"; + #endif return str; } @@ -148,47 +168,86 @@ void wxFileConfig::Init() m_linesHead = m_linesTail = NULL; - m_strPath.Empty(); -} - -wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal) - : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal) -{ - Init(); - // it's not an error if (one of the) file(s) doesn't exist // parse the global file - if ( !strGlobal.IsEmpty() ) { - if ( wxFile::Exists(strGlobal) ) { - wxTextFile fileGlobal(strGlobal); + if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) ) { + wxTextFile fileGlobal(m_strGlobalFile); - if ( fileGlobal.Open() ) { - Parse(fileGlobal, FALSE /* global */); - SetRootPath(); - } - else - wxLogWarning(_("can't open global configuration file '%s'."), - strGlobal.c_str()); + if ( fileGlobal.Open() ) { + Parse(fileGlobal, FALSE /* global */); + SetRootPath(); } + else + wxLogWarning(_("can't open global configuration file '%s'."), + m_strGlobalFile.c_str()); } // parse the local file - if ( wxFile::Exists(strLocal) ) { - wxTextFile fileLocal(strLocal); + if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) ) { + wxTextFile fileLocal(m_strLocalFile); if ( fileLocal.Open() ) { Parse(fileLocal, TRUE /* local */); SetRootPath(); } else wxLogWarning(_("can't open user configuration file '%s'."), - strLocal.c_str()); + m_strLocalFile.c_str()); } } -wxFileConfig::~wxFileConfig() +// constructor supports creation of wxFileConfig objects of any type +wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName, + const wxString& strLocal, const wxString& strGlobal, + long style) + : wxConfigBase(appName, vendorName, strLocal, strGlobal, style), + m_strLocalFile(strLocal), m_strGlobalFile(strGlobal) +{ + // Make up an application name if not supplied + if (appName.IsEmpty() && wxTheApp) + { + SetAppName(wxTheApp->GetAppName()); + } + + // Make up names for files if empty + if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) ) + { + m_strLocalFile = GetLocalFileName(GetAppName()); + } + + if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) ) + { + m_strGlobalFile = GetGlobalFileName(GetAppName()); + } + + // Check if styles are not supplied, but filenames are, in which case + // add the correct styles. + if ( !m_strLocalFile.IsEmpty() ) + SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE); + + if ( !m_strGlobalFile.IsEmpty() ) + SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE); + + // if the path is not absolute, prepend the standard directory to it + if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) ) + { + wxString strLocal = m_strLocalFile; + m_strLocalFile = GetLocalDir(); + m_strLocalFile << strLocal; + } + + if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) ) + { + wxString strGlobal = m_strGlobalFile; + m_strGlobalFile = GetGlobalDir(); + m_strGlobalFile << strGlobal; + } + + Init(); +} + +void wxFileConfig::CleanUp() { - Flush(); delete m_pRootGroup; LineList *pCur = m_linesHead; @@ -199,6 +258,13 @@ wxFileConfig::~wxFileConfig() } } +wxFileConfig::~wxFileConfig() +{ + Flush(); + + CleanUp(); +} + // ---------------------------------------------------------------------------- // parse a config file // ---------------------------------------------------------------------------- @@ -209,8 +275,8 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal) const char *pEnd; wxString strLine; - uint nLineCount = file.GetLineCount(); - for ( uint n = 0; n < nLineCount; n++ ) { + size_t nLineCount = file.GetLineCount(); + for ( size_t n = 0; n < nLineCount; n++ ) { strLine = file[n]; // add the line to linked list @@ -242,7 +308,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal) // group name here is always considered as abs path wxString strGroup; pStart++; - strGroup << APPCONF_PATH_SEPARATOR << wxString(pStart, pEnd - pStart); + strGroup << wxCONFIG_PATH_SEPARATOR << wxString(pStart, pEnd - pStart); // will create it if doesn't yet exist SetPath(strGroup); @@ -349,19 +415,19 @@ void wxFileConfig::SetPath(const wxString& strPath) return; } - if ( strPath[0] == APPCONF_PATH_SEPARATOR ) { + if ( strPath[0] == wxCONFIG_PATH_SEPARATOR ) { // absolute path wxSplitPath(aParts, strPath); } else { // relative path, combine with current one wxString strFullPath = m_strPath; - strFullPath << APPCONF_PATH_SEPARATOR << strPath; + strFullPath << wxCONFIG_PATH_SEPARATOR << strPath; wxSplitPath(aParts, strFullPath); } // change current group - uint n; + size_t n; m_pCurrentGroup = m_pRootGroup; for ( n = 0; n < aParts.Count(); n++ ) { ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]); @@ -373,7 +439,7 @@ void wxFileConfig::SetPath(const wxString& strPath) // recombine path parts in one variable m_strPath.Empty(); for ( n = 0; n < aParts.Count(); n++ ) { - m_strPath << APPCONF_PATH_SEPARATOR << aParts[n]; + m_strPath << wxCONFIG_PATH_SEPARATOR << aParts[n]; } } @@ -381,15 +447,15 @@ void wxFileConfig::SetPath(const wxString& strPath) // enumeration // ---------------------------------------------------------------------------- -bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) +bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const { lIndex = 0; return GetNextGroup(str, lIndex); } -bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) +bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const { - if ( uint(lIndex) < m_pCurrentGroup->Groups().Count() ) { + if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) { str = m_pCurrentGroup->Groups()[lIndex++]->Name(); return TRUE; } @@ -397,15 +463,15 @@ bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) return FALSE; } -bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) +bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const { lIndex = 0; return GetNextEntry(str, lIndex); } -bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) +bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const { - if ( uint(lIndex) < m_pCurrentGroup->Entries().Count() ) { + if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) { str = m_pCurrentGroup->Entries()[lIndex++]->Name(); return TRUE; } @@ -413,13 +479,13 @@ bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) return FALSE; } -uint wxFileConfig::GetNumberOfEntries(bool bRecursive) const +size_t wxFileConfig::GetNumberOfEntries(bool bRecursive) const { - uint n = m_pCurrentGroup->Entries().Count(); + size_t n = m_pCurrentGroup->Entries().Count(); if ( bRecursive ) { ConfigGroup *pOldCurrentGroup = m_pCurrentGroup; - uint nSubgroups = m_pCurrentGroup->Groups().Count(); - for ( uint nGroup = 0; nGroup < nSubgroups; nGroup++ ) { + size_t nSubgroups = m_pCurrentGroup->Groups().Count(); + for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; n += GetNumberOfEntries(TRUE); CONST_CAST m_pCurrentGroup = pOldCurrentGroup; @@ -429,13 +495,13 @@ uint wxFileConfig::GetNumberOfEntries(bool bRecursive) const return n; } -uint wxFileConfig::GetNumberOfGroups(bool bRecursive) const +size_t wxFileConfig::GetNumberOfGroups(bool bRecursive) const { - uint n = m_pCurrentGroup->Groups().Count(); + size_t n = m_pCurrentGroup->Groups().Count(); if ( bRecursive ) { ConfigGroup *pOldCurrentGroup = m_pCurrentGroup; - uint nSubgroups = m_pCurrentGroup->Groups().Count(); - for ( uint nGroup = 0; nGroup < nSubgroups; nGroup++ ) { + size_t nSubgroups = m_pCurrentGroup->Groups().Count(); + for ( size_t nGroup = 0; nGroup < nSubgroups; nGroup++ ) { CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup]; n += GetNumberOfGroups(TRUE); CONST_CAST m_pCurrentGroup = pOldCurrentGroup; @@ -451,7 +517,7 @@ uint wxFileConfig::GetNumberOfGroups(bool bRecursive) const bool wxFileConfig::HasGroup(const wxString& strName) const { - PathChanger path(this, strName); + wxConfigPathChanger path(this, strName); ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name()); return pGroup != NULL; @@ -459,7 +525,7 @@ bool wxFileConfig::HasGroup(const wxString& strName) const bool wxFileConfig::HasEntry(const wxString& strName) const { - PathChanger path(this, strName); + wxConfigPathChanger path(this, strName); ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name()); return pEntry != NULL; @@ -469,53 +535,59 @@ bool wxFileConfig::HasEntry(const wxString& strName) const // read/write values // ---------------------------------------------------------------------------- -bool wxFileConfig::Read(wxString *pstr, - const char *szKey, - const char *szDefault) const +bool wxFileConfig::Read(const wxString& key, + wxString* pStr) const { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name()); if (pEntry == NULL) { - *pstr = ExpandEnvVars(szDefault); return FALSE; } else { - *pstr = ExpandEnvVars(pEntry->Value()); + *pStr = ExpandEnvVars(pEntry->Value()); return TRUE; } } -const char *wxFileConfig::Read(const char *szKey, - const char *szDefault) const +bool wxFileConfig::Read(const wxString& key, + wxString* pStr, const wxString& defVal) const { - static wxString s_str; - Read(&s_str, szKey, szDefault); + wxConfigPathChanger path(this, key); - return s_str.c_str(); + ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name()); + if (pEntry == NULL) { + if( IsRecordingDefaults() ) + ((wxFileConfig *)this)->Write(key,defVal); + *pStr = ExpandEnvVars(defVal); + return FALSE; + } + else { + *pStr = ExpandEnvVars(pEntry->Value()); + return TRUE; + } } -bool wxFileConfig::Read(long *pl, const char *szKey, long lDefault) const +bool wxFileConfig::Read(const wxString& key, long *pl) const { wxString str; - if ( Read(&str, szKey) ) { + if ( Read(key, & str) ) { *pl = atol(str); return TRUE; } else { - *pl = lDefault; return FALSE; } } -bool wxFileConfig::Write(const char *szKey, const char *szValue) +bool wxFileConfig::Write(const wxString& key, const wxString& szValue) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); wxString strName = path.Name(); if ( strName.IsEmpty() ) { // setting the value of a group is an error - wxASSERT_MSG( IsEmpty(szValue), "can't set value of a group!" ); + wxASSERT_MSG( IsEmpty(szValue), _("can't set value of a group!") ); // ... except if it's empty in which case it's a way to force it's creation m_pCurrentGroup->SetDirty(); @@ -527,9 +599,9 @@ bool wxFileConfig::Write(const char *szKey, const char *szValue) // writing an entry // check that the name is reasonable - if ( strName[0u] == APPCONF_IMMUTABLE_PREFIX ) { + if ( strName[0u] == wxCONFIG_IMMUTABLE_PREFIX ) { wxLogError(_("Entry name can't start with '%c'."), - APPCONF_IMMUTABLE_PREFIX); + wxCONFIG_IMMUTABLE_PREFIX); return FALSE; } @@ -551,12 +623,12 @@ bool wxFileConfig::Write(const char *szKey, const char *szValue) return TRUE; } -bool wxFileConfig::Write(const char *szKey, long lValue) +bool wxFileConfig::Write(const wxString& key, long lValue) { // ltoa() is not ANSI :-( - char szBuf[40]; // should be good for sizeof(long) <= 16 (128 bits) - sprintf(szBuf, "%ld", lValue); - return Write(szKey, szBuf); + wxString buf; + buf.Printf("%ld", lValue); + return Write(key, buf); } bool wxFileConfig::Flush(bool /* bCurrentOnly */) @@ -586,9 +658,9 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */) // delete groups/entries // ---------------------------------------------------------------------------- -bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso) +bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); if ( !m_pCurrentGroup->DeleteEntry(path.Name()) ) return FALSE; @@ -597,7 +669,7 @@ bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso) if ( m_pCurrentGroup != m_pRootGroup ) { ConfigGroup *pGroup = m_pCurrentGroup; SetPath(".."); // changes m_pCurrentGroup! - m_pCurrentGroup->DeleteSubgroup(pGroup->Name()); + m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name()); } //else: never delete the root group } @@ -605,25 +677,24 @@ bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso) return TRUE; } -bool wxFileConfig::DeleteGroup(const char *szKey) +bool wxFileConfig::DeleteGroup(const wxString& key) { - PathChanger path(this, szKey); + wxConfigPathChanger path(this, key); - return m_pCurrentGroup->DeleteSubgroup(path.Name()); + return m_pCurrentGroup->DeleteSubgroupByName(path.Name()); } bool wxFileConfig::DeleteAll() { + CleanUp(); + const char *szFile = m_strLocalFile; - delete m_pRootGroup; - Init(); if ( remove(szFile) == -1 ) wxLogSysError(_("can't delete user configuration file '%s'"), szFile); - szFile = m_strGlobalFile; - if ( remove(szFile) ) - wxLogSysError(_("can't delete system configuration file '%s'"), szFile); + m_strLocalFile = m_strGlobalFile = ""; + Init(); return TRUE; } @@ -691,7 +762,7 @@ void wxFileConfig::LineListRemove(LineList *pLine) // last entry? if ( pNext == NULL ) m_linesTail = pPrev; - else + else pNext->SetPrev(pPrev); delete pLine; @@ -731,7 +802,7 @@ wxFileConfig::ConfigGroup::ConfigGroup(wxFileConfig::ConfigGroup *pParent, wxFileConfig::ConfigGroup::~ConfigGroup() { // entries - uint n, nCount = m_aEntries.Count(); + size_t n, nCount = m_aEntries.Count(); for ( n = 0; n < nCount; n++ ) delete m_aEntries[n]; @@ -794,7 +865,7 @@ wxFileConfig::LineList *wxFileConfig::ConfigGroup::GetGroupLine() // this group wasn't present in local config file, add it now if ( pParent != NULL ) { wxString strFullName; - strFullName << "[" << GetFullName().c_str() + 1 << "]"; // +1: no '/' + strFullName << "[" << (GetFullName().c_str() + 1) << "]"; // +1: no '/' m_pLine = m_pConfig->LineListInsert(strFullName, pParent->GetLastGroupLine()); pParent->SetLastGroup(this); // we're surely after all the others @@ -849,7 +920,7 @@ wxFileConfig::LineList *wxFileConfig::ConfigGroup::GetLastEntryLine() wxString wxFileConfig::ConfigGroup::GetFullName() const { if ( Parent() ) - return Parent()->GetFullName() + APPCONF_PATH_SEPARATOR + Name(); + return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name(); else return ""; } @@ -862,7 +933,7 @@ wxString wxFileConfig::ConfigGroup::GetFullName() const wxFileConfig::ConfigEntry * wxFileConfig::ConfigGroup::FindEntry(const char *szName) const { - uint i, + size_t i, lo = 0, hi = m_aEntries.Count(); int res; @@ -872,7 +943,7 @@ wxFileConfig::ConfigGroup::FindEntry(const char *szName) const i = (lo + hi)/2; pEntry = m_aEntries[i]; - #if APPCONF_CASE_SENSITIVE + #if wxCONFIG_CASE_SENSITIVE res = strcmp(pEntry->Name(), szName); #else res = Stricmp(pEntry->Name(), szName); @@ -892,7 +963,7 @@ wxFileConfig::ConfigGroup::FindEntry(const char *szName) const wxFileConfig::ConfigGroup * wxFileConfig::ConfigGroup::FindSubgroup(const char *szName) const { - uint i, + size_t i, lo = 0, hi = m_aSubgroups.Count(); int res; @@ -902,7 +973,7 @@ wxFileConfig::ConfigGroup::FindSubgroup(const char *szName) const i = (lo + hi)/2; pGroup = m_aSubgroups[i]; - #if APPCONF_CASE_SENSITIVE + #if wxCONFIG_CASE_SENSITIVE res = strcmp(pGroup->Name(), szName); #else res = Stricmp(pGroup->Name(), szName); @@ -958,19 +1029,32 @@ wxFileConfig::ConfigGroup::AddSubgroup(const wxString& strName) delete several of them. */ -bool wxFileConfig::ConfigGroup::DeleteSubgroup(const char *szName) +bool wxFileConfig::ConfigGroup::DeleteSubgroupByName(const char *szName) +{ + return DeleteSubgroup(FindSubgroup(szName)); +} + +// doesn't delete the subgroup itself, but does remove references to it from +// all other data structures (and normally the returned pointer should be +// deleted a.s.a.p. because there is nothing much to be done with it anyhow) +bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup) { - ConfigGroup *pGroup = FindSubgroup(szName); wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group? // delete all entries - uint nCount = pGroup->m_aEntries.Count(); - for ( uint nEntry = 0; nEntry < nCount; nEntry++ ) { + size_t nCount = pGroup->m_aEntries.Count(); + for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) { LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine(); if ( pLine != NULL ) m_pConfig->LineListRemove(pLine); } + // and subgroups of this sungroup + nCount = pGroup->m_aSubgroups.Count(); + for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) { + pGroup->DeleteSubgroup(pGroup->m_aSubgroups[nGroup]); + } + LineList *pLine = pGroup->m_pLine; if ( pLine != NULL ) { // notice that we may do this test inside the previous "if" because the @@ -981,7 +1065,7 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(const char *szName) // go back until we find a subgroup or reach the group's line ConfigGroup *pNewLast = NULL; - uint n, nSubgroups = m_aSubgroups.Count(); + size_t n, nSubgroups = m_aSubgroups.Count(); LineList *pl; for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) { // is it our subgroup? @@ -1032,7 +1116,7 @@ bool wxFileConfig::ConfigGroup::DeleteEntry(const char *szName) // go back until we find another entry or reach the group's line ConfigEntry *pNewLast = NULL; - uint n, nEntries = m_aEntries.Count(); + size_t n, nEntries = m_aEntries.Count(); LineList *pl; for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) { // is it our subgroup? @@ -1097,7 +1181,7 @@ wxFileConfig::ConfigEntry::ConfigEntry(wxFileConfig::ConfigGroup *pParent, m_bDirty = FALSE; - m_bImmutable = strName[0] == APPCONF_IMMUTABLE_PREFIX; + m_bImmutable = strName[0] == wxCONFIG_IMMUTABLE_PREFIX; if ( m_bImmutable ) m_strName.erase(0, 1); // remove first character } @@ -1172,7 +1256,7 @@ void wxFileConfig::ConfigEntry::SetDirty() int CompareEntries(wxFileConfig::ConfigEntry *p1, wxFileConfig::ConfigEntry *p2) { - #if APPCONF_CASE_SENSITIVE + #if wxCONFIG_CASE_SENSITIVE return strcmp(p1->Name(), p2->Name()); #else return Stricmp(p1->Name(), p2->Name()); @@ -1182,7 +1266,7 @@ int CompareEntries(wxFileConfig::ConfigEntry *p1, int CompareGroups(wxFileConfig::ConfigGroup *p1, wxFileConfig::ConfigGroup *p2) { - #if APPCONF_CASE_SENSITIVE + #if wxCONFIG_CASE_SENSITIVE return strcmp(p1->Name(), p2->Name()); #else return Stricmp(p1->Name(), p2->Name()); @@ -1201,7 +1285,7 @@ wxString FilterIn(const wxString& str) bool bQuoted = !str.IsEmpty() && str[0] == '"'; - for ( uint n = bQuoted ? 1 : 0; n < str.Len(); n++ ) { + for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) { if ( str[n] == '\\' ) { switch ( str[++n] ) { case 'n': @@ -1242,6 +1326,9 @@ wxString FilterIn(const wxString& str) // quote the string before writing it to file wxString FilterOut(const wxString& str) { + if(str.IsEmpty()) + return str; + wxString strResult; strResult.Alloc(str.Len()); @@ -1252,7 +1339,7 @@ wxString FilterOut(const wxString& str) strResult += '"'; char c; - for ( uint n = 0; n < str.Len(); n++ ) { + for ( size_t n = 0; n < str.Len(); n++ ) { switch ( str[n] ) { case '\n': c = 'n'; @@ -1271,8 +1358,10 @@ wxString FilterOut(const wxString& str) break; case '"': - if ( bQuote ) + if ( bQuote ) { c = '"'; + break; + } //else: fall through default: