Changeset 9847 in orxonox.OLD for branches/new_class_id/src/lib/util

Timestamp:

Sep 27, 2006, 11:25:43 PM (18 years ago)

Author:

bensch

Message:

renamed NewResource to Resource

Location:

branches/new_class_id/src/lib/util/loading

Files:

• resource.cc (modified) (7 diffs)
• resource.h (modified) (3 diffs)

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

@@ -24 +24 @@
 namespace Resources
 {
-  ObjectListDefinition(NewResource);
+  ObjectListDefinition(Resource);
 
 
@@ -30 +30 @@
    * standard constructor
   */
-  NewResource::NewResource (Type* type)
+  Resource::Resource (Type* type)
       : _pointer(NULL), _type(type)
   {
-    this->registerObject(this, NewResource::_objectList);
+    this->registerObject(this, Resource::_objectList);
   }
 
@@ -39 +39 @@
    * standard deconstructor
    */
-  NewResource::~NewResource ()
+  Resource::~Resource ()
   {
     // delete what has to be deleted here
@@ -45 +45 @@
 
 
-  std::string NewResource::locateFile(const std::string& fileName) const
+  std::string Resource::locateFile(const std::string& fileName) const
   {
     if ((ResourceManager::getInstance()->mainGlobalPath() + File(fileName)).exists() )
@@ -69 +69 @@
    * @return true on success.
    */
-  std::string NewResource::locateFileInSubDir(const Directory& directory, const std::string& fileName) const
+  std::string Resource::locateFileInSubDir(const Directory& directory, const std::string& fileName) const
   {
     std::vector<Directory>::const_iterator it;
@@ -84 +84 @@
 
 
-  StorePointer* NewResource::acquireResource(const std::string& loadString)
+  StorePointer* Resource::acquireResource(const std::string& loadString)
   {
     //const Type* const type = _resourceTypes[this->_type->id()];
@@ -98 +98 @@
 
 
-  void NewResource::addResource(StorePointer* pointer)
+  void Resource::addResource(StorePointer* pointer)
   {
     this->_type->addResource(pointer);

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

@@ -1 +1 @@
 /*!
  * @file resource.h
- * @brief Definition of a NewResource.
+ * @brief Definition of a Resource.
 */
 
@@ -130 +130 @@
 
 
-  //! A NewResource is an Object, that can be loaded from Disk
+
+
+  //! A Resource is an Object, that can be loaded from Disk
   /**
-   * The NewResource Hanldes the location and stores pointers to data that can be retrieved.
+   * The Resource Hanldes the location and stores pointers to data that can be retrieved.
    */
-  class NewResource : virtual public BaseObject
+  class Resource : virtual public BaseObject
   {
-    ObjectListDeclaration(NewResource);
+    ObjectListDeclaration(Resource);
 
   public:
-    NewResource(Resources::Type* type);
-    virtual ~NewResource();
+    Resource(Resources::Type* type);
+    virtual ~Resource();
 
     /** @brief reloads the underlying resource */
@@ -158 +160 @@
   private:
     Resources::StorePointer*       _pointer;                         //!< Virtual Pointer to the ResourceData.
-    Resources::Type*               _type;                            //!< Type of the NewResource.
+    Resources::Type*               _type;                            //!< Type of the Resource.
   };
 }