Changeset 8330 in orxonox.OLD

Timestamp:

Jun 12, 2006, 10:44:26 PM (18 years ago)

Author:

bensch

Message:

moved the File-Classes

Location:

trunk/src

Files:

• lib/Makefile.am (modified) (2 diffs)
• lib/graphics/importer/bsp_file.cc (modified) (2 diffs)
• lib/parser/ini_parser/Makefile.am (modified) (1 diff)
• lib/parser/ini_parser/ini_parser.h (modified) (1 diff)
• lib/shell/shell_completion_plugin.cc (modified) (1 diff)
• lib/util/filesys (added)
• lib/util/filesys/directory.cc (moved) (moved from trunk/src/lib/util/directory.cc)
• lib/util/filesys/directory.h (moved) (moved from trunk/src/lib/util/directory.h)
• lib/util/filesys/file.cc (moved) (moved from trunk/src/lib/util/file.cc)
• lib/util/filesys/file.h (moved) (moved from trunk/src/lib/util/file.h)
• lib/util/loading/resource_manager.cc (modified) (1 diff)
• lib/util/loading/resource_manager.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• story_entities/simple_game_menu.cc (modified) (1 diff)
• story_entities/story_entity.cc (modified) (1 diff)

trunk/src/lib/Makefile.am

@@ -25 +25 @@
                 util/loading/factory.cc \
                 util/loading/dynamic_loader.cc \
+                \
+                util/filesys/file.cc \
+                util/filesys/directory.cc \
+                \
                 util/preferences.cc \
                 util/threading.cc \
-                util/file.cc \
-                util/directory.cc \
                 util/timer.cc \
                 \
@@ -49 +51 @@
                 util/executor/functor_list.h \
                 \
+                util/filesys/file.h \
+                util/filesys/directory.h \
+                \
                 util/preferences.h \
                 util/threading.h \
-                util/file.h \
-                util/directory.h \
                 util/timer.h \
                 \

trunk/src/lib/graphics/importer/bsp_file.cc

@@ -22 +22 @@
 #include "bsp_tree_node.h"
 #include <fstream>
-#include "file.h"
+#include "util/loading/resource_manager.h"
+
 #include <sys/stat.h>
 #include <string.h>
@@ -31 +32 @@
 #include "base_object.h"
 #include "vector.h"
-#include "util/loading/resource_manager.h"
 #include "movie_player.h"
 

trunk/src/lib/parser/ini_parser/Makefile.am

@@ +1 @@
+INCLUDES=-I../../util
+
 
 noinst_LIBRARIES = libIniParser.a

trunk/src/lib/parser/ini_parser/ini_parser.h

@@ -11 +11 @@
 #define PARSELINELENGHT     512       //!< how many chars to read at once
 
-#include "src/lib/util/file.h"
+#include "filesys/file.h"
 #include <list>
 

trunk/src/lib/shell/shell_completion_plugin.cc

@@ -25 +25 @@
 #include "loading/resource_manager.h"
 
-#include "directory.h"
+#include "filesys/directory.h"
 #include "debug.h"
 

trunk/src/lib/util/loading/resource_manager.cc

@@ -17 +17 @@
 
 #include "util/loading/resource_manager.h"
-#include "file.h"
 #include "substring.h"
 #include "debug.h"

trunk/src/lib/util/loading/resource_manager.h

@@ -21 +21 @@
 
 #include "base_object.h"
-#include "file.h"
+#include "filesys/file.h"
 
 #include "multi_type.h"

trunk/src/orxonox.cc

@@ -32 +32 @@
 #include "gui/qt/qt_gui.h"
 
-#include "file.h"
 #include "parser/ini_parser/ini_parser.h"
 #include "util/loading/game_loader.h"

trunk/src/story_entities/simple_game_menu.cc

@@ -75 +75 @@
   OrxGui::GLGuiHandler::getInstance()->activateCursor();
   OrxGui::GLGuiHandler::getInstance()->activate();
-  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.tif", 0, 49);
+  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 0, 49);
   /////
 

trunk/src/story_entities/story_entity.cc

@@ -22 +22 @@
 #include "story_entity.h"
 
-#include "util/file.h"
 #include "util/loading/load_param.h"
 #include "util/loading/resource_manager.h"