diff options
Diffstat (limited to 'src/CommandDialog.cc')
-rw-r--r-- | src/CommandDialog.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc index 436a942..4c07a93 100644 --- a/src/CommandDialog.cc +++ b/src/CommandDialog.cc | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "Screen.hh" | 27 | #include "Screen.hh" |
28 | #include "FbWinFrameTheme.hh" | 28 | #include "FbWinFrameTheme.hh" |
29 | #include "WinClient.hh" | 29 | #include "WinClient.hh" |
30 | #include "FbTk/CommandRegistry.hh" | 30 | #include "FbTk/ObjectRegistry.hh" |
31 | #include "FocusControl.hh" | 31 | #include "FocusControl.hh" |
32 | #include "fluxbox.hh" | 32 | #include "fluxbox.hh" |
33 | 33 | ||
@@ -139,8 +139,7 @@ void CommandDialog::keyPressEvent(XKeyEvent &event) { | |||
139 | if (ks == XK_Return) { | 139 | if (ks == XK_Return) { |
140 | hide(); // hide and return focus to a FluxboxWindow | 140 | hide(); // hide and return focus to a FluxboxWindow |
141 | // create command from line | 141 | // create command from line |
142 | auto_ptr<FbTk::Command> cmd(FbTk::CommandRegistry::instance(). | 142 | auto_ptr<FbTk::Command> cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse(m_precommand + m_textbox.text())); |
143 | parseLine(m_precommand + m_textbox.text())); | ||
144 | if (cmd.get()) | 143 | if (cmd.get()) |
145 | cmd->execute(); | 144 | cmd->execute(); |
146 | // post execute | 145 | // post execute |
@@ -170,8 +169,8 @@ void CommandDialog::tabComplete() { | |||
170 | return; | 169 | return; |
171 | } | 170 | } |
172 | 171 | ||
173 | FbTk::CommandRegistry::CreatorMap::const_iterator it = FbTk::CommandRegistry::instance().commandMap().begin(); | 172 | FbTk::ObjectRegistry<FbTk::Command>::CreatorMap::const_iterator it = FbTk::ObjectRegistry<FbTk::Command>::instance().creatorMap().begin(); |
174 | const FbTk::CommandRegistry::CreatorMap::const_iterator it_end = FbTk::CommandRegistry::instance().commandMap().end(); | 173 | const FbTk::ObjectRegistry<FbTk::Command>::CreatorMap::const_iterator it_end = FbTk::ObjectRegistry<FbTk::Command>::instance().creatorMap().end(); |
175 | vector<string> matches; | 174 | vector<string> matches; |
176 | for (; it != it_end; ++it) { | 175 | for (; it != it_end; ++it) { |
177 | if ((*it).first.find(prefix) == 0) { | 176 | if ((*it).first.find(prefix) == 0) { |