aboutsummaryrefslogtreecommitdiff
path: root/src/ToolFactory.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-12-13 05:48:00 (GMT)
committermarkt <markt>2007-12-13 05:48:00 (GMT)
commit8b7464046cea5e521ac46811591b0fce0c45aca1 (patch)
tree09df752f426a249ae15375a626a98436c8727593 /src/ToolFactory.cc
parentdaca07edafc2e75eb9ee04d35fe80759308a8583 (diff)
downloadfluxbox_pavel-8b7464046cea5e521ac46811591b0fce0c45aca1.zip
fluxbox_pavel-8b7464046cea5e521ac46811591b0fce0c45aca1.tar.bz2
added FbTk::CommandRegistry, decentralized command parsing, and made them auto-register
Diffstat (limited to 'src/ToolFactory.cc')
-rw-r--r--src/ToolFactory.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ToolFactory.cc b/src/ToolFactory.cc
index 3fa8714..c54dd19 100644
--- a/src/ToolFactory.cc
+++ b/src/ToolFactory.cc
@@ -36,7 +36,7 @@
36#include "WorkspaceNameTheme.hh" 36#include "WorkspaceNameTheme.hh"
37#include "ButtonTheme.hh" 37#include "ButtonTheme.hh"
38 38
39#include "CommandParser.hh" 39#include "FbTk/CommandRegistry.hh"
40#include "Screen.hh" 40#include "Screen.hh"
41#include "Toolbar.hh" 41#include "Toolbar.hh"
42#include "fluxbox.hh" 42#include "fluxbox.hh"
@@ -107,7 +107,7 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow &
107 } else if (name == "nextworkspace" || 107 } else if (name == "nextworkspace" ||
108 name == "prevworkspace") { 108 name == "prevworkspace") {
109 109
110 FbTk::RefCount<FbTk::Command> cmd(CommandParser::instance().parseLine(name)); 110 FbTk::RefCount<FbTk::Command> cmd(FbTk::CommandRegistry::instance().parseLine(name));
111 if (*cmd == 0) // we need a command 111 if (*cmd == 0) // we need a command
112 return 0; 112 return 0;
113 113
@@ -127,7 +127,7 @@ ToolbarItem *ToolFactory::create(const std::string &name, const FbTk::FbWindow &
127 } else if (name == "nextwindow" || 127 } else if (name == "nextwindow" ||
128 name == "prevwindow") { 128 name == "prevwindow") {
129 129
130 FbTk::RefCount<FbTk::Command> cmd(CommandParser::instance().parseLine(name)); 130 FbTk::RefCount<FbTk::Command> cmd(FbTk::CommandRegistry::instance().parseLine(name));
131 if (*cmd == 0) // we need a command 131 if (*cmd == 0) // we need a command
132 return 0; 132 return 0;
133 133