X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/45d51f194ab8ca09c31aae413e791ac91c4639f5..b9efe021b554fa3967d1442cf758435c5cd5ae8f:/src/common/fileconf.cpp?ds=sidebyside diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index f79f88014f..2944b09995 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -49,6 +49,7 @@ #if defined(__WXMAC__) #include "wx/mac/private.h" // includes mac headers + #include "wx/filename.h" // for MacSetTypeAndCreator #endif #if defined(__WXMSW__) @@ -75,6 +76,8 @@ #define MAX_PATH 512 #endif +#define FILECONF_TRACE_MASK _T("fileconf") + // ---------------------------------------------------------------------------- // global functions declarations // ---------------------------------------------------------------------------- @@ -203,6 +206,9 @@ private: // DeleteSubgroupByName helper bool DeleteSubgroup(wxFileConfigGroup *pGroup); + // used by Rename() + void UpdateGroupAndSubgroupsLines(); + public: // ctor wxFileConfigGroup(wxFileConfigGroup *pParent, const wxString& strName, wxFileConfig *); @@ -286,7 +292,10 @@ wxString wxFileConfig::GetGlobalDir() // There's no such thing as global cfg dir in MS-DOS, let's return // current directory (FIXME_MGL?) return wxT(".\\"); +#elif defined(__WXWINCE__) + strDir = wxT("\\Windows\\"); #else // Windows + wxChar szWinDir[MAX_PATH]; ::GetWindowsDirectory(szWinDir, MAX_PATH); @@ -373,7 +382,7 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile) void wxFileConfig::Init() { m_pCurrentGroup = - m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this); + m_pRootGroup = new wxFileConfigGroup(NULL, wxEmptyString, this); m_linesHead = m_linesTail = NULL; @@ -381,7 +390,7 @@ void wxFileConfig::Init() // It's not an error if (one of the) file(s) doesn't exist. // parse the global file - if ( !m_strGlobalFile.IsEmpty() && wxFile::Exists(m_strGlobalFile) ) + if ( !m_strGlobalFile.empty() && wxFile::Exists(m_strGlobalFile) ) { wxTextFile fileGlobal(m_strGlobalFile); @@ -397,7 +406,7 @@ void wxFileConfig::Init() } // parse the local file - if ( !m_strLocalFile.IsEmpty() && wxFile::Exists(m_strLocalFile) ) + if ( !m_strLocalFile.empty() && wxFile::Exists(m_strLocalFile) ) { wxTextFile fileLocal(m_strLocalFile); if ( fileLocal.Open(m_conv/*ignored in ANSI build*/) ) @@ -425,32 +434,32 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName, m_conv(conv) { // Make up names for files if empty - if ( m_strLocalFile.IsEmpty() && (style & wxCONFIG_USE_LOCAL_FILE) ) + if ( m_strLocalFile.empty() && (style & wxCONFIG_USE_LOCAL_FILE) ) m_strLocalFile = GetLocalFileName(GetAppName()); - if ( m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE) ) + if ( m_strGlobalFile.empty() && (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() ) + if ( !m_strLocalFile.empty() ) SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE); - if ( !m_strGlobalFile.IsEmpty() ) + if ( !m_strGlobalFile.empty() ) SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE); // if the path is not absolute, prepend the standard directory to it // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set if ( !(style & wxCONFIG_USE_RELATIVE_PATH) ) { - if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) ) + if ( !m_strLocalFile.empty() && !wxIsAbsolutePath(m_strLocalFile) ) { wxString strLocal = m_strLocalFile; m_strLocalFile = GetLocalDir(); m_strLocalFile << strLocal; } - if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) ) + if ( !m_strGlobalFile.empty() && !wxIsAbsolutePath(m_strGlobalFile) ) { wxString strGlobal = m_strGlobalFile; m_strGlobalFile = GetGlobalDir(); @@ -472,7 +481,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv) SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE); m_pCurrentGroup = - m_pRootGroup = new wxFileConfigGroup(NULL, wxT(""), this); + m_pRootGroup = new wxFileConfigGroup(NULL, wxEmptyString, this); m_linesHead = m_linesTail = NULL; @@ -486,7 +495,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv) char buf[1024]; do { - inStream.Read(buf, WXSIZEOF(buf)); + inStream.Read(buf, WXSIZEOF(buf)-1); // leave room for the NULL const wxStreamError err = inStream.GetLastError(); @@ -496,7 +505,12 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv) break; } - strTmp.append(wxConvertMB2WX(buf), inStream.LastRead()); + // FIXME: this is broken because if we have part of multibyte + // character in the buffer (and another part hasn't been + // read yet) we're going to lose data because of conversion + // errors + buf[inStream.LastRead()] = '\0'; + strTmp += conv.cMB2WX(buf); } while ( !inStream.Eof() ); @@ -534,6 +548,7 @@ wxFileConfig::wxFileConfig(wxInputStream &inStream, wxMBConv& conv) Parse(memText, true /* local */); SetRootPath(); + ResetDirty(); } #endif // wxUSE_STREAMS @@ -578,7 +593,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal) { LineListAppend(strLine); - // let the root group have it start line as well + // let the root group have its start line as well if ( !n ) { m_pCurrentGroup->SetLine(m_linesTail); @@ -735,7 +750,7 @@ void wxFileConfig::SetPath(const wxString& strPath) { wxArrayString aParts; - if ( strPath.IsEmpty() ) { + if ( strPath.empty() ) { SetRootPath(); return; } @@ -891,21 +906,21 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) wxConfigPathChanger path(this, key); wxString strName = path.Name(); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" Writing String '%s' = '%s' to Group '%s'"), strName.c_str(), szValue.c_str(), GetPath().c_str() ); - if ( strName.IsEmpty() ) + if ( strName.empty() ) { // setting the value of a group is an error - wxASSERT_MSG( wxIsEmpty(szValue), wxT("can't set value of a group!") ); + wxASSERT_MSG( szValue.empty(), wxT("can't set value of a group!") ); // ... except if it's empty in which case it's a way to force it's creation - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" Creating group %s"), m_pCurrentGroup->Name().c_str() ); @@ -929,13 +944,13 @@ bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) if ( pEntry == 0 ) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" Adding Entry %s"), strName.c_str() ); pEntry = m_pCurrentGroup->AddEntry(strName); } - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" Setting value %s"), szValue.c_str() ); pEntry->SetValue(szValue); @@ -1004,7 +1019,9 @@ bool wxFileConfig::Save(wxOutputStream& os, wxMBConv& conv) { wxString line = p->Text(); line += wxTextFile::GetEOL(); - if ( !os.Write(line.mb_str(conv), line.length()) ) + + wxCharBuffer buf(line.mb_str(conv)); + if ( !os.Write(buf, strlen(buf)) ) { wxLogError(_("Error saving user configuration data.")); @@ -1026,6 +1043,9 @@ bool wxFileConfig::Save(wxOutputStream& os, wxMBConv& conv) bool wxFileConfig::RenameEntry(const wxString& oldName, const wxString& newName) { + wxASSERT_MSG( !wxStrchr(oldName, wxCONFIG_PATH_SEPARATOR), + _T("RenameEntry(): paths are not supported") ); + // check that the entry exists wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName); if ( !oldEntry ) @@ -1078,12 +1098,13 @@ bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso) if ( !m_pCurrentGroup->DeleteEntry(path.Name()) ) return false; + SetDirty(); + if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) { if ( m_pCurrentGroup != m_pRootGroup ) { wxFileConfigGroup *pGroup = m_pCurrentGroup; SetPath(wxT("..")); // changes m_pCurrentGroup! - if ( m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name()) ) - SetDirty(); + m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name()); } //else: never delete the root group } @@ -1107,13 +1128,19 @@ bool wxFileConfig::DeleteAll() { CleanUp(); - if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 ) + if ( !m_strLocalFile.empty() ) { - wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str()); - return false; + if ( wxFile::Exists(m_strLocalFile) && wxRemove(m_strLocalFile) == -1 ) + { + wxLogSysError(_("can't delete user configuration file '%s'"), + m_strLocalFile.c_str()); + return false; + } + + m_strLocalFile = + m_strGlobalFile = wxEmptyString; } - m_strLocalFile = m_strGlobalFile = wxT(""); Init(); return true; @@ -1127,13 +1154,13 @@ bool wxFileConfig::DeleteAll() wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" ** Adding Line '%s'"), str.c_str() ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1153,10 +1180,10 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) m_linesTail = pLine; - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1167,14 +1194,14 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, wxFileConfigLineList *pLine) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" ** Inserting Line '%s' after '%s'"), str.c_str(), ((pLine) ? pLine->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1199,10 +1226,10 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, pLine->SetNext(pNewLine); } - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1211,13 +1238,13 @@ wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" ** Removing Line '%s'"), pLine->Text().c_str() ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1238,10 +1265,13 @@ void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine) else pNext->SetPrev(pPrev); - wxLogTrace( _T("wxFileConfig"), + if ( m_pRootGroup->GetGroupLine() == pLine ) + m_pRootGroup->SetLine(m_linesHead); + + wxLogTrace( FILECONF_TRACE_MASK, _T(" head: %s"), ((m_linesHead) ? m_linesHead->Text().c_str() : wxEmptyString) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" tail: %s"), ((m_linesTail) ? m_linesTail->Text().c_str() : wxEmptyString) ); @@ -1297,7 +1327,8 @@ wxFileConfigGroup::~wxFileConfigGroup() void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine) { - wxASSERT( m_pLine == 0 ); // shouldn't be called twice + // shouldn't be called twice unless we are resetting the line + wxASSERT( m_pLine == 0 || pLine == 0 ); m_pLine = pLine; } @@ -1337,13 +1368,13 @@ void wxFileConfigGroup::SetLine(wxFileConfigLineList *pLine) // have it or in the very beginning if we're the root group. wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" GetGroupLine() for Group '%s'"), Name().c_str() ); if ( !m_pLine ) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" Getting Line item pointer") ); wxFileConfigGroup *pParent = Parent(); @@ -1351,7 +1382,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() // this group wasn't present in local config file, add it now if ( pParent ) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" checking parent '%s'"), pParent->Name().c_str() ); @@ -1397,7 +1428,7 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine() // one immediately after the group line itself. wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine() { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" GetLastEntryLine() for Group '%s'"), Name().c_str() ); @@ -1434,28 +1465,41 @@ void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry) // group name // ---------------------------------------------------------------------------- +void wxFileConfigGroup::UpdateGroupAndSubgroupsLines() +{ + // update the line of this group + wxFileConfigLineList *line = GetGroupLine(); + wxCHECK_RET( line, _T("a non root group must have a corresponding line!") ); + + // +1: skip the leading '/' + line->SetText(wxString::Format(_T("[%s]"), GetFullName().c_str() + 1)); + + + // also update all subgroups as they have this groups name in their lines + const size_t nCount = m_aSubgroups.Count(); + for ( size_t n = 0; n < nCount; n++ ) + { + m_aSubgroups[n]->UpdateGroupAndSubgroupsLines(); + } +} + void wxFileConfigGroup::Rename(const wxString& newName) { wxCHECK_RET( m_pParent, _T("the root group can't be renamed") ); m_strName = newName; - // +1: no leading '/' - wxString strFullName; - strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); - - wxFileConfigLineList *line = GetGroupLine(); - wxCHECK_RET( line, _T("a non root group must have a corresponding line!") ); - - line->SetText(strFullName); + // update the group lines recursively + UpdateGroupAndSubgroupsLines(); } wxString wxFileConfigGroup::GetFullName() const { - if ( Parent() ) - return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name(); - else - return wxT(""); + wxString fullname; + if ( Parent() ) + fullname = Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name(); + + return fullname; } // ---------------------------------------------------------------------------- @@ -1573,121 +1617,91 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) { wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T("Deleting group '%s' from '%s'"), pGroup->Name().c_str(), Name().c_str() ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" (m_pLine) = prev: %p, this %p, next %p"), ((m_pLine) ? m_pLine->Prev() : 0), m_pLine, ((m_pLine) ? m_pLine->Next() : 0) ); - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" text: '%s'"), ((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) ); - // delete all entries + // delete all entries... size_t nCount = pGroup->m_aEntries.Count(); - wxLogTrace(_T("wxFileConfig"), - _T("Removing %lu Entries"), - (unsigned long)nCount ); + wxLogTrace(FILECONF_TRACE_MASK, + _T("Removing %lu entries"), (unsigned long)nCount ); for ( size_t nEntry = 0; nEntry < nCount; nEntry++ ) { - wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine(); + wxFileConfigLineList *pLine = pGroup->m_aEntries[nEntry]->GetLine(); - if ( pLine != 0 ) + if ( pLine ) { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" '%s'"), pLine->Text().c_str() ); m_pConfig->LineListRemove(pLine); } } - // and subgroups of this subgroup - + // ...and subgroups of this subgroup nCount = pGroup->m_aSubgroups.Count(); - wxLogTrace( _T("wxFileConfig"), - _T("Removing %lu SubGroups"), - (unsigned long)nCount ); + wxLogTrace( FILECONF_TRACE_MASK, + _T("Removing %lu subgroups"), (unsigned long)nCount ); for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) { pGroup->DeleteSubgroup(pGroup->m_aSubgroups[0]); } - // finally the group itself - - wxFileConfigLineList *pLine = pGroup->m_pLine; - - if ( pLine != 0 ) + // and then finally the group itself + wxFileConfigLineList *pLine = pGroup->m_pLine; + if ( pLine ) { - wxLogTrace( _T("wxFileConfig"), - _T(" Removing line entry for Group '%s' : '%s'"), + wxLogTrace( FILECONF_TRACE_MASK, + _T(" Removing line for group '%s' : '%s'"), pGroup->Name().c_str(), pLine->Text().c_str() ); - wxLogTrace( _T("wxFileConfig"), - _T(" Removing from Group '%s' : '%s'"), + wxLogTrace( FILECONF_TRACE_MASK, + _T(" Removing from group '%s' : '%s'"), Name().c_str(), ((m_pLine) ? m_pLine->Text().c_str() : wxEmptyString) ); - // notice that we may do this test inside the previous "if" - // because the last entry's line is surely !NULL - + // notice that we may do this test inside the previous "if" + // because the last entry's line is surely !NULL if ( pGroup == m_pLastGroup ) { - wxLogTrace( _T("wxFileConfig"), - _T(" ------- Removing last group -------") ); - - // our last entry is being deleted, so find the last one which stays. - // go back until we find a subgroup or reach the group's line, unless - // we are the root group, which we'll notice shortly. - - wxFileConfigGroup *pNewLast = 0; - size_t nSubgroups = m_aSubgroups.Count(); - wxFileConfigLineList *pl; - - for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) + wxLogTrace( FILECONF_TRACE_MASK, + _T(" Removing last group") ); + + // our last entry is being deleted, so find the last one which + // stays by going back until we find a subgroup or reach the + // group line + const size_t nSubgroups = m_aSubgroups.Count(); + + m_pLastGroup = NULL; + for ( wxFileConfigLineList *pl = pLine->Prev(); + pl && pl != m_pLine && !m_pLastGroup; + pl = pl->Prev() ) { - // is it our subgroup? - - for ( size_t n = 0; (pNewLast == 0) && (n < nSubgroups); n++ ) + // does this line belong to our subgroup? + for ( size_t n = 0; n < nSubgroups; n++ ) { - // do _not_ call GetGroupLine! we don't want to add it to the local - // file if it's not already there - - if ( m_aSubgroups[n]->m_pLine == m_pLine ) - pNewLast = m_aSubgroups[n]; + // do _not_ call GetGroupLine! we don't want to add it to + // the local file if it's not already there + if ( m_aSubgroups[n]->m_pLine == pl ) + { + m_pLastGroup = m_aSubgroups[n]; + break; + } } - - if ( pNewLast != 0 ) // found? - break; - } - - if ( pl == m_pLine || m_pParent == 0 ) - { - wxLogTrace( _T("wxFileConfig"), - _T(" ------- No previous group found -------") ); - - wxASSERT_MSG( !pNewLast || m_pLine == 0, - _T("how comes it has the same line as we?") ); - - // we've reached the group line without finding any subgroups, - // or realised we removed the last group from the root. - - m_pLastGroup = 0; - } - else - { - wxLogTrace( _T("wxFileConfig"), - _T(" ------- Last Group set to '%s' -------"), - pNewLast->Name().c_str() ); - - m_pLastGroup = pNewLast; } } @@ -1695,7 +1709,7 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) } else { - wxLogTrace( _T("wxFileConfig"), + wxLogTrace( FILECONF_TRACE_MASK, _T(" No line entry for Group '%s'?"), pGroup->Name().c_str() ); } @@ -1709,7 +1723,11 @@ bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup) bool wxFileConfigGroup::DeleteEntry(const wxChar *szName) { wxFileConfigEntry *pEntry = FindEntry(szName); - wxCHECK( pEntry != NULL, false ); // deleting non existing item? + if ( !pEntry ) + { + // entry doesn't exist, nothing to do + return false; + } wxFileConfigLineList *pLine = pEntry->GetLine(); if ( pLine != NULL ) { @@ -1765,7 +1783,7 @@ wxFileConfigEntry::wxFileConfigEntry(wxFileConfigGroup *pParent, int nLine) : m_strName(strName) { - wxASSERT( !strName.IsEmpty() ); + wxASSERT( !strName.empty() ); m_pParent = pParent; m_nLine = nLine; @@ -1834,7 +1852,10 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser) } else // this entry didn't exist in the local file { - // add a new line to the file + // add a new line to the file: note that line returned by + // GetLastEntryLine() may be NULL if we're in the root group and it + // doesn't have any entries yet, but this is ok as passing NULL + // line to LineListInsert() means to prepend new line to the list wxFileConfigLineList *line = Group()->GetLastEntryLine(); m_pLine = Group()->Config()->LineListInsert(strLine, line); @@ -1879,7 +1900,7 @@ static wxString FilterInValue(const wxString& str) wxString strResult; strResult.Alloc(str.Len()); - bool bQuoted = !str.IsEmpty() && str[0] == '"'; + bool bQuoted = !str.empty() && str[0] == '"'; for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) { if ( str[n] == wxT('\\') ) { @@ -2033,5 +2054,3 @@ static wxString GetAppName(const wxString& appName) #endif // wxUSE_CONFIG - -// vi:sts=4:sw=4:et