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

1 files changed, 28 insertions, 28 deletions

diff --git a/src/FbTk/LogicCommands.hh b/src/FbTk/LogicCommands.hh
index 96d648e..5e84473 100644
--- a/src/FbTk/LogicCommands.hh
+++ b/src/FbTk/LogicCommands.hh
@@ -30,66 +30,66 @@
 
 namespace FbTk {
 
-/// executes a boolcommand and uses the result to decide what to do
-class IfCommand: public Command {
+/// executes a Command<bool> and uses the result to decide what to do
+class IfCommand: public Command<void> {
 public:
-    IfCommand(RefCount<BoolCommand> &cond,
-              RefCount<Command> &t, RefCount<Command> &f):
+    IfCommand(RefCount<Command<bool> > &cond,
+              RefCount<Command<void> > &t, RefCount<Command<void> > &f):
         m_cond(cond), m_t(t), m_f(f) { }
     void execute() {
-        if (m_cond->bool_execute()) {
+        if (m_cond->execute()) {
             if (*m_t) m_t->execute();
         } else
             if (*m_f) m_f->execute();
     }
-    static Command *parse(const std::string &cmd, const std::string &args,
+    static Command<void> *parse(const std::string &cmd, const std::string &args,
                           bool trusted);
 private:
-    RefCount<BoolCommand> m_cond;
-    RefCount<Command> m_t, m_f;
+    RefCount<Command<bool> > m_cond;
+    RefCount<Command<void> > m_t, m_f;
 };
 
-/// executes a list of boolcommands until one is true
-class OrCommand: public BoolCommand {
+/// executes a list of Command<bool>s until one is true
+class OrCommand: public Command<bool> {
 public:
-    void add(RefCount<BoolCommand> &com);
+    void add(RefCount<Command<bool> > &com);
     size_t size() const;
-    bool bool_execute();
+    bool execute();
 
 private:
-    std::vector<RefCount<BoolCommand> > m_commandlist;
+    std::vector<RefCount<Command<bool> > > m_commandlist;
 };
 
-/// executes a list of boolcommands until one is false
-class AndCommand: public BoolCommand {
+/// executes a list of Command<bool>s until one is false
+class AndCommand: public Command<bool> {
 public:
-    void add(RefCount<BoolCommand> &com);
+    void add(RefCount<Command<bool> > &com);
     size_t size() const;
-    bool bool_execute();
+    bool execute();
 
 private:
-    std::vector<RefCount<BoolCommand> > m_commandlist;
+    std::vector<RefCount<Command<bool> > > m_commandlist;
 };
 
-/// executes a list of boolcommands, returning the parity
-class XorCommand: public BoolCommand {
+/// executes a list of Command<bool>s, returning the parity
+class XorCommand: public Command<bool> {
 public:
-    void add(RefCount<BoolCommand> &com);
+    void add(RefCount<Command<bool> > &com);
     size_t size() const;
-    bool bool_execute();
+    bool execute();
 
 private:
-    std::vector<RefCount<BoolCommand> > m_commandlist;
+    std::vector<RefCount<Command<bool> > > m_commandlist;
 };
 
-/// executes a boolcommand and returns the negation
-class NotCommand: public BoolCommand {
+/// executes a Command<bool> and returns the negation
+class NotCommand: public Command<bool> {
 public:
-    NotCommand(RefCount<BoolCommand> &com): m_command(com) { }
-    bool bool_execute() { return !m_command->bool_execute(); }
+    NotCommand(RefCount<Command<bool> > &com): m_command(com) { }
+    bool execute() { return !m_command->execute(); }
 
 private:
-    RefCount<BoolCommand> m_command;
+    RefCount<Command<bool> > m_command;
 };
 
 } // end namespace FbTk