make FbTk::Command a template class, split parsing information out of ObjectRegistry

1 files changed, 2 insertions, 14 deletions

diff --git a/src/FbTk/SimpleCommand.hh b/src/FbTk/SimpleCommand.hh
index 7ae91a5..1c4c39a 100644
--- a/src/FbTk/SimpleCommand.hh
+++ b/src/FbTk/SimpleCommand.hh
@@ -26,9 +26,9 @@
 
 namespace FbTk {
 
-/// a simple command 
+/// a simple command
 template <typename Receiver, typename ReturnType=void>
-class SimpleCommand: public Command {
+class SimpleCommand: public Command<ReturnType> {
 public:
     typedef ReturnType (Receiver::* Action)();
     SimpleCommand(Receiver &r, Action a):
@@ -39,18 +39,6 @@ private:
     Action m_action;
 };
 
-template <typename Receiver, typename ReturnType=bool>
-class SimpleBoolCommand: public BoolCommand {
-public:
-    typedef ReturnType (Receiver::* Action)();
-    SimpleBoolCommand(Receiver &r, Action a):
-        m_receiver(r), m_action(a) { }
-    bool bool_execute() { return (bool)(m_receiver.*m_action)(); }
-private:
-    Receiver &m_receiver;
-    Action m_action;
-};
-
 } // end namespace FbTk
 
 #endif // FBTK_SIMPLECOMMAND_HH