Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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


Ignore:
Timestamp:
Sep 1, 2006, 8:06:39 PM (18 years ago)
Author:
bensch
Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:
branches/new_class_id/src/lib/util
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/lib/util/executor/executor.cc

    r9684 r9715  
    1919
    2020
    21 NewObjectListDefinition(Executor);
     21ObjectListDefinition(Executor);
    2222
    2323/**

  • branches/new_class_id/src/lib/util/executor/executor.h

    r9684 r9715  
    3838class Executor : public BaseObject
    3939{
    40   NewObjectListDeclaration(Executor);
     40  ObjectListDeclaration(Executor);
    4141  public:
    4242    virtual ~Executor();

  • branches/new_class_id/src/lib/util/loading/dynamic_loader.cc

    r9709 r9715  
    2424
    2525
    26 NewObjectListDefinition(DynamicLoader);
     26ObjectListDefinition(DynamicLoader);
    2727
    2828/**

  • branches/new_class_id/src/lib/util/loading/dynamic_loader.h

    r9684 r9715  
    1919class DynamicLoader : public Factory
    2020{
    21   NewObjectListDeclaration(DynamicLoader);
     21  ObjectListDeclaration(DynamicLoader);
    2222
    2323public:

  • branches/new_class_id/src/lib/util/loading/factory.cc

    r9712 r9715  
    1919//#include "shell_command.h"
    2020
    21 NewObjectListDefinition(Factory);
     21ObjectListDefinition(Factory);
    2222
    2323//SHELL_COMMAND(create, Factory, fabricate);
    … …  
    2828 * set everything to zero and define factoryName
    2929 */
    30 Factory::Factory (const NewClassID& classID)
     30Factory::Factory (const ClassID& classID)
    3131    : _classID(classID)
    3232{
    … …  
    140140 * @returns a new Object of Type classID on match, NULL otherwise
    141141 */
    142 BaseObject* Factory::fabricate(const NewClassID& classID)
     142BaseObject* Factory::fabricate(const ClassID& classID)
    143143{
    144144  if (Factory::_factoryList == NULL)

  • branches/new_class_id/src/lib/util/loading/factory.h

    r9709 r9715  
    3939class Factory : public BaseObject
    4040{
    41   NewObjectListDeclaration(Factory);
     41  ObjectListDeclaration(Factory);
    4242public:
    4343  virtual ~Factory ();
    … …  
    4646
    4747  static  BaseObject* fabricate(const std::string& className);
    48   static  BaseObject* fabricate(const NewClassID& classID);
     48  static  BaseObject* fabricate(const ClassID& classID);
    4949  static  BaseObject* fabricate(const TiXmlElement* root);
    5050
    … …  
    5252  bool operator==(int classID) const;
    5353  bool operator==(const std::string& className) const;
    54   bool operator==(const NewClassID& classID) const { return _classID == classID; };
     54  bool operator==(const ClassID& classID) const { return _classID == classID; };
    5555
    5656protected:
    57   Factory (const NewClassID& id);
     57  Factory (const ClassID& id);
    5858  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
    5959
    … …  
    6262
    6363protected:
    64   const NewClassID              _classID;              //!< The Class-Identifyer of the Factory.
     64  const ClassID              _classID;              //!< The Class-Identifyer of the Factory.
    6565  static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
    6666};
    … …  
    7878   * @param classID the ID of the Class to be created.
    7979   */
    80   tFactory (const NewClassID& classID)
     80  tFactory (const ClassID& classID)
    8181      : Factory(classID)
    8282  {  }

  • branches/new_class_id/src/lib/util/loading/fast_factory.cc

    r9709 r9715  
    2222
    2323
    24 NewObjectListDefinition(FastFactory);
     24ObjectListDefinition(FastFactory);
    2525
    2626/**
    … …  
    3030 * @return a new FastFactory
    3131 */
    32 FastFactory::FastFactory (const NewClassID& classID, const std::string& fastFactoryName)
     32FastFactory::FastFactory (const ClassID& classID, const std::string& fastFactoryName)
    3333{
    3434  this->registerObject(this, FastFactory::_objectList);
    … …  
    9898 * @returns true if found, false otherwise.
    9999 */
    100 FastFactory* FastFactory::searchFastFactory(const NewClassID& classID)
     100FastFactory* FastFactory::searchFastFactory(const ClassID& classID)
    101101{
    102102  if (FastFactory::first == NULL)
    … …  
    229229 * @return the Object to resurrect, NULL if classID is not found.
    230230 */
    231 BaseObject* FastFactory::resurrect(const NewClassID& classID)
     231BaseObject* FastFactory::resurrect(const ClassID& classID)
    232232{
    233233  FastFactory* tmpFac = FastFactory::getFirst();

  • branches/new_class_id/src/lib/util/loading/fast_factory.h

    r9709 r9715  
    6060class FastFactory : public BaseObject
    6161{
    62   NewObjectListDeclaration(FastFactory);
     62  ObjectListDeclaration(FastFactory);
    6363
    6464public:
    … …  
    6868  // functions to push and pop elements of this class
    6969  BaseObject* resurrect();
    70   static BaseObject* resurrect(const NewClassID& classID);
     70  static BaseObject* resurrect(const ClassID& classID);
    7171  void kill(BaseObject* object);
    7272  static void kill(BaseObject* object, bool searchForFastFactory);
    … …  
    8080  inline static FastFactory* getFirst() { return FastFactory::first; };
    8181
    82   static FastFactory* searchFastFactory(const NewClassID& classID);
     82  static FastFactory* searchFastFactory(const ClassID& classID);
    8383  static FastFactory* searchFastFactory(const std::string& fastFactoryName);
    8484
    85   const NewClassID& getStoredID() const { return this->storedClassID; };
     85  const ClassID& getStoredID() const { return this->storedClassID; };
    8686
    8787protected:
    88   FastFactory (const NewClassID& classID, const std::string& fastFactoryName = "");
     88  FastFactory (const ClassID& classID, const std::string& fastFactoryName = "");
    8989
    9090  /** sets the Next factory in the list @param nextFactory the next factory */
    … …  
    100100
    101101protected:
    102   NewClassID            storedClassID;        //!< The classID of the specified class.
     102  ClassID            storedClassID;        //!< The classID of the specified class.
    103103  unsigned int          storedDeadObjects;    //!< How many dead objects are stored in this class
    104104
    … …  
    122122{
    123123public:
    124   static tFastFactory<T>* getFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
     124  static tFastFactory<T>* getFastFactory(const ClassID& classID, const std::string& fastFactoryName);
    125125
    126126private:
    127   tFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
     127  tFastFactory(const ClassID& classID, const std::string& fastFactoryName);
    128128
    129129  virtual void fabricate();
    … …  
    137137 */
    138138template<class T>
    139 tFastFactory<T>::tFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
     139tFastFactory<T>::tFastFactory(const ClassID& classID, const std::string& fastFactoryName)
    140140    : FastFactory(classID, fastFactoryName)
    141141{}
    … …  
    148148 */
    149149template<class T>
    150 tFastFactory<T>* tFastFactory<T>::getFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
     150tFastFactory<T>* tFastFactory<T>::getFastFactory(const ClassID& classID, const std::string& fastFactoryName)
    151151{
    152152  tFastFactory<T>* tmpFac = NULL;

  • branches/new_class_id/src/lib/util/loading/game_loader.cc

    r9684 r9715  
    2828#include "key_mapper.h"
    2929
    30 NewObjectListDefinition(GameLoader);
     30ObjectListDefinition(GameLoader);
    3131
    3232

  • branches/new_class_id/src/lib/util/loading/game_loader.h

    r9684 r9715  
    3838class GameLoader : public EventListener
    3939{
    40   NewObjectListDeclaration(GameLoader);
     40  ObjectListDeclaration(GameLoader);
    4141  public:
    4242  virtual ~GameLoader ();

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

    r9714 r9715  
    3737  {
    3838  public:
    39     Type(const NewClassID& classID) : _classID(classID) { };
     39    Type(const ClassID& classID) : _classID(classID) { };
    4040
    4141    void addExtension(const std::string& extension);
    4242
    4343  private:
    44     const NewClassID&                _classID;
     44    const ClassID&                _classID;
    4545    std::vector<std::string>      _resourcePaths;
    4646    std::vector<std::string>      _resourceSubPaths;
    … …  
    7373  unsigned int      referenceCount;    //!< How many times this Resource has been loaded.
    7474  /// TODO REMOVE THIS:   ResourceType      type;              //!< ResourceType of this Resource.
    75   ResourcePriority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
     75  Resource::Priority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
    7676
    7777  MultiType         param[3];          //!< The Parameters given to this Resource.

  • branches/new_class_id/src/lib/util/loading/resource_manager.cc

    r9684 r9715  
    5050#include <unistd.h>
    5151
    52 NewObjectListDefinition(ResourceManager);
     52ObjectListDefinition(ResourceManager);
    5353
    5454/**

  • branches/new_class_id/src/lib/util/loading/resource_manager.h

    r9684 r9715  
    9494class ResourceManager : public BaseObject
    9595{
    96   NewObjectListDeclaration(ResourceManager);
     96  ObjectListDeclaration(ResourceManager);
    9797public:
    9898  virtual ~ResourceManager();

  • branches/new_class_id/src/lib/util/preferences.cc

    r9684 r9715  
    2020#include "debug.h"
    2121
    22 NewObjectListDefinition(Preferences);
     22ObjectListDefinition(Preferences);
    2323
    2424/**

  • branches/new_class_id/src/lib/util/preferences.h

    r9684 r9715  
    2929//! A default singleton class.
    3030class Preferences : public BaseObject {
    31   NewObjectListDeclaration(Preferences);
     31  ObjectListDeclaration(Preferences);
    3232 public:
    3333   virtual ~Preferences(void);
Note: See TracChangeset for help on using the changeset viewer.