aboutsummaryrefslogtreecommitdiff
path: root/src/ToolFactory.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/ToolFactory.cc
parent90f4f1ecc1635fd5d144f86d64b1674958d0a59f (diff)
downloadfluxbox-8516f1e2a21a374127ccfa3f7b8de2443e67fe33.zip
fluxbox-8516f1e2a21a374127ccfa3f7b8de2443e67fe33.tar.bz2
changed CommandRegistry to a template class, renamed to ObjectRegistry<Type>
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 c54dd19..35bdf75 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 "FbTk/CommandRegistry.hh" 39#include "FbTk/ObjectRegistry.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(FbTk::CommandRegistry::instance().parseLine(name)); 110 FbTk::RefCount<FbTk::Command> cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse(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(FbTk::CommandRegistry::instance().parseLine(name)); 130 FbTk::RefCount<FbTk::Command> cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse(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