X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/67de05a11c55c027d6c5522de0fa93e66e221df3..71a660a3128c6c2a9262225136907e57dab33183:/src/common/fileconf.cpp diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp index 16b17cadfc..3e39151ade 100644 --- a/src/common/fileconf.cpp +++ b/src/common/fileconf.cpp @@ -7,7 +7,7 @@ // RCS-ID: $Id$ // Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin // Ballueder@usa.net -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -250,10 +250,11 @@ public: wxFileConfigLineList *GetLastGroupLine(); // after which the next group starts // called by entries/subgroups when they're created/deleted - void SetLastEntry(wxFileConfigEntry *pEntry) { m_pLastEntry = pEntry; } - void SetLastGroup(wxFileConfigGroup *pGroup) { m_pLastGroup = pGroup; } + void SetLastEntry(wxFileConfigEntry *pEntry); + void SetLastGroup(wxFileConfigGroup *pGroup) + { m_pLastGroup = pGroup; } - DECLARE_NO_COPY_CLASS(wxFileConfigGroup) + DECLARE_NO_COPY_CLASS(wxFileConfigGroup) }; // ============================================================================ @@ -331,7 +332,7 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile) if ( wxStrchr(szFile, wxT('.')) == NULL ) #if defined( __WXMAC__ ) - str << " Preferences"; + str << wxT(" Preferences") ; #elif defined( __UNIX__ ) str << wxT(".conf"); #else // Windows @@ -364,7 +365,7 @@ wxString wxFileConfig::GetLocalFileName(const wxChar *szFile) #endif #ifdef __WXMAC__ - str << " Preferences"; + str << wxT(" Preferences") ; #endif return str; @@ -565,8 +566,17 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal) // add the line to linked list if ( bLocal ) + { LineListAppend(strLine); + // let the root group have it start line as well + if ( !n ) + { + m_pCurrentGroup->SetLine(m_linesTail); + } + } + + // skip leading spaces for ( pStart = strLine; wxIsspace(*pStart); pStart++ ) ; @@ -662,6 +672,16 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal) // new entry pEntry = m_pCurrentGroup->AddEntry(strKey, n); + // + // Take the opportunity to set some pointers now + // that we know there are items in this group. + // Otherwise, items added to a newly read file + // can be put in the wrong place. + m_pCurrentGroup->SetLastEntry(pEntry); + if (m_pCurrentGroup->Parent()) + m_pCurrentGroup->Parent()->SetLastGroup(m_pCurrentGroup); + // + if ( bLocal ) pEntry->SetLine(m_linesTail); } @@ -855,12 +875,14 @@ bool wxFileConfig::DoReadString(const wxString& key, wxString* pStr) const bool wxFileConfig::DoReadLong(const wxString& key, long *pl) const { - wxString str; - if ( !Read(key, & str) ) - { - return FALSE; - } - return str.ToLong(pl) ; + wxString str; + if ( !Read(key, &str) ) + return FALSE; + + // extra spaces shouldn't prevent us from reading numeric values + str.Trim(); + + return str.ToLong(pl); } bool wxFileConfig::DoWriteString(const wxString& key, const wxString& szValue) @@ -1122,8 +1144,7 @@ wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str) return m_linesTail; } - // insert a new line after the given one or in the very beginning if !pLine - +// insert a new line after the given one or in the very beginning if !pLine wxFileConfigLineList *wxFileConfig::LineListInsert(const wxString& str, wxFileConfigLineList *pLine) { @@ -1302,16 +1323,15 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() _T(" GetGroupLine() for Group '%s'"), Name().c_str() ); - if ( m_pLine == 0 ) + if ( !m_pLine ) { wxLogTrace( _T("wxFileConfig"), _T(" Getting Line item pointer") ); wxFileConfigGroup *pParent = Parent(); - // this group wasn't present in local config file, add it now - - if ( pParent != 0 ) + // this group wasn't present in local config file, add it now + if ( pParent ) { wxLogTrace( _T("wxFileConfig"), _T(" checking parent '%s'"), @@ -1319,18 +1339,16 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() wxString strFullName; - strFullName << wxT("[") // +1: no '/' + // add 1 to the name because we don't want to start with '/' + strFullName << wxT("[") << FilterOutEntryName(GetFullName().c_str() + 1) << wxT("]"); m_pLine = m_pConfig->LineListInsert(strFullName, pParent->GetLastGroupLine()); pParent->SetLastGroup(this); // we're surely after all the others } - else - { - // we return NULL, so that LineListInsert() will insert us in the - // very beginning - } + //else: this is the root group and so we return NULL because we don't + // have any group line } return m_pLine; @@ -1341,19 +1359,18 @@ wxFileConfigLineList *wxFileConfigGroup::GetGroupLine() // last line is the group line (m_pLine) itself. wxFileConfigLineList *wxFileConfigGroup::GetLastGroupLine() { - // if we have any subgroups, our last line is - // the last line of the last subgroup - - if ( m_pLastGroup != 0 ) + // if we have any subgroups, our last line is the last line of the last + // subgroup + if ( m_pLastGroup ) { wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine(); - wxASSERT( pLine != 0 ); // last group must have !NULL associated line + wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") ); + return pLine; } - // no subgroups, so the last line is the line of thelast entry (if any) - + // no subgroups, so the last line is the line of thelast entry (if any) return GetLastEntryLine(); } @@ -1366,30 +1383,52 @@ wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine() _T(" GetLastEntryLine() for Group '%s'"), Name().c_str() ); - if ( m_pLastEntry != 0 ) + if ( m_pLastEntry ) { wxFileConfigLineList *pLine = m_pLastEntry->GetLine(); - wxASSERT( pLine != 0 ); // last entry must have !NULL associated line + wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") ); + return pLine; } - // no entries: insert after the group header - + // no entries: insert after the group header, if any return GetGroupLine(); } +void wxFileConfigGroup::SetLastEntry(wxFileConfigEntry *pEntry) +{ + m_pLastEntry = pEntry; + + if ( !m_pLine ) + { + // the only situation in which a group without its own line can have + // an entry is when the first entry is added to the initially empty + // root pseudo-group + wxASSERT_MSG( !m_pParent, _T("unexpected for non root group") ); + + // let the group know that it does have a line in the file now + m_pLine = pEntry->GetLine(); + } +} + // ---------------------------------------------------------------------------- // group name // ---------------------------------------------------------------------------- void wxFileConfigGroup::Rename(const wxString& newName) { + wxCHECK_RET( m_pParent, _T("the root group can't be renamed") ); + m_strName = newName; - wxFileConfigLineList *line = GetGroupLine(); + // +1: no leading '/' wxString strFullName; - strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/' + 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); SetDirty(); @@ -1790,17 +1829,19 @@ void wxFileConfigEntry::SetValue(const wxString& strValue, bool bUser) wxString strLine; strLine << FilterOutEntryName(m_strName) << wxT('=') << strValFiltered; - if ( m_pLine != 0 ) + if ( m_pLine ) { // entry was read from the local config file, just modify the line m_pLine->SetText(strLine); } - else { + else // this entry didn't exist in the local file + { // add a new line to the file wxASSERT( m_nLine == wxNOT_FOUND ); // consistency check - m_pLine = Group()->Config()->LineListInsert(strLine, - Group()->GetLastEntryLine()); + wxFileConfigLineList *line = Group()->GetLastEntryLine(); + m_pLine = Group()->Config()->LineListInsert(strLine, line); + Group()->SetLastEntry(this); }