Changeset 2750

Timestamp:

Mar 5, 2009, 2:58:42 PM (16 years ago)

Author:

rgrieder

Message:

Using POSIX forward slashes on Windows as well. There is only one exception: Plugin loading in GSGraphics.cc

• Removed Core::getFooPathPOSIXString()
• Modified Core::getFooPathString() to return POSIX path strings.

This should problems when exchanging file strings over the network.

Location:

code/branches/network/src

Files:

• core/ArgumentCompletionFunctions.cc (modified) (2 diffs)
• core/CommandLine.cc (modified) (1 diff)
• core/ConfigFileManager.cc (modified) (2 diffs)
• core/Core.cc (modified) (4 diffs)
• core/Core.h (modified) (1 diff)
• core/Language.cc (modified) (3 diffs)
• core/LuaBind.cc (modified) (2 diffs)
• orxonox/gamestates/GSGraphics.cc (modified) (6 diffs)
• orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• orxonox/gamestates/GSRoot.cc (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (1 diff)

code/branches/network/src/core/ArgumentCompletionFunctions.cc

@@ -76 +76 @@
                     std::string dir = startdirectory.string();
                     if (dir.size() > 0 && dir[dir.size() - 1] == ':')
-                        startdirectory = dir + CP_SLASH;
+                        startdirectory = dir + '/';
                 }
 #endif
@@ -86 +86 @@
                 {
                     if (boost::filesystem::is_directory(*file))
-                        dirlist.push_back(ArgumentCompletionListElement((*file).string() + CP_SLASH, getLowercase((*file).string()) + "/", (*file).BOOST_LEAF_FUNCTION() + "/"));
+                        dirlist.push_back(ArgumentCompletionListElement((*file).string() + '/', getLowercase((*file).string()) + '/', (*file).BOOST_LEAF_FUNCTION() + '/'));
                     else
                         filelist.push_back(ArgumentCompletionListElement((*file).string(), getLowercase((*file).string()), (*file).BOOST_LEAF_FUNCTION()));

code/branches/network/src/core/CommandLine.cc

@@ -307 +307 @@
         // They will not overwrite the arguments given directly
         std::ifstream file;
-        file.open(filepath.file_string().c_str());
+        file.open(filepath.string().c_str());
         args.clear();
         if (file)

code/branches/network/src/core/ConfigFileManager.cc

@@ -241 +241 @@
         // Open the file
         std::ifstream file;
-        file.open(filepath.file_string().c_str(), std::fstream::in);
+        file.open(filepath.string().c_str(), std::fstream::in);
         if (file.is_open())
         {
@@ -347 +347 @@
 
         std::ofstream file;
-        file.open(filepath.file_string().c_str(), std::fstream::out);
+        file.open(filepath.string().c_str(), std::fstream::out);
         file.setf(std::ios::fixed, std::ios::floatfield);
         file.precision(6);

code/branches/network/src/core/Core.cc

@@ -260 +260 @@
     /*static*/ std::string Core::getMediaPathString()
     {
-        return mediaPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getMediaPathPOSIXString()
-    {
         return mediaPath_g.string() + '/';
-
     }
 
@@ -274 +269 @@
     /*static*/ std::string Core::getConfigPathString()
     {
-        return configPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getConfigPathPOSIXString()
-    {
         return configPath_g.string() + '/';
     }
@@ -286 +277 @@
     }
     /*static*/ std::string Core::getLogPathString()
-    {
-        return logPath_g.directory_string() + CP_SLASH;
-    }
-    /*static*/ std::string Core::getLogPathPOSIXString()
     {
         return logPath_g.string() + '/';
@@ -456 +443 @@
             {
                 ThrowException(General, std::string("The ") + it->second + " directory has been preoccupied by a file! \
-                                         Please remove " + it->first.file_string());
+                                         Please remove " + it->first.string());
             }
             if (boost::filesystem::create_directories(it->first)) // function may not return true at all (bug?)

code/branches/network/src/core/Core.h

@@ -83 +83 @@
             static std::string getConfigPathString();
             static std::string getLogPathString();
-            static std::string getMediaPathPOSIXString();
-            static std::string getConfigPathPOSIXString();
-            static std::string getLogPathPOSIXString();
 
             // fast access global variables.

code/branches/network/src/core/Language.cc

@@ -210 +210 @@
         // This creates the file if it's not existing
         std::ofstream createFile;
-        createFile.open(filepath.file_string().c_str(), std::fstream::app);
+        createFile.open(filepath.string().c_str(), std::fstream::app);
         createFile.close();
 
         // Open the file
         std::ifstream file;
-        file.open(filepath.file_string().c_str(), std::fstream::in);
+        file.open(filepath.string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -261 +261 @@
         // Open the file
         std::ifstream file;
-        file.open(filepath.file_string().c_str(), std::fstream::in);
+        file.open(filepath.string().c_str(), std::fstream::in);
 
         if (!file.is_open())
@@ -317 +317 @@
         // Open the file
         std::ofstream file;
-        file.open(filepath.file_string().c_str(), std::fstream::out);
+        file.open(filepath.string().c_str(), std::fstream::out);
 
         if (!file.is_open())

code/branches/network/src/core/LuaBind.cc

@@ -53 +53 @@
     LuaBind::singletonRef_s = this;
 
-    this->includePath_ = Core::getMediaPathPOSIXString();
+    this->includePath_ = Core::getMediaPathString();
 
     luaState_ = lua_open();
@@ -90 +90 @@
     output_ = "";
     std::ifstream file;
-    file.open(filepath.file_string().c_str(), std::fstream::in);
+    file.open(filepath.string().c_str(), std::fstream::in);
 
     if (!file.is_open())

code/branches/network/src/orxonox/gamestates/GSGraphics.cc

@@ -136 +136 @@
         // load debug overlay
         COUT(3) << "Loading Debug Overlay..." << std::endl;
-        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").file_string());
+        this->debugOverlay_ = new XMLFile((Core::getMediaPath() / "overlay" / "debug.oxo").string());
         Loader::open(debugOverlay_);
 
@@ -304 +304 @@
         // create our own log that we can listen to
         Ogre::Log *myLog;
-        myLog = ogreLogger_->createLog(ogreLogFilepath.file_string(), true, false, false);
+        myLog = ogreLogger_->createLog(ogreLogFilepath.string(), true, false, false);
         COUT(4) << "Ogre Log created" << std::endl;
 
@@ -317 +317 @@
             // create a zero sized file
             std::ofstream creator;
-            creator.open(ogreConfigFilepath.file_string().c_str());
+            creator.open(ogreConfigFilepath.string().c_str());
             creator.close();
         }
 
         // Leave plugins file empty. We're going to do that part manually later
-        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.file_string(), ogreLogFilepath.file_string());
+        ogreRoot_ = new Ogre::Root("", ogreConfigFilepath.string(), ogreLogFilepath.string());
 
         COUT(3) << "Ogre set up done." << std::endl;
@@ -336 +336 @@
         // Do some SubString magic to get the comma separated list of plugins
         SubString plugins(ogrePlugins_, ",", " ", false, 92, false, 34, false, 40, 41, false, '\0');
+        // Use backslash paths on Windows! file_string() already does that though.
         for (unsigned int i = 0; i < plugins.size(); ++i)
             ogreRoot_->loadPlugin((folder / plugins[i]).file_string());
@@ -356 +357 @@
         try
         {
-            cf.load((Core::getMediaPath() / resourceFile_).file_string());
+            cf.load((Core::getMediaPath() / resourceFile_).string());
         }
         catch (...)
@@ -382 +383 @@
 
                     Ogre::ResourceGroupManager::getSingleton().addResourceLocation(
-                        (Core::getMediaPath() / archName).directory_string(), typeName, secName);
+                        (Core::getMediaPath() / archName).string(), typeName, secName);
                 }
             }

code/branches/network/src/orxonox/gamestates/GSLevel.cc

@@ -202 +202 @@
         std::string levelName;
         CommandLine::getValue("level", &levelName);
-        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + CP_SLASH + levelName);
+        startFile_ = new XMLFile(Core::getMediaPathString() + "levels" + '/' + levelName);
         Loader::open(startFile_);
     }

code/branches/network/src/orxonox/gamestates/GSRoot.cc

@@ -111 +111 @@
 
         // initialise TCL
-        this->tclBind_ = new TclBind(Core::getMediaPathPOSIXString());
+        this->tclBind_ = new TclBind(Core::getMediaPathString());
         this->tclThreadManager_ = new TclThreadManager(tclBind_->getTclInterpreter());
 

code/branches/network/src/orxonox/gui/GUIManager.cc

@@ -154 +154 @@
                 boost::filesystem::path ceguiLogFilepath(Core::getLogPath() / "cegui.log");
                 this->ceguiLogger_ = new DefaultLogger();
-                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.file_string());
+                this->ceguiLogger_->setLogFilename(ceguiLogFilepath.string());
                 // set the log level according to ours (translate by subtracting 1)
                 this->ceguiLogger_->setLoggingLevel(