Changeset 7198 for code/branches/consolecommands3/src/libraries/core/ConsoleCommand.cc

Timestamp:

Aug 21, 2010, 9:52:13 PM (15 years ago)

Author:

landauf

Message:

createFunctor() now returns a SharedPtr instead of a pointer. Adapted code that uses createFunctor() accordingly.

File:

• code/branches/consolecommands3/src/libraries/core/ConsoleCommand.cc (modified) (9 diffs)

code/branches/consolecommands3/src/libraries/core/ConsoleCommand.cc

@@ -34 +34 @@
 namespace orxonox
 {
-    ConsoleCommand::ConsoleCommand(Functor* functor, const std::string& name) : Executor(functor, name)
+    ConsoleCommand::ConsoleCommand(const FunctorPtr& functor, const std::string& name) : Executor(functor, name)
     {
         this->accessLevel_ = AccessLevel::None;
@@ -124 +124 @@
     _ConsoleCommand::_ConsoleCommandManipulator test(_ModifyConsoleCommand("BaseObject", "setName").setFunction(&BaseObject::setActive));
 
-    _ConsoleCommand::_ConsoleCommand(const std::string& group, const std::string& name, Functor* functor, bool bInitialized) : Executor(functor, name), functionHeader_(functor->getHeaderIdentifier())
+    _ConsoleCommand::_ConsoleCommand(const std::string& group, const std::string& name, const FunctorPtr& functor, bool bInitialized) : Executor(functor, name), functionHeader_(functor->getHeaderIdentifier())
     {
         this->bActive_ = true;
@@ -155 +155 @@
     }
 
-    bool _ConsoleCommand::setFunctor(Functor* functor, bool bForce)
+    bool _ConsoleCommand::setFunctor(const FunctorPtr& functor, bool bForce)
     {
         if (!functor)
@@ -174 +174 @@
     }
 
-    void _ConsoleCommand::pushFunctor(Functor* functor, bool bForce)
-    {
-        Functor* oldfunctor = this->getFunctor();
+    void _ConsoleCommand::pushFunctor(const FunctorPtr& functor, bool bForce)
+    {
+        const FunctorPtr& oldfunctor = this->getFunctor();
 
         if (this->setFunctor(functor, bForce));
@@ -184 +184 @@
     void _ConsoleCommand::popFunctor()
     {
-        Functor* newfunctor = 0;
+        FunctorPtr newfunctor;
         if (!this->functorStack_.empty())
         {
@@ -193 +193 @@
     }
 
-    Functor* _ConsoleCommand::getFunctor() const
-    {
-        if (this->bInitialized_)
+    const FunctorPtr& _ConsoleCommand::getFunctor() const
+    {
+//        if (this->bInitialized_) // FIXME
             return this->functor_;
-        else
-            return 0;
-    }
-
-    bool _ConsoleCommand::functionHeaderMatches(Functor* functor) const
+//        else
+//            return 0;
+    }
+
+    bool _ConsoleCommand::functionHeaderMatches(const FunctorPtr& functor) const
     {
         if (!this->functor_)
@@ -216 +216 @@
             this->functor_->setRawObjectPointer(object);
         else if (object)
-            COUT(0) << "Error: Can't set object in console command \"" << this->getName() << "\", no functor set." << std::endl;
+            COUT(1) << "Error: Can't set object in console command \"" << this->getName() << "\", no functor set." << std::endl;
     }
 
@@ -227 +227 @@
         }
         else
-            COUT(0) << "Error: Can't set object in console command \"" << this->getName() << "\", no functor set." << std::endl;
+            COUT(1) << "Error: Can't set object in console command \"" << this->getName() << "\", no functor set." << std::endl;
     }
 
@@ -263 +263 @@
         {
             if (group == "")
-                COUT(0) << "Error: Couldn't find console command with shortcut \"" << name << "\"" << std::endl;
+                COUT(1) << "Error: Couldn't find console command with shortcut \"" << name << "\"" << std::endl;
             else
-                COUT(0) << "Error: Couldn't find console command with group \"" << group << "\" and name \"" << name << "\"" << std::endl;
+                COUT(1) << "Error: Couldn't find console command with group \"" << group << "\" and name \"" << name << "\"" << std::endl;
         }
         return 0;