diff options
Diffstat (limited to 'src/CommandDialog.cc')
-rw-r--r-- | src/CommandDialog.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/CommandDialog.cc b/src/CommandDialog.cc index 1c9005e..346a1a4 100644 --- a/src/CommandDialog.cc +++ b/src/CommandDialog.cc | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "Screen.hh" | 25 | #include "Screen.hh" |
26 | #include "FbWinFrameTheme.hh" | 26 | #include "FbWinFrameTheme.hh" |
27 | #include "WinClient.hh" | 27 | #include "WinClient.hh" |
28 | #include "FbTk/ObjectRegistry.hh" | 28 | #include "FbTk/CommandParser.hh" |
29 | #include "FocusControl.hh" | 29 | #include "FocusControl.hh" |
30 | #include "fluxbox.hh" | 30 | #include "fluxbox.hh" |
31 | 31 | ||
@@ -136,8 +136,8 @@ void CommandDialog::keyPressEvent(XKeyEvent &event) { | |||
136 | 136 | ||
137 | if (ks == XK_Return) { | 137 | if (ks == XK_Return) { |
138 | hide(); // hide and return focus to a FluxboxWindow | 138 | hide(); // hide and return focus to a FluxboxWindow |
139 | // create command from line | 139 | // create Command<void> from line |
140 | auto_ptr<FbTk::Command> cmd(FbTk::ObjectRegistry<FbTk::Command>::instance().parse(m_precommand + m_textbox.text())); | 140 | auto_ptr<FbTk::Command<void> > cmd(FbTk::CommandParser<void>::instance().parse(m_precommand + m_textbox.text())); |
141 | if (cmd.get()) | 141 | if (cmd.get()) |
142 | cmd->execute(); | 142 | cmd->execute(); |
143 | // post execute | 143 | // post execute |
@@ -167,8 +167,8 @@ void CommandDialog::tabComplete() { | |||
167 | return; | 167 | return; |
168 | } | 168 | } |
169 | 169 | ||
170 | FbTk::ObjectRegistry<FbTk::Command>::CreatorMap::const_iterator it = FbTk::ObjectRegistry<FbTk::Command>::instance().creatorMap().begin(); | 170 | FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::CreatorMap::const_iterator it = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::instance().creatorMap().begin(); |
171 | const FbTk::ObjectRegistry<FbTk::Command>::CreatorMap::const_iterator it_end = FbTk::ObjectRegistry<FbTk::Command>::instance().creatorMap().end(); | 171 | const FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::CreatorMap::const_iterator it_end = FbTk::ObjectRegistry<FbTk::CommandParser<void>::Creator *>::instance().creatorMap().end(); |
172 | vector<string> matches; | 172 | vector<string> matches; |
173 | for (; it != it_end; ++it) { | 173 | for (; it != it_end; ++it) { |
174 | if ((*it).first.find(prefix) == 0) { | 174 | if ((*it).first.find(prefix) == 0) { |