// Name: fileconf.cpp
// Purpose: implementation of wxFileConfig derivation of wxConfig
// Author: Vadim Zeitlin
-// Modified by:
+// Modified by:
// Created: 07.04.98 (adapted from appconf.cpp)
// RCS-ID: $Id$
// Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin
#include <wx/fileconf.h>
// _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if defined(__WINDOWS__) && !defined(_WINDOWS_)
+// __WXMSW__ is defined for MS Windows compilation
+#if defined(__WXMSW__) && !defined(_WINDOWS_)
#include <windows.h>
#endif //windows.h
// is 'c' a valid character in group name?
// NB: APPCONF_IMMUTABLE_PREFIX and APPCONF_PATH_SEPARATOR must be valid chars,
// but _not_ ']' (group name delimiter)
-inline bool IsValid(char c) { return isalnum(c) || strchr("_/-!.*%", c); }
+inline bool IsValid(char c) { return isalnum(c) || strchr("@_/-!.*%", c); }
// filter strings
static wxString FilterIn(const wxString& str);
void wxFileConfig::Init()
{
- m_pCurrentGroup =
+ m_pCurrentGroup =
m_pRootGroup = new ConfigGroup(NULL, "", this);
m_linesHead =
{
Flush();
delete m_pRootGroup;
+
+ LineList *pCur = m_linesHead;
+ while ( pCur != NULL ) {
+ LineList *pNext = pCur->Next();
+ delete pCur;
+ pCur = pNext;
+ }
}
// ----------------------------------------------------------------------------
{
const char *pStart;
const char *pEnd;
-
+
for ( uint n = 0; n < file.GetLineCount(); n++ ) {
// add the line to linked list
if ( bLocal )
case ';':
bCont = FALSE;
break;
-
+
case ' ':
case '\t':
// ignore whitespace ('\n' impossible here)
break;
-
+
default:
wxLogWarning("file '%s', line %d: '%s' ignored after group header.",
file.GetName(), n + 1, pEnd);
wxString strKey(pStart, pEnd);
// skip whitespace
- while ( isspace(*pEnd) )
+ while ( isspace(*pEnd) )
pEnd++;
if ( *pEnd++ != '=' ) {
// (c) key from global file now found in local one
// which is exactly what we want.
else if ( !bLocal || pEntry->IsLocal() ) {
- wxLogWarning("file '%s', line %d: key '%s' was first found at line %d.",
+ wxLogWarning("file '%s', line %d: key '%s' was first found at line %d.",
file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
if ( bLocal )
}
// skip whitespace
- while ( isspace(*pEnd) )
+ while ( isspace(*pEnd) )
pEnd++;
wxString strValue;
{
wxArrayString aParts;
- if ( strPath.IsEmpty() )
+ if ( strPath.IsEmpty() ) {
+ SetRootPath();
return;
+ }
if ( strPath[0] == APPCONF_PATH_SEPARATOR ) {
// absolute path
return FALSE;
}
+// ----------------------------------------------------------------------------
+// tests for existence
+// ----------------------------------------------------------------------------
+
+bool wxFileConfig::HasGroup(const wxString& strName) const
+{
+ PathChanger path(this, strName);
+
+ ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
+ return pGroup != NULL;
+}
+
+bool wxFileConfig::HasEntry(const wxString& strName) const
+{
+ PathChanger path(this, strName);
+
+ ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
+ return pEntry != NULL;
+}
+
// ----------------------------------------------------------------------------
// read/write values
// ----------------------------------------------------------------------------
else {
// adjust pointers
m_linesTail->SetNext(pLine);
+ pLine->SetPrev(m_linesTail);
}
m_linesTail = pLine;
}
// insert a new line after the given one or in the very beginning if !pLine
-wxFileConfig::LineList *wxFileConfig::LineListInsert(const wxString& str,
+wxFileConfig::LineList *wxFileConfig::LineListInsert(const wxString& str,
LineList *pLine)
{
if ( pLine == m_linesTail )
return LineListAppend(str);
- LineList *pNewLine;
-
+ LineList *pNewLine = new LineList(str);
if ( pLine == NULL ) {
- pNewLine = new LineList(str, m_linesHead);
+ // prepend to the list
+ pNewLine->SetNext(m_linesHead);
+ m_linesHead->SetPrev(pNewLine);
m_linesHead = pNewLine;
}
else {
- pNewLine = new LineList(str, pLine->Next());
+ // insert before pLine
+ LineList *pNext = pLine->Next();
+ pNewLine->SetNext(pNext);
+ pNewLine->SetPrev(pLine);
+ pNext->SetPrev(pNewLine);
pLine->SetNext(pNewLine);
}
return pNewLine;
}
+void wxFileConfig::LineListRemove(LineList *pLine)
+{
+ LineList *pPrev = pLine->Prev(),
+ *pNext = pLine->Next();
+ if ( pPrev == NULL ) {
+ // deleting the first entry
+ m_linesHead = pNext;
+ }
+ else {
+ // not the first entry
+ pPrev->SetNext(pNext);
+ }
+
+ pNext->SetPrev(pPrev);
+
+ delete pLine;
+}
+
bool wxFileConfig::LineListIsEmpty()
{
return m_linesHead == NULL;
if ( Parent() != NULL ) {
wxString strFullName;
strFullName << "[" << GetFullName().c_str() + 1 << "]"; // +1: no '/'
- m_pLine = m_pConfig->LineListInsert(strFullName,
+ m_pLine = m_pConfig->LineListInsert(strFullName,
Parent()->GetLastGroupLine());
Parent()->SetLastGroup(this);
}
if ( n == nCount )
return FALSE;
- delete m_aSubgroups[n];
+ nCount = m_aEntries.Count();
+ for ( n = 0; n < nCount; n++ ) {
+ LineList *pLine = m_aEntries[n]->GetLine();
+ if ( pLine != NULL )
+ m_pConfig->LineListRemove(pLine);
+ }
+
+ ConfigGroup *pGroup = m_aSubgroups[n];
+ LineList *pLine = pGroup->m_pLine;
+ if ( pLine != NULL )
+ m_pConfig->LineListRemove(pLine);
+ delete pGroup;
+
+ SetDirty();
+
m_aSubgroups.Remove(n);
return TRUE;
}
if ( n == nCount )
return FALSE;
- delete m_aEntries[n];
+ ConfigEntry *pEntry = m_aEntries[n];
+ LineList *pLine = pEntry->GetLine();
+ if ( pLine != NULL )
+ m_pConfig->LineListRemove(pLine);
+ delete pEntry;
+
+ SetDirty();
+
m_aEntries.Remove(n);
return TRUE;
}
// ----------------------------------------------------------------------------
-//
+//
// ----------------------------------------------------------------------------
void wxFileConfig::ConfigGroup::SetDirty()
{
// ----------------------------------------------------------------------------
// ctor
// ----------------------------------------------------------------------------
-wxFileConfig::ConfigEntry::ConfigEntry(wxFileConfig::ConfigGroup *pParent,
+wxFileConfig::ConfigEntry::ConfigEntry(wxFileConfig::ConfigGroup *pParent,
const wxString& strName,
int nLine)
: m_strName(strName)
void wxFileConfig::ConfigEntry::SetValue(const wxString& strValue, bool bUser)
{
if ( bUser && IsImmutable() ) {
- wxLogWarning("Attempt to change immutable key '%s' ignored.",
+ wxLogWarning("Attempt to change immutable key '%s' ignored.",
Name().c_str());
return;
}
// add a new line to the file
wxASSERT( m_nLine == NOT_FOUND ); // consistency check
- m_pLine = Group()->Config()->LineListInsert(strLine,
+ m_pLine = Group()->Config()->LineListInsert(strLine,
Group()->GetLastEntryLine());
Group()->SetLastEntry(this);
}
projects / wxWidgets.git / blobdiff