removed compiler warnings about assignments in logical expressions

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index 1ae6beaa4d842a11d0983a8769be556251dc7e4e..a4cefd642a0ab7823f120543afbbbda280fdeace 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -49,14 +49,17 @@
 #if defined(__WXPM__)
   #define INCL_DOS
   #include <os2.h>
 #if defined(__WXPM__)
   #define INCL_DOS
   #include <os2.h>

-  #define LINKAGEMODE _Optlink
-#else
-  #define LINKAGEMODE

 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 
 #endif
 
 #include  <stdlib.h>
 #include  <ctype.h>
 

+// headers needed for umask()
+#ifdef __UNIX__
+    #include <sys/types.h>
+    #include <sys/stat.h>
+#endif // __UNIX__
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -98,8 +101,10 @@ wxString wxFileConfig::GetGlobalDir()
 {
   wxString strDir;
 
 {
   wxString strDir;
 

-  #ifdef __UNIX__
-    strDir = T("/etc/");
+  #ifdef __VMS__ // Note if __VMS is defined __UNIX is also defined
+    strDir = wxT("sys$manager:");
+  #elif defined( __UNIX__ )
+    strDir = wxT("/etc/");

   #elif defined(__WXPM__)
     ULONG                           aulSysInfo[QSV_MAX] = {0};
     UINT                            drive;
   #elif defined(__WXPM__)
     ULONG                           aulSysInfo[QSV_MAX] = {0};
     UINT                            drive;


@@ -192,15 +197,15 @@ wxString wxFileConfig::GetGlobalDir()
         }
     }
   #elif defined(__WXSTUBS__)
         }
     }
   #elif defined(__WXSTUBS__)

-    wxASSERT_MSG( FALSE, T("TODO") ) ;
+    wxASSERT_MSG( FALSE, wxT("TODO") ) ;

   #elif defined(__WXMAC__)
   #elif defined(__WXMAC__)

-    wxASSERT_MSG( FALSE, T("TODO") ) ;
+       strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;

   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);
 
     strDir = szWinDir;
   #else // Windows
     wxChar szWinDir[MAX_PATH];
     ::GetWindowsDirectory(szWinDir, MAX_PATH);
 
     strDir = szWinDir;

-    strDir << T('\\');
+    strDir << wxT('\\');

   #endif // Unix/Windows
 
   return strDir;
   #endif // Unix/Windows
 
   return strDir;


@@ -210,12 +215,20 @@ wxString wxFileConfig::GetLocalDir()
 {
   wxString strDir;
 
 {
   wxString strDir;
 

+#ifndef __WXMAC__

   wxGetHomeDir(&strDir);
 
 #ifdef  __UNIX__
   wxGetHomeDir(&strDir);
 
 #ifdef  __UNIX__

-  if (strDir.Last() != T('/')) strDir << T('/');
+#ifdef __VMS
+   if (strDir.Last() != wxT(']'))
+#endif
+   if (strDir.Last() != wxT('/')) strDir << wxT('/');

 #else
 #else

-  if (strDir.Last() != T('\\')) strDir << T('\\');
+  if (strDir.Last() != wxT('\\')) strDir << wxT('\\');
+#endif
+#else
+       // no local dir concept on mac
+       return GetGlobalDir() ;

 #endif
 
   return strDir;
 #endif
 
   return strDir;


@@ -226,11 +239,13 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
   wxString str = GetGlobalDir();
   str << szFile;
 
   wxString str = GetGlobalDir();
   str << szFile;
 

-  if ( wxStrchr(szFile, T('.')) == NULL )
+  if ( wxStrchr(szFile, wxT('.')) == NULL )

   #ifdef  __UNIX__
   #ifdef  __UNIX__

-    str << T(".conf");
+    str << wxT(".conf");
+  #elif defined( __WXMAC__ )
+     str << " Preferences";

   #else   // Windows
   #else   // Windows

-    str << T(".ini");
+    str << wxT(".ini");

   #endif  // UNIX/Win
 
   return str;
   #endif  // UNIX/Win
 
   return str;


@@ -238,19 +253,29 @@ wxString wxFileConfig::GetGlobalFileName(const wxChar *szFile)
 
 wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 {
 
 wxString wxFileConfig::GetLocalFileName(const wxChar *szFile)
 {

-  wxString str = GetLocalDir();
-
-  #ifdef  __UNIX__
-    str << T('.');
+#ifdef __VMS__ // On VMS I saw the problem that the home directory was appended
+   // twice for the configuration file. Does that also happen for other
+   // platforms?
+   wxString str = wxT( '.' ); 
+#else
+   wxString str = GetLocalDir();
+#endif
+   
+  #if defined( __UNIX__ ) && !defined( __VMS )
+    str << wxT('.');

   #endif
 
   str << szFile;
 
   #ifdef __WXMSW__
   #endif
 
   str << szFile;
 
   #ifdef __WXMSW__

-    if ( wxStrchr(szFile, T('.')) == NULL )
-      str << T(".ini");
+    if ( wxStrchr(szFile, wxT('.')) == NULL )
+      str << wxT(".ini");

   #endif
 
   #endif
 

+
+  #ifdef __WXMAC__
+     str << " Preferences";
+  #endif

   return str;
 }
 
   return str;
 }
 


@@ -324,22 +349,25 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
 
   // if the path is not absolute, prepend the standard directory to it
   // UNLESS wxCONFIG_USE_RELATIVE_PATH style is set
 
   // 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) )
-         {
-                 wxString strLocal = m_strLocalFile;
-                 m_strLocalFile = GetLocalDir();
-                 m_strLocalFile << strLocal;
-         }
-
-         if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
-         {
-                 wxString strGlobal = m_strGlobalFile;
-                 m_strGlobalFile = GetGlobalDir();
-                 m_strGlobalFile << strGlobal;
-         }
+  if ( !(style & wxCONFIG_USE_RELATIVE_PATH) )
+  {
+      if ( !m_strLocalFile.IsEmpty() && !wxIsAbsolutePath(m_strLocalFile) )
+      {
+          wxString strLocal = m_strLocalFile;
+          m_strLocalFile = GetLocalDir();
+          m_strLocalFile << strLocal;
+      }
+
+      if ( !m_strGlobalFile.IsEmpty() && !wxIsAbsolutePath(m_strGlobalFile) )
+      {
+          wxString strGlobal = m_strGlobalFile;
+          m_strGlobalFile = GetGlobalDir();
+          m_strGlobalFile << strGlobal;
+      }

   }
 
   }
 

+  SetUmask(-1);
+

   Init();
 }
 
   Init();
 }
 


@@ -385,18 +413,25 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
       ;
 
     // skip blank/comment lines
       ;
 
     // skip blank/comment lines

-    if ( *pStart == T('\0')|| *pStart == T(';') || *pStart == T('#') )
+    if ( *pStart == wxT('\0')|| *pStart == wxT(';') || *pStart == wxT('#') )

       continue;
 
       continue;
 

-    if ( *pStart == T('[') ) {          // a new group
+    if ( *pStart == wxT('[') ) {          // a new group

       pEnd = pStart;
 
       pEnd = pStart;
 

-      while ( *++pEnd != T(']') ) {
-        if ( *pEnd == T('\n') || *pEnd == T('\0') )
+      while ( *++pEnd != wxT(']') ) {
+        if ( *pEnd == wxT('\\') ) {
+            // the next char is escaped, so skip it even if it is ']'
+            pEnd++;
+        }
+
+        if ( *pEnd == wxT('\n') || *pEnd == wxT('\0') ) {
+            // we reached the end of line, break out of the loop

             break;
             break;

+        }

       }
 
       }
 

-      if ( *pEnd != T(']') ) {
+      if ( *pEnd != wxT(']') ) {

         wxLogError(_("file '%s': unexpected character %c at line %d."),
                    file.GetName(), *pEnd, n + 1);
         continue; // skip this line
         wxLogError(_("file '%s': unexpected character %c at line %d."),
                    file.GetName(), *pEnd, n + 1);
         continue; // skip this line


@@ -416,21 +451,20 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
 
       // check that there is nothing except comments left on this line
       bool bCont = TRUE;
 
       // check that there is nothing except comments left on this line
       bool bCont = TRUE;

-      while ( *++pEnd != T('\0') && bCont ) {
+      while ( *++pEnd != wxT('\0') && bCont ) {

         switch ( *pEnd ) {
         switch ( *pEnd ) {

-          case T('#'):
-          case T(';'):
+          case wxT('#'):
+          case wxT(';'):

             bCont = FALSE;
             break;
 
             bCont = FALSE;
             break;
 

-          case T(' '):
-          case T('\t'):
+          case wxT(' '):
+          case wxT('\t'):

             // ignore whitespace ('\n' impossible here)
             break;
 
           default:
             // ignore whitespace ('\n' impossible here)
             break;
 
           default:

-            wxLogWarning(_("file '%s', line %d: '%s' "
-                           "ignored after group header."),
+            wxLogWarning(_("file '%s', line %d: '%s' ignored after group header."),

                          file.GetName(), n + 1, pEnd);
             bCont = FALSE;
         }
                          file.GetName(), n + 1, pEnd);
             bCont = FALSE;
         }


@@ -438,11 +472,15 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
     }
     else {                        // a key
       const wxChar *pEnd = pStart;
     }
     else {                        // a key
       const wxChar *pEnd = pStart;

-      while ( *pEnd != T('=') && !wxIsspace(*pEnd) ) {
-        if ( *pEnd == T('\\') ) {
+      while ( *pEnd && *pEnd != wxT('=') && !wxIsspace(*pEnd) ) {
+        if ( *pEnd == wxT('\\') ) {

           // next character may be space or not - still take it because it's
           // next character may be space or not - still take it because it's

-          // quoted
+          // quoted (unless there is nothing)

           pEnd++;
           pEnd++;

+          if ( !*pEnd ) {
+            // the error message will be given below anyhow
+            break;
+          }

         }
 
         pEnd++;
         }
 
         pEnd++;


@@ -451,10 +489,10 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
       wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
 
       // skip whitespace
       wxString strKey(FilterInEntryName(wxString(pStart, pEnd)));
 
       // skip whitespace

-      while ( isspace(*pEnd) )
+      while ( wxIsspace(*pEnd) )

         pEnd++;
 
         pEnd++;
 

-      if ( *pEnd++ != T('=') ) {
+      if ( *pEnd++ != wxT('=') ) {

         wxLogError(_("file '%s', line %d: '=' expected."),
                    file.GetName(), n + 1);
       }
         wxLogError(_("file '%s', line %d: '=' expected."),
                    file.GetName(), n + 1);
       }


@@ -471,8 +509,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
         else {
           if ( bLocal && pEntry->IsImmutable() ) {
             // immutable keys can't be changed by user
         else {
           if ( bLocal && pEntry->IsImmutable() ) {
             // immutable keys can't be changed by user

-            wxLogWarning(_("file '%s', line %d: value for "
-                           "immutable key '%s' ignored."),
+            wxLogWarning(_("file '%s', line %d: value for immutable key '%s' ignored."),

                          file.GetName(), n + 1, strKey.c_str());
             continue;
           }
                          file.GetName(), n + 1, strKey.c_str());
             continue;
           }


@@ -482,8 +519,7 @@ void wxFileConfig::Parse(wxTextFile& file, bool bLocal)
           //  (c) key from global file now found in local one
           // which is exactly what we want.
           else if ( !bLocal || pEntry->IsLocal() ) {
           //  (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 )
                          file.GetName(), n + 1, strKey.c_str(), pEntry->Line());
 
             if ( bLocal )


@@ -561,7 +597,7 @@ bool wxFileConfig::GetFirstGroup(wxString& str, long& lIndex) const
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {
 bool wxFileConfig::GetNextGroup (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Groups().Count() ) {

-    str = m_pCurrentGroup->Groups()[lIndex++]->Name();
+    str = m_pCurrentGroup->Groups()[(size_t)lIndex++]->Name();

     return TRUE;
   }
   else
     return TRUE;
   }
   else


@@ -577,7 +613,7 @@ bool wxFileConfig::GetFirstEntry(wxString& str, long& lIndex) const
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {
 bool wxFileConfig::GetNextEntry (wxString& str, long& lIndex) const
 {
   if ( size_t(lIndex) < m_pCurrentGroup->Entries().Count() ) {

-    str = m_pCurrentGroup->Entries()[lIndex++]->Name();
+    str = m_pCurrentGroup->Entries()[(size_t)lIndex++]->Name();

     return TRUE;
   }
   else
     return TRUE;
   }
   else


@@ -649,10 +685,9 @@ bool wxFileConfig::Read(const wxString& key,
   if (pEntry == NULL) {
     return FALSE;
   }
   if (pEntry == NULL) {
     return FALSE;
   }

-  else {
-    *pStr = ExpandEnvVars(pEntry->Value());
-    return TRUE;
-  }
+
+  *pStr = ExpandEnvVars(pEntry->Value());
+  return TRUE;

 }
 
 bool wxFileConfig::Read(const wxString& key,
 }
 
 bool wxFileConfig::Read(const wxString& key,


@@ -661,28 +696,31 @@ bool wxFileConfig::Read(const wxString& key,
   wxConfigPathChanger path(this, key);
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());
   wxConfigPathChanger path(this, key);
 
   ConfigEntry *pEntry = m_pCurrentGroup->FindEntry(path.Name());

+  bool ok;

   if (pEntry == NULL) {
     if( IsRecordingDefaults() )
       ((wxFileConfig *)this)->Write(key,defVal);
     *pStr = ExpandEnvVars(defVal);
   if (pEntry == NULL) {
     if( IsRecordingDefaults() )
       ((wxFileConfig *)this)->Write(key,defVal);
     *pStr = ExpandEnvVars(defVal);

-    return FALSE;
+    ok = FALSE;

   }
   else {
     *pStr = ExpandEnvVars(pEntry->Value());
   }
   else {
     *pStr = ExpandEnvVars(pEntry->Value());

-    return TRUE;
+    ok = TRUE;

   }
   }

+
+  return ok;

 }
 
 bool wxFileConfig::Read(const wxString& key, long *pl) const
 {
   wxString str;
 }
 
 bool wxFileConfig::Read(const wxString& key, long *pl) const
 {
   wxString str;

-  if ( Read(key, & str) ) {
-    *pl = wxAtol(str);
-    return TRUE;
-  }
-  else {
+  if ( !Read(key, & str) )
+  {

     return FALSE;
   }
     return FALSE;
   }

+
+  *pl = wxAtol(str);
+  return TRUE;

 }
 
 bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
 }
 
 bool wxFileConfig::Write(const wxString& key, const wxString& szValue)


@@ -692,7 +730,7 @@ bool wxFileConfig::Write(const wxString& key, const wxString& szValue)
   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( wxIsEmpty(szValue), T("can't set value of a group!") );
+    wxASSERT_MSG( wxIsEmpty(szValue), 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
     m_pCurrentGroup->SetDirty();
 
     // ... except if it's empty in which case it's a way to force it's creation
     m_pCurrentGroup->SetDirty();


@@ -724,15 +762,24 @@ bool wxFileConfig::Write(const wxString& key, long lValue)
 {
   // ltoa() is not ANSI :-(
   wxString buf;
 {
   // ltoa() is not ANSI :-(
   wxString buf;

-  buf.Printf(T("%ld"), lValue);
+  buf.Printf(wxT("%ld"), lValue);

   return Write(key, buf);
 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {
   return Write(key, buf);
 }
 
 bool wxFileConfig::Flush(bool /* bCurrentOnly */)
 {

-  if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() )
+  if ( LineListIsEmpty() || !m_pRootGroup->IsDirty() || !m_strLocalFile )

     return TRUE;
 
     return TRUE;
 

+#ifdef __UNIX__
+  // set the umask if needed
+  mode_t umaskOld = 0;
+  if ( m_umask != -1 )
+  {
+      umaskOld = umask((mode_t)m_umask);
+  }
+#endif // __UNIX__
+

   wxTempFile file(m_strLocalFile);
 
   if ( !file.IsOpened() ) {
   wxTempFile file(m_strLocalFile);
 
   if ( !file.IsOpened() ) {


@@ -748,7 +795,33 @@ bool wxFileConfig::Flush(bool /* bCurrentOnly */)
     }
   }
 
     }
   }
 

-  return file.Commit();
+  bool ret = file.Commit();
+
+#if defined(__WXMAC__) && !defined(__UNIX__)
+  if ( ret )
+  {
+       FSSpec spec ;
+       
+       wxMacFilename2FSSpec( m_strLocalFile , &spec ) ;
+       FInfo finfo ;
+       if ( FSpGetFInfo( &spec , &finfo ) == noErr )
+       {
+               finfo.fdType = 'TEXT' ;
+               finfo.fdCreator = 'ttxt' ;
+               FSpSetFInfo( &spec , &finfo ) ;
+       }
+  }
+#endif // __WXMAC__ && !__UNIX__
+
+#ifdef __UNIX__
+  // restore the old umask if we changed it
+  if ( m_umask != -1 )
+  {
+      (void)umask(umaskOld);
+  }
+#endif // __UNIX__
+
+  return ret;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -809,7 +882,7 @@ bool wxFileConfig::DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso)
   if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
     if ( m_pCurrentGroup != m_pRootGroup ) {
       ConfigGroup *pGroup = m_pCurrentGroup;
   if ( bGroupIfEmptyAlso && m_pCurrentGroup->IsEmpty() ) {
     if ( m_pCurrentGroup != m_pRootGroup ) {
       ConfigGroup *pGroup = m_pCurrentGroup;

-      SetPath(T(".."));  // changes m_pCurrentGroup!
+      SetPath(wxT(".."));  // changes m_pCurrentGroup!

       m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
     }
     //else: never delete the root group
       m_pCurrentGroup->DeleteSubgroupByName(pGroup->Name());
     }
     //else: never delete the root group


@@ -829,10 +902,10 @@ bool wxFileConfig::DeleteAll()
 {
   CleanUp();
 
 {
   CleanUp();
 

-  if ( remove(m_strLocalFile.fn_str()) == -1 )
+  if ( wxRemove(m_strLocalFile) == -1 )

     wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
 
     wxLogSysError(_("can't delete user configuration file '%s'"), m_strLocalFile.c_str());
 

-  m_strLocalFile = m_strGlobalFile = T("");
+  m_strLocalFile = m_strGlobalFile = wxT("");

   Init();
 
   return TRUE;
   Init();
 
   return TRUE;


@@ -1004,10 +1077,10 @@ LineList *ConfigGroup::GetGroupLine()
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;
     // this group wasn't present in local config file, add it now
     if ( pParent != NULL ) {
       wxString strFullName;

-      strFullName << T("[")
+      strFullName << wxT("[")

                   // +1: no '/'
                   << FilterOutEntryName(GetFullName().c_str() + 1)
                   // +1: no '/'
                   << FilterOutEntryName(GetFullName().c_str() + 1)

-                  << T("]");
+                  << wxT("]");

       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others
       m_pLine = m_pConfig->LineListInsert(strFullName,
                                           pParent->GetLastGroupLine());
       pParent->SetLastGroup(this);  // we're surely after all the others


@@ -1065,7 +1138,7 @@ void ConfigGroup::Rename(const wxString& newName)
 
     LineList *line = GetGroupLine();
     wxString strFullName;
 
     LineList *line = GetGroupLine();
     wxString strFullName;

-    strFullName << T("[") << (GetFullName().c_str() + 1) << T("]"); // +1: no '/'
+    strFullName << wxT("[") << (GetFullName().c_str() + 1) << wxT("]"); // +1: no '/'

     line->SetText(strFullName);
 
     SetDirty();
     line->SetText(strFullName);
 
     SetDirty();


@@ -1076,7 +1149,7 @@ wxString ConfigGroup::GetFullName() const
   if ( Parent() )
     return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
   else
   if ( Parent() )
     return Parent()->GetFullName() + wxCONFIG_PATH_SEPARATOR + Name();
   else

-    return T("");
+    return wxT("");

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -1374,7 +1447,7 @@ void ConfigEntry::SetValue(const wxString& strValue, bool bUser)
   if ( bUser ) {
     wxString strVal = FilterOutValue(strValue);
     wxString strLine;
   if ( bUser ) {
     wxString strVal = FilterOutValue(strValue);
     wxString strLine;

-    strLine << FilterOutEntryName(m_strName) << T('=') << strVal;
+    strLine << FilterOutEntryName(m_strName) << wxT('=') << strVal;

 
     if ( m_pLine != NULL ) {
       // entry was read from the local config file, just modify the line
 
     if ( m_pLine != NULL ) {
       // entry was read from the local config file, just modify the line


@@ -1440,31 +1513,31 @@ static wxString FilterInValue(const wxString& str)
   bool bQuoted = !str.IsEmpty() && str[0] == '"';
 
   for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {
   bool bQuoted = !str.IsEmpty() && str[0] == '"';
 
   for ( size_t n = bQuoted ? 1 : 0; n < str.Len(); n++ ) {

-    if ( str[n] == T('\\') ) {
+    if ( str[n] == wxT('\\') ) {

       switch ( str[++n] ) {
       switch ( str[++n] ) {

-        case T('n'):
-          strResult += T('\n');
+        case wxT('n'):
+          strResult += wxT('\n');

           break;
 
           break;
 

-        case T('r'):
-          strResult += T('\r');
+        case wxT('r'):
+          strResult += wxT('\r');

           break;
 
           break;
 

-        case T('t'):
-          strResult += T('\t');
+        case wxT('t'):
+          strResult += wxT('\t');

           break;
 
           break;
 

-        case T('\\'):
-          strResult += T('\\');
+        case wxT('\\'):
+          strResult += wxT('\\');

           break;
 
           break;
 

-        case T('"'):
-          strResult += T('"');
+        case wxT('"'):
+          strResult += wxT('"');

           break;
       }
     }
     else {
           break;
       }
     }
     else {

-      if ( str[n] != T('"') || !bQuoted )
+      if ( str[n] != wxT('"') || !bQuoted )

         strResult += str[n];
       else if ( n != str.Len() - 1 ) {
         wxLogWarning(_("unexpected \" at position %d in '%s'."),
         strResult += str[n];
       else if ( n != str.Len() - 1 ) {
         wxLogWarning(_("unexpected \" at position %d in '%s'."),


@@ -1487,33 +1560,33 @@ static wxString FilterOutValue(const wxString& str)
   strResult.Alloc(str.Len());
 
   // quoting is necessary to preserve spaces in the beginning of the string
   strResult.Alloc(str.Len());
 
   // quoting is necessary to preserve spaces in the beginning of the string

-  bool bQuote = wxIsspace(str[0]) || str[0] == T('"');
+  bool bQuote = wxIsspace(str[0]) || str[0] == wxT('"');

 
   if ( bQuote )
 
   if ( bQuote )

-    strResult += T('"');
+    strResult += wxT('"');

 
   wxChar c;
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {
 
   wxChar c;
   for ( size_t n = 0; n < str.Len(); n++ ) {
     switch ( str[n] ) {

-      case T('\n'):
-        c = T('n');
+      case wxT('\n'):
+        c = wxT('n');

         break;
 
         break;
 

-      case T('\r'):
-        c = T('r');
+      case wxT('\r'):
+        c = wxT('r');

         break;
 
         break;
 

-      case T('\t'):
-        c = T('t');
+      case wxT('\t'):
+        c = wxT('t');

         break;
 
         break;
 

-      case T('\\'):
-        c = T('\\');
+      case wxT('\\'):
+        c = wxT('\\');

         break;
 
         break;
 

-      case T('"'):
+      case wxT('"'):

         if ( bQuote ) {
         if ( bQuote ) {

-          c = T('"');
+          c = wxT('"');

           break;
         }
         //else: fall through
           break;
         }
         //else: fall through


@@ -1524,11 +1597,11 @@ static wxString FilterOutValue(const wxString& str)
     }
 
     // we get here only for special characters
     }
 
     // we get here only for special characters

-    strResult << T('\\') << c;
+    strResult << wxT('\\') << c;

   }
 
   if ( bQuote )
   }
 
   if ( bQuote )

-    strResult += T('"');
+    strResult += wxT('"');

 
   return strResult;
 }
 
   return strResult;
 }


@@ -1540,7 +1613,7 @@ static wxString FilterInEntryName(const wxString& str)
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {
   strResult.Alloc(str.Len());
 
   for ( const wxChar *pc = str.c_str(); *pc != '\0'; pc++ ) {

-    if ( *pc == T('\\') )
+    if ( *pc == wxT('\\') )

       pc++;
 
     strResult += *pc;
       pc++;
 
     strResult += *pc;


@@ -1555,15 +1628,15 @@ static wxString FilterOutEntryName(const wxString& str)
   wxString strResult;
   strResult.Alloc(str.Len());
 
   wxString strResult;
   strResult.Alloc(str.Len());
 

-  for ( const wxChar *pc = str.c_str(); *pc != T('\0'); pc++ ) {
+  for ( const wxChar *pc = str.c_str(); *pc != wxT('\0'); pc++ ) {

     wxChar c = *pc;
 
     // we explicitly allow some of "safe" chars and 8bit ASCII characters
     // which will probably never have special meaning
     // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
     //     should *not* be quoted
     wxChar c = *pc;
 
     // we explicitly allow some of "safe" chars and 8bit ASCII characters
     // which will probably never have special meaning
     // NB: note that wxCONFIG_IMMUTABLE_PREFIX and wxCONFIG_PATH_SEPARATOR
     //     should *not* be quoted

-    if ( !wxIsalnum(c) && !wxStrchr(T("@_/-!.*%"), c) && ((c & 0x80) == 0) )
-      strResult += T('\\');
+    if ( !wxIsalnum(c) && !wxStrchr(wxT("@_/-!.*%"), c) && ((c & 0x80) == 0) )
+      strResult += wxT('\\');

 
     strResult += c;
   }
 
     strResult += c;
   }