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

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/script_engine

Files:

• script.cc (modified) (2 diffs)
• script.h (modified) (1 diff)
• script_class.cc (modified) (1 diff)
• script_class.h (modified) (3 diffs)
• script_manager.cc (modified) (1 diff)

branches/new_class_id/src/lib/script_engine/script.cc

@@ -23 +23 @@
 #include "parser/tinyxml/tinyxml.h"
 
-NewObjectListDefinition(Script);
+ObjectListDefinition(Script);
 
 CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
@@ -155 +155 @@
      }
 
-     BaseObject* object = NewObjectListBase::getBaseObject(objectName, className);
+     BaseObject* object = ObjectListBase::getBaseObject(objectName, className);
     // printf(("%s is at %p \n",objectName.c_str(),object);
      if (object != NULL && !objectIsAdded(objectName))

branches/new_class_id/src/lib/script_engine/script.h

@@ -22 +22 @@
 class Script : public BaseObject
 {
-  NewObjectListDeclaration(Script);
+  ObjectListDeclaration(Script);
   public:
     Script(const TiXmlElement* root = NULL);

branches/new_class_id/src/lib/script_engine/script_class.cc

@@ -19 +19 @@
 #include <cassert>
 
-NewObjectListDefinition(ScriptClass);
+ObjectListDefinition(ScriptClass);
 /**
  * @brief standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-ScriptClass::ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods)
+ScriptClass::ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods)
     : BaseObject(name), _classID(classID)
 {

branches/new_class_id/src/lib/script_engine/script_class.h

@@ -25 +25 @@
 class ScriptClass : public BaseObject
 {
-  NewObjectListDeclaration(ScriptClass);
+  ObjectListDeclaration(ScriptClass);
 
 public:
@@ -37 +37 @@
 
 protected:
-  ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods);
+  ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods);
 
 private:
-  NewClassID          _classID;
+  ClassID          _classID;
   ScriptMethod*       _scriptMethods;
 };
@@ -51 +51 @@
 {
 public:
-  tScriptClass(const std::string& name, NewClassID classID, ScriptMethod* scriptMethods)
+  tScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
       : ScriptClass(name, classID, scriptMethods)
   { }

branches/new_class_id/src/lib/script_engine/script_manager.cc

@@ -97 +97 @@
 Script* ScriptManager::getScriptByFile(const std::string& file)
 {
-  for (NewObjectList<Script>::const_iterator it = Script::objectList().begin();
+  for (ObjectList<Script>::const_iterator it = Script::objectList().begin();
        it != Script::objectList().end();
        ++it)