Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8330 in orxonox.OLD for trunk


Ignore:
Timestamp:
Jun 12, 2006, 10:44:26 PM (18 years ago)
Author:
bensch
Message:

moved the File-Classes

Location:
trunk/src
Files:
1 added
10 edited
4 moved

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/Makefile.am

    r8271 r8330  
    2525                util/loading/factory.cc \
    2626                util/loading/dynamic_loader.cc \
     27                \
     28                util/filesys/file.cc \
     29                util/filesys/directory.cc \
     30                \
    2731                util/preferences.cc \
    2832                util/threading.cc \
    29                 util/file.cc \
    30                 util/directory.cc \
    3133                util/timer.cc \
    3234                \
    … …  
    4951                util/executor/functor_list.h \
    5052                \
     53                util/filesys/file.h \
     54                util/filesys/directory.h \
     55                \
    5156                util/preferences.h \
    5257                util/threading.h \
    53                 util/file.h \
    54                 util/directory.h \
    5558                util/timer.h \
    5659                \

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

    r8186 r8330  
    2222#include "bsp_tree_node.h"
    2323#include <fstream>
    24 #include "file.h"
     24#include "util/loading/resource_manager.h"
     25
    2526#include <sys/stat.h>
    2627#include <string.h>
    … …  
    3132#include "base_object.h"
    3233#include "vector.h"
    33 #include "util/loading/resource_manager.h"
    3434#include "movie_player.h"
    3535

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

    r5944 r8330  
     1INCLUDES=-I../../util
     2
    13
    24noinst_LIBRARIES = libIniParser.a

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

    r7661 r8330  
    1111#define PARSELINELENGHT     512       //!< how many chars to read at once
    1212
    13 #include "src/lib/util/file.h"
     13#include "filesys/file.h"
    1414#include <list>
    1515

  • trunk/src/lib/shell/shell_completion_plugin.cc

    r8276 r8330  
    2525#include "loading/resource_manager.h"
    2626
    27 #include "directory.h"
     27#include "filesys/directory.h"
    2828#include "debug.h"
    2929

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

    r8316 r8330  
    1717
    1818#include "util/loading/resource_manager.h"
    19 #include "file.h"
    2019#include "substring.h"
    2120#include "debug.h"

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

    r7661 r8330  
    2121
    2222#include "base_object.h"
    23 #include "file.h"
     23#include "filesys/file.h"
    2424
    2525#include "multi_type.h"

  • trunk/src/orxonox.cc

    r8316 r8330  
    3232#include "gui/qt/qt_gui.h"
    3333
    34 #include "file.h"
    3534#include "parser/ini_parser/ini_parser.h"
    3635#include "util/loading/game_loader.h"

  • trunk/src/story_entities/simple_game_menu.cc

    r8324 r8330  
    7575  OrxGui::GLGuiHandler::getInstance()->activateCursor();
    7676  OrxGui::GLGuiHandler::getInstance()->activate();
    77   OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.tif", 0, 49);
     77  OrxGui::GLGuiHandler::getInstance()->cursor()->loadTextureSequence(ResourceManager::getInstance()->getDataDir() + "/" + "maps/reap_mouse/reap_mouse_##.png", 0, 49);
    7878  /////
    7979

  • trunk/src/story_entities/story_entity.cc

    r7677 r8330  
    2222#include "story_entity.h"
    2323
    24 #include "util/file.h"
    2524#include "util/loading/load_param.h"
    2625#include "util/loading/resource_manager.h"
Note: See TracChangeset for help on using the changeset viewer.