Remove commented out code

[command.git] / include / callable.h

diff --git a/include/callable.h b/include/callable.h
index bf74377de5ebe5e7823cefdaf873adfb9e2a3953..efff3e8d88b2d1d0fbe36668a6798e85acc47128 100644 (file)
--- a/include/callable.h
+++ b/include/callable.h
@@ -2,18 +2,19 @@
 #define __COMMAND_CALLABLE_H
 
 #include <string>
+#include <functional>
 
 namespace command {
     /**
      * Callable behaviour class.
      */
-    template<typename ArgumentType>
+    template<typename ParameterType>
     class Callable {
     protected:
         /**
          * Function handling user Arguments
          */
-        void (*func)(ArgumentType);
+        std::function<void(ParameterType)> func;
 
     public:
         /**
@@ -21,9 +22,10 @@ namespace command {
          *
          * @param function Function that will be invoked
          */
-        Callable(void (*function)(ArgumentType))
+        Callable(std::function<void(ParameterType)> function)
             : func(function) {
         }
+
         virtual ~Callable() { }
 
     protected:
@@ -32,7 +34,7 @@ namespace command {
          *
          * @param value Value passed to program argument
          */
-        void call(ArgumentType value) {
+        void call(ParameterType value) {
             this->func(value);
         }
     };
@@ -47,7 +49,7 @@ namespace command {
         /**
          * Function handling user Arguments
          */
-        void (*func)(void);
+        std::function<void(void)> func;
 
     public:
         /**
@@ -55,9 +57,10 @@ namespace command {
          *
          * @param function Function that will be invoked
          */
-        Callable(void (*function)(void))
+        Callable(std::function<void(void)> function)
             : func(function) {
         }
+
         virtual ~Callable() { }
 
     protected: