Changeset 4020 in orxonox.OLD for orxonox/trunk

Timestamp:

May 3, 2005, 12:48:25 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: renaming from factory→className → factory→factoryName

Location:

orxonox/trunk/src

Files:

• factory.cc (modified) (3 diffs)
• factory.h (modified) (2 diffs)
• game_loader.cc (modified) (1 diff)
• lib/graphics/importer/model.cc (modified) (1 diff)

orxonox/trunk/src/factory.cc

@@ -28 +28 @@
    \brief constructor
    
-   set everything to zero and define classname
+   set everything to zero and define factoryName
 */
 Factory::Factory (const char* name)
 {
-  this->classname = NULL;
-  this->setClassname(name);
+  this->factoryName = NULL;
+  this->setFactoryName(name);
   next = NULL;
   
@@ -46 +46 @@
 Factory::~Factory ()
 {
-  //  printf("%s\n", this->classname);
+  //  printf("%s\n", this->factoryName);
   //  Factory* tmpDel = this->next;
   //  this->next = NULL;
@@ -53 +53 @@
 }
 
-void Factory::setClassname(const char* name)
+void Factory::setFactoryName(const char* name)
 {
-  if (classname)
-    delete classname;
-  classname = new char[strlen(name)+1];
-  strcpy(classname, name);
+  if (factoryName)
+    delete factoryName;
+  factoryName = new char[strlen(name)+1];
+  strcpy(factoryName, name);
 }
 

orxonox/trunk/src/factory.h

@@ -33 +33 @@
   void initialize();
   void registerFactory( Factory* factory);
-  void setClassname(const char* name);
-  const char* getClassname() {return classname;};
+  void setFactoryName(const char* name);
+  const char* getFactoryName() {return factoryName;};
   void setNext( Factory* factory) {next = factory;}
   Factory* getNext() {return next;}
         
  private:
-  char* classname;
+  char* factoryName;
         
   Factory* next;
@@ -68 +68 @@
 BaseObject* tFactory<T>::fabricate( TiXmlElement* root) 
 { 
-  if(!strcmp(root->Value(), getClassname()))
+  if(!strcmp(root->Value(), getFactoryName()))
     return new T ( root);
   else if( getNext() != NULL) 

orxonox/trunk/src/game_loader.cc

@@ -279 +279 @@
         assert( factory != NULL);
         
-        PRINTF0("Registered factory for '%s'\n", factory->getClassname());
+        PRINTF0("Registered factory for '%s'\n", factory->getFactoryName());
         
         if( first == NULL) first = factory;

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -211 +211 @@
 {
   if (this->name) 
-    delete this->name;
+    delete []this->name;
   if (name)
     {