Update of /cvsroot/mahogany/M/src/classes
In directory sc8-pr-cvs1:/tmp/cvs-serv4973/src/classes
Modified Files:
Profile.cpp ConfigSource.cpp
Log Message:
Windows compilation fixes
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.143
retrieving revision 1.144
diff -b -u -2 -r1.143 -r1.144
--- Profile.cpp 29 Aug 2003 00:08:08 -0000 1.143
+++ Profile.cpp 30 Aug 2003 23:47:47 -0000 1.144
@@ -507,5 +507,5 @@
String GetRootPath(void) const
{
- return GetSectionPath(GetProfileSection());
+ return GetProfileSection();
}
@@ -1809,29 +1809,2 @@
return folderName;
}
-
-/* static */
-String Profile::GetSectionPath(const String& section)
-{
- String path = section;
-
- // we don't use "/M" prefix when working with wxRegConfig as it would be
- // superfluous: our config key is already Mahogany-Team/M
- //
- // but for the file based config formats (both local and remote) we do use
- // it for mostly historical reasons - even though if it probably would be
- // better to never use it, it's simply too much trouble to write the upgrade
- // code to deal with the existing config files
-#ifdef OS_WIN
- if ( ProfileImpl::ms_usingRegConfig )
- {
- // remove "/M" prefix
- ASSERT_MSG( path[0u] == _T('/') && path[1u] == _T('M'),
- _T("all profile sections must start with \"/M\"") );
-
- path.erase(0, 2);
- }
-#endif // Windows
-
- return path;
-}
-
Index: ConfigSource.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/ConfigSource.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- ConfigSource.cpp 29 Aug 2003 00:06:41 -0000 1.3
+++ ConfigSource.cpp 30 Aug 2003 23:47:47 -0000 1.4
@@ -35,9 +35,10 @@
#include <wx/config.h>
- #include <wx/fileconf.h>
#include <wx/dir.h>
#include <wx/utils.h>
#endif
+#include <wx/fileconf.h>
+
#ifdef OS_UNIX
#include <sys/types.h>
@@ -248,7 +249,4 @@
ConfigSourceLocal::ConfigSourceLocal(const String& filename, const String& name)
: ConfigSource(name), m_config(NULL)
-#ifdef OS_WIN
- , m_usingRegConfig(false)
-#endif // OS_WIN
{
String localFilePath, globalFilePath;
@@ -426,6 +424,4 @@
wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE
);
-
- m_usingRegConfig = true;
// skip wxFileConfig creation below
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
