aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/MacroCommand.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2007-12-16 03:36:01 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2007-12-16 03:36:01 (GMT)
commit8516f1e2a21a374127ccfa3f7b8de2443e67fe33 (patch)
treea66f212f856981584b2b44bfc772096c5ee7bebe /src/FbTk/MacroCommand.cc
parent90f4f1ecc1635fd5d144f86d64b1674958d0a59f (diff)
downloadfluxbox-8516f1e2a21a374127ccfa3f7b8de2443e67fe33.zip
fluxbox-8516f1e2a21a374127ccfa3f7b8de2443e67fe33.tar.bz2
changed CommandRegistry to a template class, renamed to ObjectRegistry<Type>
Diffstat (limited to 'src/FbTk/MacroCommand.cc')
-rw-r--r--src/FbTk/MacroCommand.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbTk/MacroCommand.cc b/src/FbTk/MacroCommand.cc
index 20e91e4..55d403c 100644
--- a/src/FbTk/MacroCommand.cc
+++ b/src/FbTk/MacroCommand.cc
@@ -23,7 +23,7 @@
23 23
24#include "MacroCommand.hh" 24#include "MacroCommand.hh"
25 25
26#include "CommandRegistry.hh" 26#include "ObjectRegistry.hh"
27#include "StringUtil.hh" 27#include "StringUtil.hh"
28 28
29#include <string> 29#include <string>
@@ -47,7 +47,7 @@ M *addCommands(M *macro, const std::string &args, bool trusted) {
47 if (err == 0) 47 if (err == 0)
48 break; 48 break;
49 if (err > 0) 49 if (err > 0)
50 next = CommandRegistry::instance().parseLine(cmd, trusted); 50 next = ObjectRegistry<Command>::instance().parse(cmd, trusted);
51 if (*next != 0) 51 if (*next != 0)
52 macro->add(next); 52 macro->add(next);
53 } 53 }
@@ -68,8 +68,8 @@ Command *parseMacroCmd(const std::string &command, const std::string &args,
68 return 0; 68 return 0;
69} 69}
70 70
71REGISTER_COMMAND_PARSER(macrocmd, parseMacroCmd); 71REGISTER_OBJECT_PARSER(macrocmd, parseMacroCmd, Command);
72REGISTER_COMMAND_PARSER(togglecmd, parseMacroCmd); 72REGISTER_OBJECT_PARSER(togglecmd, parseMacroCmd, Command);
73 73
74}; // end anonymous namespace 74}; // end anonymous namespace
75 75