Fixed warnings/errors and changed Thaw

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

diff --git a/src/common/fileconf.cpp b/src/common/fileconf.cpp
index c84e60de072a10df13cec44585b976d774d9dfa3..022a830255062a0ad495db9e1edc9e4be3433d71 100644 (file)
--- a/src/common/fileconf.cpp
+++ b/src/common/fileconf.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        fileconf.cpp
+// Name:        src/common/fileconf.cpp

 // Purpose:     implementation of wxFileConfig derivation of wxConfig
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     implementation of wxFileConfig derivation of wxConfig
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -10,10 +10,6 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "fileconf.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------


@@ -275,7 +271,7 @@ wxString wxFileConfig::GetGlobalDir()
     strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
 #elif defined( __UNIX__ )
     strDir = wxT("/etc/");
     strDir = wxMacFindFolder(  (short) kOnSystemDisk, kPreferencesFolderType, kDontCreateFolder ) ;
 #elif defined( __UNIX__ )
     strDir = wxT("/etc/");

-#elif defined(__WXPM__)
+#elif defined(__OS2__)

     ULONG aulSysInfo[QSV_MAX] = {0};
     UINT drive;
     APIRET rc;
     ULONG aulSysInfo[QSV_MAX] = {0};
     UINT drive;
     APIRET rc;


@@ -454,16 +450,16 @@ wxFileConfig::wxFileConfig(const wxString& appName, const wxString& vendorName,
     {
         if ( !m_strLocalFile.empty() && !wxIsAbsolutePath(m_strLocalFile) )
         {
     {
         if ( !m_strLocalFile.empty() && !wxIsAbsolutePath(m_strLocalFile) )
         {

-            wxString strLocal = m_strLocalFile;
+            const wxString strLocalOrig = m_strLocalFile;

             m_strLocalFile = GetLocalDir();
             m_strLocalFile = GetLocalDir();

-            m_strLocalFile << strLocal;
+            m_strLocalFile << strLocalOrig;

         }
 
         if ( !m_strGlobalFile.empty() && !wxIsAbsolutePath(m_strGlobalFile) )
         {
         }
 
         if ( !m_strGlobalFile.empty() && !wxIsAbsolutePath(m_strGlobalFile) )
         {

-            wxString strGlobal = m_strGlobalFile;
+            const wxString strGlobalOrig = m_strGlobalFile;

             m_strGlobalFile = GetGlobalDir();
             m_strGlobalFile = GetGlobalDir();

-            m_strGlobalFile << strGlobal;
+            m_strGlobalFile << strGlobalOrig;

         }
     }
 
         }
     }
 


@@ -576,7 +572,7 @@ wxFileConfig::~wxFileConfig()
 // parse a config file
 // ----------------------------------------------------------------------------
 
 // parse a config file
 // ----------------------------------------------------------------------------
 

-void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
+void wxFileConfig::Parse(const wxTextBuffer& buffer, bool bLocal)

 {
   const wxChar *pStart;
   const wxChar *pEnd;
 {
   const wxChar *pStart;
   const wxChar *pEnd;


@@ -668,7 +664,7 @@ void wxFileConfig::Parse(wxTextBuffer& buffer, bool bLocal)
       }
     }
     else {                        // a key
       }
     }
     else {                        // a key

-      const wxChar *pEnd = pStart;
+      pEnd = pStart;

       while ( *pEnd && *pEnd != wxT('=') /* && !wxIsspace(*pEnd)*/ ) {
         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's
       while ( *pEnd && *pEnd != wxT('=') /* && !wxIsspace(*pEnd)*/ ) {
         if ( *pEnd == wxT('\\') ) {
           // next character may be space or not - still take it because it's


@@ -2080,4 +2076,3 @@ static wxString GetAppName(const wxString& appName)
 }
 
 #endif // wxUSE_CONFIG
 }
 
 #endif // wxUSE_CONFIG

-