Changeset 7611 in orxonox.OLD for branches/qt_gui/src/lib/util/loading

Timestamp:

May 12, 2006, 4:15:39 PM (19 years ago)

Author:

bensch

Message:

File stuff started

Location:

branches/qt_gui/src/lib/util/loading

Files:

• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (2 diffs)

branches/qt_gui/src/lib/util/loading/resource_manager.cc

@@ -17 +17 @@
 
 #include "util/loading/resource_manager.h"
-
+#include "file.h"
 #include "substring.h"
 #include "debug.h"
@@ -60 +60 @@
 
   this->dataDir = "./";
-  this->_cwd = "";
   this->tryDataDir("./data");
 }
@@ -874 +873 @@
     if (name[0] == '.' && name[1] != '.')
       retName.erase(0);
-    const std::string& absDir = ResourceManager::cwd();
+    const std::string& absDir = File::cwd();
     retName = absDir + retName;
   }
@@ -896 +895 @@
   else
     return "";
-}
-
-#ifdef __unix__
-  #include <unistd.h>
-#elif __WIN32__ || _MS_DOS_
-  #include <dir.h>
-#else
-  #include <direct.h> /* Visual C++ */
-#endif
-/**
- * @returns the Current Woring Directory
- */
-const std::string& ResourceManager::cwd()
-{
-  if (ResourceManager::getInstance()->_cwd.empty())
-  {
-    char cwd[1024];
-    char* errorCode = getcwd(cwd, 1024);
-    if (errorCode == 0)
-      return ResourceManager::getInstance()->_cwd;
-
-    ResourceManager::getInstance()->_cwd = cwd;
-  }
-  return ResourceManager::getInstance()->_cwd;
 }
 

branches/qt_gui/src/lib/util/loading/resource_manager.h

@@ -138 +138 @@
   static bool isInDataDir(const std::string& fileName);
   static std::string getAbsDir(const std::string& fileName);
-  static const std::string& cwd();
 
   static const char* ResourceTypeToChar(ResourceType type);
@@ -151 +150 @@
   static ResourceManager*    singletonRef;       //!< singleton Reference
 
-  std::string                _cwd;               //!< The currend Working directory.
   std::string                dataDir;            //!< The Data Directory, where all relevant Data is stored.
   std::vector<std::string>   imageDirs;          //!< A list of directories in which images are stored.