#include "wx/stdpaths.h"
-#if defined(__WXMSW__)
+#if defined(__WINDOWS__)
#include "wx/msw/private.h"
#endif //windows.h
#if defined(__WXPM__)
#include <stdlib.h>
#include <ctype.h>
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-#define CONST_CAST ((wxFileConfig *)this)->
-
// ----------------------------------------------------------------------------
// constants
// ----------------------------------------------------------------------------
#define MAX_PATH 512
#endif
-#define FILECONF_TRACE_MASK _T("fileconf")
+#define FILECONF_TRACE_MASK wxT("fileconf")
// ----------------------------------------------------------------------------
// global functions declarations
wxFileConfigLineList *m_pNext, // next node
*m_pPrev; // previous one
- DECLARE_NO_COPY_CLASS(wxFileConfigLineList)
+ wxDECLARE_NO_COPY_CLASS(wxFileConfigLineList);
};
// ----------------------------------------------------------------------------
wxString m_strName, // entry name
m_strValue; // value
- bool m_bImmutable:1, // can be overriden locally?
+ bool m_bImmutable:1, // can be overridden locally?
m_bHasValue:1; // set after first call to SetValue()
int m_nLine; // used if m_pLine == NULL only
void SetValue(const wxString& strValue, bool bUser = true);
void SetLine(wxFileConfigLineList *pLine);
- DECLARE_NO_COPY_CLASS(wxFileConfigEntry)
+ wxDECLARE_NO_COPY_CLASS(wxFileConfigEntry);
};
// ----------------------------------------------------------------------------
void SetLastGroup(wxFileConfigGroup *pGroup)
{ m_pLastGroup = pGroup; }
- DECLARE_NO_COPY_CLASS(wxFileConfigGroup)
+ wxDECLARE_NO_COPY_CLASS(wxFileConfigGroup);
};
// ============================================================================
}
#else // !wxUSE_UNICODE
// no need for conversion
- cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData());
+ cbuf = wxCharBuffer::CreateNonOwned((char *)buf.GetData(), buf.GetDataLen());
#endif // wxUSE_UNICODE/!wxUSE_UNICODE
-
- // now break it into lines
- wxMemoryText memText;
- for ( const wxChar *s = cbuf; ; ++s )
+ // parse the input contents if there is anything to parse
+ if ( cbuf )
{
- const wxChar *e = s;
- while ( *e != '\0' && *e != '\n' && *e != '\r' )
- ++e;
+ // now break it into lines
+ wxMemoryText memText;
+ for ( const wxChar *s = cbuf; ; ++s )
+ {
+ const wxChar *e = s;
+ while ( *e != '\0' && *e != '\n' && *e != '\r' )
+ ++e;
- // notice that we throw away the original EOL kind here, maybe we
- // should preserve it?
- if ( e != s )
- memText.AddLine(wxString(s, e));
+ // notice that we throw away the original EOL kind here, maybe we
+ // should preserve it?
+ if ( e != s )
+ memText.AddLine(wxString(s, e));
- if ( *e == '\0' )
- break;
+ if ( *e == '\0' )
+ break;
- // skip the second EOL byte if it's a DOS one
- if ( *e == '\r' && e[1] == '\n' )
- ++e;
+ // skip the second EOL byte if it's a DOS one
+ if ( *e == '\r' && e[1] == '\n' )
+ ++e;
- s = e;
- }
+ s = e;
+ }
- // Finally we can parse it all.
- Parse(memText, true /* local */);
+ // Finally we can parse it all.
+ Parse(memText, true /* local */);
+ }
SetRootPath();
ResetDirty();
// which is exactly what we want.
else if ( !bLocal || pEntry->IsLocal() ) {
wxLogWarning(_("file '%s', line %d: key '%s' was first found at line %d."),
- buffer.GetName(), n + 1, strKey.c_str(), pEntry->Line());
+ buffer.GetName(), (int)n + 1, strKey.c_str(), pEntry->Line());
}
}
DoSetPath(strPath, true /* create missing path components */);
}
+const wxString& wxFileConfig::GetPath() const
+{
+ return m_strPath;
+}
+
// ----------------------------------------------------------------------------
// enumeration
// ----------------------------------------------------------------------------
{
size_t n = m_pCurrentGroup->Entries().GetCount();
if ( bRecursive ) {
+ wxFileConfig * const self = const_cast<wxFileConfig *>(this);
+
wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
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);
- CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+ self->m_pCurrentGroup = pOldCurrentGroup;
}
}
{
size_t n = m_pCurrentGroup->Groups().GetCount();
if ( bRecursive ) {
+ wxFileConfig * const self = const_cast<wxFileConfig *>(this);
+
wxFileConfigGroup *pOldCurrentGroup = m_pCurrentGroup;
size_t nSubgroups = m_pCurrentGroup->Groups().GetCount();
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);
- CONST_CAST m_pCurrentGroup = pOldCurrentGroup;
+ self->m_pCurrentGroup = pOldCurrentGroup;
}
}
bool wxFileConfig::DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const
{
- wxCHECK_MSG( buf, false, _T("NULL buffer") );
+ wxCHECK_MSG( buf, false, wxT("NULL buffer") );
wxString str;
if ( !Read(key, &str) )
wxString strName = path.Name();
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Writing String '%s' = '%s' to Group '%s'"),
+ wxT(" Writing String '%s' = '%s' to Group '%s'"),
strName.c_str(),
szValue.c_str(),
GetPath().c_str() );
// ... except if it's empty in which case it's a way to force it's creation
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Creating group %s"),
+ wxT(" Creating group %s"),
m_pCurrentGroup->Name().c_str() );
SetDirty();
if ( pEntry == 0 )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Adding Entry %s"),
+ wxT(" Adding Entry %s"),
strName.c_str() );
pEntry = m_pCurrentGroup->AddEntry(strName);
}
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Setting value %s"),
+ wxT(" Setting value %s"),
szValue.c_str() );
pEntry->SetValue(szValue);
bool wxFileConfig::DoWriteLong(const wxString& key, long lValue)
{
- return Write(key, wxString::Format(_T("%ld"), lValue));
+ return Write(key, wxString::Format(wxT("%ld"), lValue));
}
#if wxUSE_BASE64
const wxString& newName)
{
wxASSERT_MSG( oldName.find(wxCONFIG_PATH_SEPARATOR) == wxString::npos,
- _T("RenameEntry(): paths are not supported") );
+ wxT("RenameEntry(): paths are not supported") );
// check that the entry exists
wxFileConfigEntry *oldEntry = m_pCurrentGroup->FindEntry(oldName);
wxFileConfigLineList *wxFileConfig::LineListAppend(const wxString& str)
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" ** Adding Line '%s'"),
+ wxT(" ** Adding Line '%s'"),
str.c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
m_linesTail = pLine;
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
wxFileConfigLineList *pLine)
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" ** Inserting Line '%s' after '%s'"),
+ wxT(" ** Inserting Line '%s' after '%s'"),
str.c_str(),
((pLine) ? (const wxChar*)pLine->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
}
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
void wxFileConfig::LineListRemove(wxFileConfigLineList *pLine)
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" ** Removing Line '%s'"),
+ wxT(" ** Removing Line '%s'"),
pLine->Text().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
pNext->SetPrev(pPrev);
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" head: %s"),
+ wxT(" head: %s"),
((m_linesHead) ? (const wxChar*)m_linesHead->Text().c_str()
: wxEmptyString) );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" tail: %s"),
+ wxT(" tail: %s"),
((m_linesTail) ? (const wxChar*)m_linesTail->Text().c_str()
: wxEmptyString) );
// for a normal (i.e. not root) group this method shouldn't be called twice
// unless we are resetting the line
wxASSERT_MSG( !m_pParent || !m_pLine || !pLine,
- _T("changing line for a non-root group?") );
+ wxT("changing line for a non-root group?") );
m_pLine = pLine;
}
wxFileConfigLineList *wxFileConfigGroup::GetGroupLine()
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" GetGroupLine() for Group '%s'"),
+ wxT(" GetGroupLine() for Group '%s'"),
Name().c_str() );
if ( !m_pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Getting Line item pointer") );
+ wxT(" Getting Line item pointer") );
wxFileConfigGroup *pParent = Parent();
if ( pParent )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" checking parent '%s'"),
+ wxT(" checking parent '%s'"),
pParent->Name().c_str() );
wxString strFullName;
{
wxFileConfigLineList *pLine = m_pLastGroup->GetLastGroupLine();
- wxASSERT_MSG( pLine, _T("last group must have !NULL associated line") );
+ wxASSERT_MSG( pLine, wxT("last group must have !NULL associated line") );
return pLine;
}
wxFileConfigLineList *wxFileConfigGroup::GetLastEntryLine()
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" GetLastEntryLine() for Group '%s'"),
+ wxT(" GetLastEntryLine() for Group '%s'"),
Name().c_str() );
if ( m_pLastEntry )
{
wxFileConfigLineList *pLine = m_pLastEntry->GetLine();
- wxASSERT_MSG( pLine, _T("last entry must have !NULL associated line") );
+ wxASSERT_MSG( pLine, wxT("last entry must have !NULL associated line") );
return 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") );
+ wxASSERT_MSG( !m_pParent, wxT("unexpected for non root group") );
// let the group know that it does have a line in the file now
m_pLine = pEntry->GetLine();
{
// update the line of this group
wxFileConfigLineList *line = GetGroupLine();
- wxCHECK_RET( line, _T("a non root group must have a corresponding line!") );
+ wxCHECK_RET( line, wxT("a non root group must have a corresponding line!") );
// +1: skip the leading '/'
- line->SetText(wxString::Format(_T("[%s]"), GetFullName().c_str() + 1));
+ line->SetText(wxString::Format(wxT("[%s]"), GetFullName().c_str() + 1));
// also update all subgroups as they have this groups name in their lines
void wxFileConfigGroup::Rename(const wxString& newName)
{
- wxCHECK_RET( m_pParent, _T("the root group can't be renamed") );
+ wxCHECK_RET( m_pParent, wxT("the root group can't be renamed") );
if ( newName == m_strName )
return;
// other data structures.
bool wxFileConfigGroup::DeleteSubgroup(wxFileConfigGroup *pGroup)
{
- wxCHECK_MSG( pGroup, false, _T("deleting non existing group?") );
+ wxCHECK_MSG( pGroup, false, wxT("deleting non existing group?") );
wxLogTrace( FILECONF_TRACE_MASK,
- _T("Deleting group '%s' from '%s'"),
+ wxT("Deleting group '%s' from '%s'"),
pGroup->Name().c_str(),
Name().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" (m_pLine) = prev: %p, this %p, next %p"),
+ wxT(" (m_pLine) = prev: %p, this %p, next %p"),
m_pLine ? static_cast<void*>(m_pLine->Prev()) : 0,
static_cast<void*>(m_pLine),
m_pLine ? static_cast<void*>(m_pLine->Next()) : 0 );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" text: '%s'"),
+ wxT(" text: '%s'"),
m_pLine ? (const wxChar*)m_pLine->Text().c_str()
: wxEmptyString );
size_t nCount = pGroup->m_aEntries.GetCount();
wxLogTrace(FILECONF_TRACE_MASK,
- _T("Removing %lu entries"), (unsigned long)nCount );
+ wxT("Removing %lu entries"), (unsigned long)nCount );
for ( size_t nEntry = 0; nEntry < nCount; nEntry++ )
{
if ( pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" '%s'"),
+ wxT(" '%s'"),
pLine->Text().c_str() );
m_pConfig->LineListRemove(pLine);
}
nCount = pGroup->m_aSubgroups.GetCount();
wxLogTrace( FILECONF_TRACE_MASK,
- _T("Removing %lu subgroups"), (unsigned long)nCount );
+ wxT("Removing %lu subgroups"), (unsigned long)nCount );
for ( size_t nGroup = 0; nGroup < nCount; nGroup++ )
{
if ( pLine )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Removing line for group '%s' : '%s'"),
+ wxT(" Removing line for group '%s' : '%s'"),
pGroup->Name().c_str(),
pLine->Text().c_str() );
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Removing from group '%s' : '%s'"),
+ wxT(" Removing from group '%s' : '%s'"),
Name().c_str(),
((m_pLine) ? (const wxChar*)m_pLine->Text().c_str()
: wxEmptyString) );
if ( pGroup == m_pLastGroup )
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" Removing last group") );
+ wxT(" 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
else
{
wxLogTrace( FILECONF_TRACE_MASK,
- _T(" No line entry for Group '%s'?"),
+ wxT(" No line entry for Group '%s'?"),
pGroup->Name().c_str() );
}
// pNewLast can be NULL here -- it's ok and can happen if we have no
// entries left
m_pLastEntry = pNewLast;
+
+ // For the root group only, we could be removing the first group line
+ // here, so update m_pLine to avoid keeping a dangling pointer.
+ if ( pLine == m_pLine )
+ SetLine(NULL);
}
m_pConfig->LineListRemove(pLine);
for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
if ( *pc == wxT('\\') ) {
// we need to test it here or we'd skip past the NUL in the loop line
- if ( *++pc == _T('\0') )
+ if ( *++pc == wxT('\0') )
break;
}
#if !wxUSE_UNICODE
((unsigned char)c < 127) &&
#endif // ANSI
- !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) )
+ !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%()"), c) )
{
strResult += wxT('\\');
}
projects / wxWidgets.git / blobdiff