Changeset 6222 in orxonox.OLD for trunk/src/util/loading/resource_manager.h

Timestamp:

Dec 21, 2005, 1:49:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the christmas branche to the trunk
merged with command:
svn merge -r6165:HEAD christmas_branche/ ../trunk/
no conflicts

Location:

trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/loading/resource_manager.h (modified) (2 diffs)

trunk/src/util/loading/resource_manager.h

@@ -21 +21 @@
 #include "base_object.h"
 
-#include "stdlibincl.h"
 
-// FORWARD DECLARATION
-template<class T> class tList;
+#include <list>
 
 //! An eumerator for different fileTypes the resourceManager supports
@@ -144 +142 @@
 
   char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
-  tList<Resource>*         resourceList;       //!< The List of Resources, that has already been loaded.
-  tList<char>*             imageDirs;          //!< A list of directories in which images are stored.
+  std::list<Resource*>     resourceList;       //!< The List of Resources, that has already been loaded.
+  std::list<char*>         imageDirs;          //!< A list of directories in which images are stored.
 
 };