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

Timestamp:

Aug 22, 2006, 2:36:54 PM (18 years ago)

Author:

bensch

Message:

new_class_id: many more classes done

Location:

branches/new_class_id/src/lib/util/loading

Files:

• factory.cc (modified) (8 diffs)
• factory.h (modified) (1 diff)

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

@@ -29 +29 @@
  */
 Factory::Factory (const std::string& factoryName, int classID)
-    : classID(classID), className(factoryName)
+    : _classID(classID), _className(factoryName)
 {
   this->registerObject(this, Factory::_objectList);
   this->setName(factoryName);
 
-  if( Factory::factoryList == NULL)
-    Factory::factoryList = new std::list<Factory*>;
+  if( Factory::_factoryList == NULL)
+    Factory::_factoryList = new std::list<Factory*>;
 
-  Factory::factoryList->push_back(this);
+  Factory::_factoryList->push_back(this);
 }
 
 /** @brief a reference to the First Factory */
-std::list<Factory*>* Factory::factoryList = NULL;
+std::list<Factory*>* Factory::_factoryList = NULL;
 
 /**
@@ -58 +58 @@
 void Factory::deleteFactories()
 {
-  if (Factory::factoryList != NULL)
+  if (Factory::_factoryList != NULL)
   {
-    while(!Factory::factoryList->empty())
+    while(!Factory::_factoryList->empty())
     {
-      delete Factory::factoryList->front();
-      Factory::factoryList->pop_front();
+      delete Factory::_factoryList->front();
+      Factory::_factoryList->pop_front();
     }
-    delete Factory::factoryList;
-    Factory::factoryList = NULL;
+    delete Factory::_factoryList;
+    Factory::_factoryList = NULL;
   }
 }
@@ -76 +76 @@
 bool Factory::operator==(int classID) const
 {
-  return (this->classID == classID);
+  return (this->_classID == classID);
 }
 
@@ -86 +86 @@
 bool Factory::operator==(const char* className) const
 {
-  return (className != NULL && this->className == className);
+  return (className != NULL && this->_className == className);
 }
 
@@ -96 +96 @@
 bool Factory::operator==(const std::string& className) const
 {
-  return (this->className == className);
+  return (this->_className == className);
 }
 
@@ -107 +107 @@
 BaseObject* Factory::fabricate(const TiXmlElement* root)
 {
-  assert (root != NULL && Factory::factoryList != NULL);
+  assert (root != NULL && Factory::_factoryList != NULL);
 
   std::list<Factory*>::const_iterator factory;
-  for (factory = Factory::factoryList->begin(); factory != Factory::factoryList->end(); factory++)
+  for (factory = Factory::_factoryList->begin(); factory != Factory::_factoryList->end(); factory++)
     if (*(*factory) == root->Value())
     {
@@ -129 +129 @@
 BaseObject* Factory::fabricate(const std::string& className)
 {
-  if (Factory::factoryList == NULL)
+  if (Factory::_factoryList == NULL)
     return NULL;
 
   std::list<Factory*>::const_iterator factory;
-  for (factory = Factory::factoryList->begin(); factory != Factory::factoryList->end(); factory++)
+  for (factory = Factory::_factoryList->begin(); factory != Factory::_factoryList->end(); factory++)
     if (*(*factory) == className)
     {
@@ -151 +151 @@
 BaseObject* Factory::fabricate(int classID)
 {
-  if (Factory::factoryList == NULL)
+  if (Factory::_factoryList == NULL)
     return NULL;
 
   std::list<Factory*>::const_iterator factory;
-  for (factory = Factory::factoryList->begin(); factory != Factory::factoryList->end(); factory++)
+  for (factory = Factory::_factoryList->begin(); factory != Factory::_factoryList->end(); factory++)
     if (*(*factory) == classID)
     {

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

@@ -60 +60 @@
 
 protected:
-  const int                     classID;              //!< The Class-Identifyer of the Factory.
-  const std::string             className;            //!< The name of the Class.
-  static std::list<Factory*>*   factoryList;          //!< List of Registered Factories
+  const int                     _classID;              //!< The Class-Identifyer of the Factory.
+  const std::string             _className;            //!< The name of the Class.
+  static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
 };