Fixed a few compile things

[wxWidgets.git] / src / common / fileconf.cpp

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index a4df6e1d65f49298cfe9b8f6c9f282b1db200f91..bdf11498cbdea65efe98ff03edf95e4df6959461 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -32,6 +32,7 @@
   #include  <wx/intl.h>
 #endif  //WX_PRECOMP
 
   #include  <wx/intl.h>
 #endif  //WX_PRECOMP
 

+#include  <wx/app.h>

 #include  <wx/dynarray.h>
 #include  <wx/file.h>
 #include  <wx/log.h>
 #include  <wx/dynarray.h>
 #include  <wx/file.h>
 #include  <wx/log.h>


@@ -85,6 +86,9 @@ wxString wxFileConfig::GetGlobalDir()
 
   #ifdef __UNIX__
     strDir = "/etc/";
 
   #ifdef __UNIX__
     strDir = "/etc/";

+  #elif defined(__WXSTUBS__)
+    // TODO
+    wxASSERT( TRUE ) ;

   #else // Windows
     #ifndef _MAX_PATH
       #define _MAX_PATH 512
   #else // Windows
     #ifndef _MAX_PATH
       #define _MAX_PATH 512


@@ -204,6 +208,7 @@ void wxFileConfig::Init()
   }
 }
 
   }
 }
 

+#if 0

 wxFileConfig::wxFileConfig(const char *szAppName, bool bLocalOnly)
 {
   wxASSERT( !IsEmpty(szAppName) ); // invent a name for your application!
 wxFileConfig::wxFileConfig(const char *szAppName, bool bLocalOnly)
 {
   wxASSERT( !IsEmpty(szAppName) ); // invent a name for your application!


@@ -220,14 +225,66 @@ wxFileConfig::wxFileConfig(const wxString& strLocal, const wxString& strGlobal)
             : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
 {
   // if the path is not absolute, prepend the standard directory to it
             : m_strLocalFile(strLocal), m_strGlobalFile(strGlobal)
 {
   // if the path is not absolute, prepend the standard directory to it

+  if ( !strLocal.IsEmpty() && !wxIsAbsolutePath(strLocal) )
+  {
+     m_strLocalFile = GetLocalDir();
+     m_strLocalFile << strLocal;
+  }
+  
+  if ( !strGlobal.IsEmpty() && !wxIsAbsolutePath(strGlobal) )
+  {
+     m_strGlobalFile = GetGlobalDir();
+     m_strGlobalFile << strGlobal;
+  }
+
+  Init();
+}
+#endif
+
+// New-style constructor
+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) && wxTheApp)
+    {
+        m_strLocalFile = wxTheApp->GetAppName();
+    }
+
+    if (m_strGlobalFile.IsEmpty() && (style & wxCONFIG_USE_GLOBAL_FILE))
+    {
+        // TODO: What should the default global filename be?
+        m_strGlobalFile = "global";
+    }
+
+    // Check if styles are not supplied, but filenames are, in which case
+    // add the correct styles.
+    if (!m_strLocalFile.IsEmpty() && ((style & wxCONFIG_USE_LOCAL_FILE) != wxCONFIG_USE_LOCAL_FILE))
+        SetStyle(GetStyle() | wxCONFIG_USE_LOCAL_FILE);

 
 

-  if ( !strLocal.IsEmpty() && !wxIsPathSeparator(strLocal[0u]) )
-    m_strLocalFile = GetLocalDir();
-  m_strLocalFile << strLocal;
+    if (!m_strGlobalFile.IsEmpty() && ((style & wxCONFIG_USE_GLOBAL_FILE) != wxCONFIG_USE_GLOBAL_FILE))
+        SetStyle(GetStyle() | wxCONFIG_USE_GLOBAL_FILE);

 
 

-  if ( !strGlobal.IsEmpty() && !wxIsPathSeparator(strGlobal[0u]) )
-    m_strGlobalFile = GetGlobalDir();
-  m_strGlobalFile << strGlobal;
+  // if the path is not absolute, prepend the standard directory to it
+  if ( !strLocal.IsEmpty() && !wxIsAbsolutePath(strLocal) )
+  {
+     m_strLocalFile = GetLocalDir();
+     m_strLocalFile << strLocal;
+  }
+  
+  if ( !strGlobal.IsEmpty() && !wxIsAbsolutePath(strGlobal) )
+  {
+     m_strGlobalFile = GetGlobalDir();
+     m_strGlobalFile << strGlobal;
+  }

 
   Init();
 }
 
   Init();
 }


@@ -261,8 +318,8 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
   const char *pEnd;
   wxString strLine;
 
   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
     strLine = file[n];
 
     // add the line to linked list


@@ -413,7 +470,7 @@ void wxFileConfig::SetPath(const wxString& strPath)
   }
 
   // change current group
   }
 
   // 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]);
   m_pCurrentGroup = m_pRootGroup;
   for ( n = 0; n < aParts.Count(); n++ ) {
     ConfigGroup *pNextGroup = m_pCurrentGroup->FindSubgroup(aParts[n]);


@@ -441,7 +498,7 @@ bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
 
 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;
   }
     str = m_pCurrentGroup->Groups()[lIndex++]->Name();
     return TRUE;
   }


@@ -457,7 +514,7 @@ bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
 
 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;
   }
     str = m_pCurrentGroup->Entries()[lIndex++]->Name();
     return TRUE;
   }


@@ -465,13 +522,13 @@ bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
     return FALSE;
 }
 
     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;
   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;
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
       n += GetNumberOfEntries(TRUE);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;


@@ -481,13 +538,13 @@ uint wxFileConfig::GetNumberOfEntries(bool bRecursive) const
   return n;
 }
 
   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;
   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;
       CONST_CAST m_pCurrentGroup = m_pCurrentGroup->Groups()[nGroup];
       n += GetNumberOfGroups(TRUE);
       CONST_CAST m_pCurrentGroup = pOldCurrentGroup;


@@ -503,7 +560,7 @@ uint wxFileConfig::GetNumberOfGroups(bool bRecursive) const
 
 bool wxFileConfig::HasGroup(const wxString& strName) 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;
 
   ConfigGroup *pGroup = m_pCurrentGroup->FindSubgroup(path.Name());
   return pGroup != NULL;


@@ -511,7 +568,7 @@ bool wxFileConfig::HasGroup(const wxString& strName) const
 
 bool wxFileConfig::HasEntry(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;
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   return pEntry != NULL;


@@ -521,53 +578,59 @@ bool wxFileConfig::HasEntry(const wxString& strName) const
 // read/write values
 // ----------------------------------------------------------------------------
 
 // 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) {
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   if (pEntry == NULL) {

-    *pstr = ExpandEnvVars(szDefault);

     return FALSE;
   }
   else {
     return FALSE;
   }
   else {

-    *pstr = ExpandEnvVars(pEntry->Value());
+    *pStr = ExpandEnvVars(pEntry->Value());

     return TRUE;
   }
 }
 
     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;
 {
   wxString str;

-  if ( Read(&str, szKey) ) {
+  if ( Read(key, & str) ) {

     *pl = atol(str);
     return TRUE;
   }
   else {
     *pl = atol(str);
     return TRUE;
   }
   else {

-    *pl = lDefault;

     return FALSE;
   }
 }
 
     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
 
   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();
 
     // ... except if it's empty in which case it's a way to force it's creation
     m_pCurrentGroup->SetDirty();


@@ -603,12 +666,12 @@ bool wxFileConfig::Write(const char *szKey, const char *szValue)
   return TRUE;
 }
 
   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);
 {
   // ltoa() is not ANSI :-(
   char szBuf[40];   // should be good for sizeof(long) <= 16 (128 bits)
   sprintf(szBuf, "%ld", lValue);

-  return Write(szKey, szBuf);
+  return Write(key, szBuf);

 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)


@@ -638,9 +701,9 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 // delete groups/entries
 // ----------------------------------------------------------------------------
 
 // 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;
 
   if ( !m_pCurrentGroup->DeleteEntry(path.Name()) )
     return FALSE;


@@ -657,9 +720,9 @@ bool wxFileConfig::DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso)
   return TRUE;
 }
 
   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->DeleteSubgroupByName(path.Name());
 }
 
   return m_pCurrentGroup->DeleteSubgroupByName(path.Name());
 }


@@ -782,7 +845,7 @@ wxFileConfig::ConfigGroup::ConfigGroup(wxFileConfig::ConfigGroup *pParent,
 wxFileConfig::ConfigGroup::~ConfigGroup()
 {
   // entries
 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];
 
   for ( n = 0; n < nCount; n++ )
     delete m_aEntries[n];
 


@@ -913,7 +976,7 @@ wxString wxFileConfig::ConfigGroup::GetFullName() const
 wxFileConfig::ConfigEntry *
 wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 {
 wxFileConfig::ConfigEntry *
 wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 {

-  uint i,
+  size_t i,

        lo = 0,
        hi = m_aEntries.Count();
   int res;
        lo = 0,
        hi = m_aEntries.Count();
   int res;


@@ -943,7 +1006,7 @@ wxFileConfig::ConfigGroup::FindEntry(const char *szName) const
 wxFileConfig::ConfigGroup *
 wxFileConfig::ConfigGroup::FindSubgroup(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;
        lo = 0,
        hi = m_aSubgroups.Count();
   int res;


@@ -1022,8 +1085,8 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
   wxCHECK( pGroup != NULL, FALSE ); // deleting non existing group?
 
   // delete all entries
   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);
     LineList *pLine = pGroup->m_aEntries[nEntry]->GetLine();
     if ( pLine != NULL )
       m_pConfig->LineListRemove(pLine);


@@ -1031,7 +1094,7 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
 
   // and subgroups of this sungroup
   nCount = pGroup->m_aSubgroups.Count();
 
   // and subgroups of this sungroup
   nCount = pGroup->m_aSubgroups.Count();

-  for ( uint nGroup = 0; nGroup < nCount; nGroup++ ) {
+  for ( size_t nGroup = 0; nGroup < nCount; nGroup++ ) {

     pGroup->DeleteSubgroup(pGroup->m_aSubgroups[nGroup]);
   }
 
     pGroup->DeleteSubgroup(pGroup->m_aSubgroups[nGroup]);
   }
 


@@ -1045,7 +1108,7 @@ bool wxFileConfig::ConfigGroup::DeleteSubgroup(ConfigGroup *pGroup)
 
       // go back until we find a subgroup or reach the group's line
       ConfigGroup *pNewLast = NULL;
 
       // 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?
       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?


@@ -1096,7 +1159,7 @@ bool wxFileConfig::ConfigGroup::DeleteEntry(const char *szName)
 
       // go back until we find another entry or reach the group's line
       ConfigEntry *pNewLast = NULL;
 
       // 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?
       LineList *pl;
       for ( pl = pLine->Prev(); pl != m_pLine; pl = pl->Prev() ) {
         // is it our subgroup?


@@ -1265,7 +1328,7 @@ wxString FilterIn(const wxString& str)
 
   bool bQuoted = !str.IsEmpty() && str[0] == '"';
 
 
   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':
     if ( str[n] == '\\' ) {
       switch ( str[++n] ) {
         case 'n':


@@ -1306,6 +1369,9 @@ wxString FilterIn(const wxString& str)
 // quote the string before writing it to file
 wxString FilterOut(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());
 
   wxString strResult;
   strResult.Alloc(str.Len());
 


@@ -1316,7 +1382,7 @@ wxString FilterOut(const wxString& str)
     strResult += '"';
 
   char c;
     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';
     switch ( str[n] ) {
       case '\n':
         c = 'n';