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

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

Files:

• shell.cc (modified) (1 diff)
• shell.h (modified) (1 diff)
• shell_command.cc (modified) (2 diffs)
• shell_command.h (modified) (1 diff)
• shell_command_class.cc (modified) (1 diff)
• shell_command_class.h (modified) (2 diffs)
• shell_completion.cc (modified) (5 diffs)
• shell_completion.h (modified) (2 diffs)
• shell_input.cc (modified) (1 diff)
• shell_input.h (modified) (1 diff)

branches/new_class_id/src/lib/shell/shell.cc

@@ -54 +54 @@
   ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
 
-  NewObjectListDefinition(Shell);
+  ObjectListDefinition(Shell);
 
   /**

branches/new_class_id/src/lib/shell/shell.h

@@ -48 +48 @@
   class Shell : public Element2D, public EventListener
   {
-    NewObjectListDeclaration(Shell);
+    ObjectListDeclaration(Shell);
   public:
     Shell();

branches/new_class_id/src/lib/shell/shell_command.cc

@@ -26 +26 @@
 namespace OrxShell
 {
-  NewObjectListDefinition(ShellCommand);
+  ObjectListDefinition(ShellCommand);
   SHELL_COMMAND(debug, ShellCommandClass, help);
 
@@ -241 +241 @@
       return false;
 
-    const NewObjectListBase* const objectList = NewObjectListBase::getObjectList(cmd->shellClass->getName());
+    const ObjectListBase* const objectList = ObjectListBase::getObjectList(cmd->shellClass->getName());
     if (objectList != NULL)
     {
-      NewObjectListBase::base_list list;
+      ObjectListBase::base_list list;
       objectList->getBaseObjectList(&list);
-      NewObjectListBase::base_iterator it;
+      ObjectListBase::base_iterator it;
 
       // No Description given (only for speedup)

branches/new_class_id/src/lib/shell/shell_command.h

@@ -58 +58 @@
   class ShellCommand : public BaseObject
   {
-    NewObjectListDeclaration(ShellCommand);
+    ObjectListDeclaration(ShellCommand);
 
     friend class ShellCommandClass;

branches/new_class_id/src/lib/shell/shell_command_class.cc

@@ -27 +27 @@
 namespace OrxShell
 {
-  NewObjectListDefinition(ShellCommandClass);
+  ObjectListDefinition(ShellCommandClass);
 
   CmdClassList* ShellCommandClass::_commandClassList = NULL;

branches/new_class_id/src/lib/shell/shell_command_class.h

@@ -25 +25 @@
   class ShellCommandClass : public BaseObject
   {
-    NewObjectListDeclaration(ShellCommandClass);
+    ObjectListDeclaration(ShellCommandClass);
 
     friend class ShellCommand;
@@ -36 +36 @@
     static void unregisterAllCommands();
     static ShellCommandClass* getCommandClass(const std::string& className);
-    NewClassID getClassID();
+    ClassID getClassID();
     static bool exists(const std::string& className);
 

branches/new_class_id/src/lib/shell/shell_completion.cc

@@ -50 +50 @@
   bool ShellCompletion::autoComplete(std::string& input)
   {
-    NewClassID classID;
-    const NewObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
+    ClassID classID;
+    const ObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
     bool emptyComplete = false;                      //< if the completion input is empty string. e.g ""
     long completeType = NullCompletion;              //< the Type we'd like to complete.
@@ -84 +84 @@
              (!emptyComplete && inputSplits.size() == 2))
     {
-      objectList = NewObjectListBase::getObjectList(inputSplits[0]);
+      objectList = ObjectListBase::getObjectList(inputSplits[0]);
       if (objectList != NULL)
         classID = objectList->identity();
@@ -95 +95 @@
              (!emptyComplete && inputSplits.size() == 3))
     {
-      if (NewObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
+      if (ObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
         completeType |= FunctionCompletion;
     }
@@ -133 +133 @@
    * @return true on success, false otherwise
    */
-  bool ShellCompletion::objectComplete(const std::string& objectBegin, const NewObjectListBase* objectList)
+  bool ShellCompletion::objectComplete(const std::string& objectBegin, const ObjectListBase* objectList)
   {
     assert (objectList != NULL);
@@ -141 +141 @@
       type = ClassCompletion;
 
-    NewObjectListBase::base_list list;
+    ObjectListBase::base_list list;
     objectList->getBaseObjectList(&list);
 

branches/new_class_id/src/lib/shell/shell_completion.h

@@ -16 +16 @@
 // FORWARD DECLARATION
 class BaseObject;
-class NewObjectListBase;
+class ObjectListBase;
 
 namespace OrxShell
@@ -54 +54 @@
 
     private:
-      bool objectComplete(const std::string& objectBegin, const NewObjectListBase* const objectList);
+      bool objectComplete(const std::string& objectBegin, const ObjectListBase* const objectList);
       bool commandComplete(const std::string& commandBegin, const std::string& className);
       bool aliasComplete(const std::string& aliasBegin);

branches/new_class_id/src/lib/shell/shell_input.cc

@@ -32 +32 @@
   ->setAlias("help");
 
-  NewObjectListDefinition(ShellInput);
+  ObjectListDefinition(ShellInput);
 
   /**

branches/new_class_id/src/lib/shell/shell_input.h

@@ -30 +30 @@
   class ShellInput : public Text,  public EventListener
   {
-    NewObjectListDeclaration(ShellInput);
+    ObjectListDeclaration(ShellInput);
 
   public: