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

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.h (modified) (7 diffs)

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

@@ -88 +88 @@
     {
         public:
-            ConsoleCommand(Functor* functor, const std::string& name = "");
+            ConsoleCommand(const FunctorPtr& functor, const std::string& name = "");
 
             ConsoleCommand& description(const std::string& description);
@@ -159 +159 @@
     };
 
-    inline ConsoleCommand* createConsoleCommand(Functor* functor, const std::string& name = "")
+    inline ConsoleCommand* createConsoleCommand(const FunctorPtr& functor, const std::string& name = "")
     {
         return new ConsoleCommand(functor, name);
@@ -212 +212 @@
                     inline _ConsoleCommandManipulator& setFunction(F function, O* object, bool bForce = false)
                         { if (this->command_) { this->command_->setFunctor(createFunctor(function, object), bForce); } return *this; }
-                    inline _ConsoleCommandManipulator& setFunction(Functor* functor, bool bForce = false)
+                    inline _ConsoleCommandManipulator& setFunction(const FunctorPtr& functor, bool bForce = false)
                         { if (this->command_) { this->command_->setFunctor(functor, bForce); } return *this; }
 
@@ -221 +221 @@
                     inline _ConsoleCommandManipulator& pushFunction(F function, O* object, bool bForce = false)
                         { if (this->command_) { this->command_->pushFunctor(createFunctor(function, object), bForce); } return *this; }
-                    inline _ConsoleCommandManipulator& pushFunction(Functor* functor, bool bForce = false)
+                    inline _ConsoleCommandManipulator& pushFunction(const FunctorPtr& functor, bool bForce = false)
                         { if (this->command_) { this->command_->pushFunctor(functor, bForce); } return *this; }
 
@@ -245 +245 @@
 
         public:
-            _ConsoleCommand(const std::string& group, const std::string& name, Functor* functor, bool bInitialized = true);
+            _ConsoleCommand(const std::string& group, const std::string& name, const FunctorPtr& functor, bool bInitialized = true);
 
             _ConsoleCommand& addShortcut();
@@ -271 +271 @@
             static void registerCommand(const std::string& group, const std::string& name, _ConsoleCommand* command);
 
-            bool setFunctor(Functor* functor, bool bForce = false);
-            void pushFunctor(Functor* functor, bool bForce = false);
+            bool setFunctor(const FunctorPtr& functor, bool bForce = false);
+            void pushFunctor(const FunctorPtr& functor, bool bForce = false);
             void popFunctor();
-            Functor* getFunctor() const;
-
-            bool functionHeaderMatches(Functor* functor) const;
+            const FunctorPtr& getFunctor() const;
+
+            bool functionHeaderMatches(const FunctorPtr& functor) const;
 
             void setObject(void* object);
@@ -286 +286 @@
             bool bInitialized_;
             const std::type_info& functionHeader_;
-            std::stack<Functor*> functorStack_;
+            std::stack<FunctorPtr> functorStack_;
             std::stack<void*> objectStack_;
     };
 
-    inline _ConsoleCommand* _createConsoleCommand(const std::string& name, Functor* functor, bool bInitialized = true)
+    inline _ConsoleCommand* _createConsoleCommand(const std::string& name, const FunctorPtr& functor, bool bInitialized = true)
     {
         return new _ConsoleCommand("", name, functor, bInitialized);
     }
 
-    inline _ConsoleCommand* _createConsoleCommand(const std::string& group, const std::string& name, Functor* functor, bool bInitialized = true)
+    inline _ConsoleCommand* _createConsoleCommand(const std::string& group, const std::string& name, const FunctorPtr& functor, bool bInitialized = true)
     {
         return new _ConsoleCommand(group, name, functor, bInitialized);