Changeset 7661 in orxonox.OLD for trunk/src/lib/gui/gtk_gui/gui_exec.cc

Timestamp:

May 18, 2006, 12:55:34 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the QT_GUI back to the trunk
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/qt_gui . -r7607:HEAD

absolutely no conflicts

File:

• trunk/src/lib/gui/gtk_gui/gui_exec.cc (modified) (5 diffs)

trunk/src/lib/gui/gtk_gui/gui_exec.cc

@@ -26 +26 @@
 #include "gui_exec.h"
 
+#include "file.h"
 #include "util/loading/resource_manager.h"
 #include "parser/ini_parser/ini_parser.h"
@@ -33 +34 @@
 #include <sys/stat.h>
 #include <sys/types.h>
+
 
 
@@ -147 +149 @@
 void GuiExec::setConfDir(const char* confDir)
 {
-  this->confDir = ResourceManager::homeDirCheck(confDir);
+  this->confDir = File(confDir).name();
 
   PRINTF(5)("Config Directory is: %s.\n", this->confDir);
@@ -199 +201 @@
   IniParser iniParser;
   this->writeFileText(widget, &iniParser, 0);
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
-  iniParser.writeFile(fileName);
+  iniParser.writeFile(File(confFile).name());
 }
 
@@ -253 +254 @@
 void GuiExec::readFromFile(Widget* widget)
 {
-  std::string fileName = ResourceManager::homeDirCheck(confFile);
+  std::string fileName = File(confFile).name();
   IniParser iniParser(fileName);
   if (!iniParser.isOpen())