Changeset 7200 for code/branches/consolecommands3/src/libraries/core/Executor.h

Timestamp:

Aug 22, 2010, 12:27:53 AM (14 years ago)

Author:

landauf

Message:

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

File:

• code/branches/consolecommands3/src/libraries/core/Executor.h (modified) (5 diffs)

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

@@ -81 +81 @@
                 { return this->name_; }
 
-            Executor& setDefaultValues(const MultiType& param1);
-            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2);
-            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3);
-            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4);
-            Executor& setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5);
-            Executor& setDefaultValue(unsigned int index, const MultiType& param);
+            void setDefaultValues(const MultiType& param1);
+            void setDefaultValues(const MultiType& param1, const MultiType& param2);
+            void setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3);
+            void setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4);
+            void setDefaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5);
+            void setDefaultValue(unsigned int index, const MultiType& param);
 
             inline MultiType getDefaultValue(unsigned int index) const
@@ -169 +169 @@
 
                 this->functorMember_->setObject(object);
-                const MultiType& result = Executor::parse(params, success, delimiter);
+                const MultiType& result = this->Executor::parse(params, success, delimiter);
                 this->functorMember_->setObjects(objects);
 
@@ -180 +180 @@
 
                 this->functorMember_->setObject(object);
-                const MultiType& result = Executor::parse(params, success, delimiter);
+                const MultiType& result = this->Executor::parse(params, success, delimiter);
                 this->functorMember_->setObjects(objects);
 
@@ -190 +190 @@
     };
 
-    inline Executor* createExecutor(const FunctorPtr& functor, const std::string& name = "")
+    inline ExecutorPtr createExecutor(const FunctorPtr& functor, const std::string& name = "")
     {
         return new Executor(functor, name);
@@ -196 +196 @@
 
     template <class T>
-    inline ExecutorMember<T>* createExecutor(const FunctorMemberPtr<T>& functor, const std::string& name = "")
+    inline ExecutorMemberPtr<T> createExecutor(const FunctorMemberPtr<T>& functor, const std::string& name = "")
     {
         return new ExecutorMember<T>(functor, name);
     }
 
-    inline ExecutorStatic* createExecutor(const FunctorStaticPtr& functor, const std::string& name = "")
+    inline ExecutorStaticPtr createExecutor(const FunctorStaticPtr& functor, const std::string& name = "")
     {
         return new ExecutorStatic(functor, name);