Changeset 7616 in orxonox.OLD for branches/qt_gui/src/orxonox.cc

Timestamp:

May 15, 2006, 2:41:51 PM (18 years ago)

Author:

bensch

Message:

more file stuff in File-class

File:

• branches/qt_gui/src/orxonox.cc (modified) (7 diffs)

branches/qt_gui/src/orxonox.cc

@@ -32 +32 @@
 #include "gui/qt_gui/qt_gui.h"
 
+#include "file.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "util/loading/game_loader.h"
@@ -189 +190 @@
 const std::string& Orxonox::getConfigFile ()
 {
-  if (ResourceManager::isFile("orxonox.conf"))
+  File orxConfFile("orxonox.conf");
+  if (orxConfFile.isFile())
   {
     this->configFileName =  "orxonox.conf";
   }
   else
-    this->configFileName = ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE);
+    this->configFileName = File(DEFAULT_CONFIG_FILE).name();
 
   PRINTF(3)("Parsed Config File: '%s'\n", this->configFileName);
@@ -426 +428 @@
   CmdLinePrefsReader prefs;
 
-  IniFilePrefsReader ini(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
-  Preferences::getInstance()->setUserIni(ResourceManager::homeDirCheck(DEFAULT_CONFIG_FILE));
+  IniFilePrefsReader ini(File(DEFAULT_CONFIG_FILE).name());
+  Preferences::getInstance()->setUserIni(File(DEFAULT_CONFIG_FILE).name());
 
   prefs.parse(argc, argv);
@@ -503 +505 @@
 {
   // checking for existence of the configuration-files, or if the lock file is still used
-  if (showGui || (!ResourceManager::isFile("./orxonox.conf") &&
-                  !ResourceManager::isFile(DEFAULT_CONFIG_FILE))
+  if (showGui || (!File("./orxonox.conf").isFile() &&
+      !File(DEFAULT_CONFIG_FILE).isFile())
 #if DEBUG < 3 // developers do not need to see the GUI, when orxonox fails
       || ResourceManager::isFile(DEFAULT_LOCK_FILE)
@@ -510 +512 @@
      )
   {
-    if (ResourceManager::isFile(DEFAULT_LOCK_FILE))
-      ResourceManager::deleteFile(DEFAULT_LOCK_FILE);
+    File lockFile(DEFAULT_LOCK_FILE);
+    if (lockFile.isFile())
+      lockFile.remove();
 
     // starting the GUI
@@ -524 +527 @@
   PRINT(0)(">>> Starting Orxonox <<<\n");
 
-  ResourceManager::touchFile(DEFAULT_LOCK_FILE);
+  File(DEFAULT_LOCK_FILE).touch();
 
   Orxonox *orx = Orxonox::getInstance();
@@ -538 +541 @@
 
   delete orx;
-  ResourceManager::deleteFile("~/.orxonox/orxonox.lock");
-}
+  File("~/.orxonox/orxonox.lock").remove();
+}