Changeset 9788 in orxonox.OLD for branches/new_class_id/src/lib/util/loading/resource.h

Timestamp:

Sep 22, 2006, 6:55:52 PM (19 years ago)

Author:

bensch

Message:

renaming for namespace-purposes

File:

• branches/new_class_id/src/lib/util/loading/resource.h (modified) (6 diffs)

branches/new_class_id/src/lib/util/loading/resource.h

@@ -1 +1 @@
 /*!
  * @file resource.h
- * @brief Definition of a Resource.
+ * @brief Definition of a NewResource.
 */
 
@@ -15 +15 @@
 #include "filesys/directory.h"
 
-//! A Resource is an Object, that can be loaded from Disk
+//! A NewResource is an Object, that can be loaded from Disk
 /**
  *
  */
-class Resource : virtual public BaseObject
+class NewResource : virtual public BaseObject
 {
-  ObjectListDeclaration(Resource);
+  ObjectListDeclaration(NewResource);
 public:
   class KeepLevel
@@ -35 +35 @@
   {
   public:
-    Pointer(const std::string& loadString, const Resource::KeepLevel& keeplevel);
+    Pointer(const std::string& loadString, const NewResource::KeepLevel& keeplevel);
     const std::string& loadString() const { return _loadString; };
-    const Resource::KeepLevel& keepLevel() const { return _keepLevel; };
+    const NewResource::KeepLevel& keepLevel() const { return _keepLevel; };
 
   private:
     std::string              _loadString;             //!< An identifier, to match when loading a File.
-    Resource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
+    NewResource::KeepLevel      _keepLevel;              //!< The Priority of this resource. (can only be increased, so none else will delete this)
   };
 
@@ -60 +60 @@
     const std::vector<std::string>& resourcePaths() const { return _resourcePaths; };
     const std::vector<std::string>& resourceSubPaths() const { return _resourceSubPaths; };
-    const std::vector<Resource::Pointer*>& storedResources() const { return _storedResources; };
+    const std::vector<NewResource::Pointer*>& storedResources() const { return _storedResources; };
 
     void setID(int id);
-    void addResource(Resource::Pointer* resource);
+    void addResource(NewResource::Pointer* resource);
 
   private:
@@ -72 +72 @@
     std::vector<std::string>        _fileExtensions;
 
-    std::vector<Resource::Pointer*> _storedResources;
+    std::vector<NewResource::Pointer*> _storedResources;
   };
 
 
 public:
-  Resource(Resource::Type* type);
-  virtual ~Resource();
+  NewResource(NewResource::Type* type);
+  virtual ~NewResource();
 
   virtual bool reload() { return false; };
@@ -92 +92 @@
 
 protected:
-  Resource::Pointer* acquireResource(const std::string& loadString);
-  void addResource(Resource::Pointer* pointer);
+  NewResource::Pointer* acquireResource(const std::string& loadString);
+  void addResource(NewResource::Pointer* pointer);
 
 private:
-  Resource::Pointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
-  Resource::Type*          _type;                            //!< Type of the Resource.
+  NewResource::Pointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
+  NewResource::Type*          _type;                            //!< Type of the NewResource.
 
 
-  static std::vector<Resource::Type*>    _resourceTypes;
+  static std::vector<NewResource::Type*>    _resourceTypes;
 
   //! GLOBALS