aboutsummaryrefslogtreecommitdiff
path: root/src/Keys.cc
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-11 07:41:22 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-11 07:41:22 (GMT)
commit9f2f65a698c4cc71373a7fe9d73a0889e0d3487b (patch)
tree4ad67db771d73ea3c48f80a1244037fc9754edd2 /src/Keys.cc
parent1f01d84c080d607a91eb417efcaf5e500b5f1d7e (diff)
downloadfluxbox_pavel-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.zip
fluxbox_pavel-9f2f65a698c4cc71373a7fe9d73a0889e0d3487b.tar.bz2
make FbTk::Command a template class, split parsing information out of ObjectRegistry
Diffstat (limited to 'src/Keys.cc')
-rw-r--r--src/Keys.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Keys.cc b/src/Keys.cc
index 7fcd354..7187c47 100644
--- a/src/Keys.cc
+++ b/src/Keys.cc
@@ -30,7 +30,7 @@
30#include "FbTk/Command.hh" 30#include "FbTk/Command.hh"
31#include "FbTk/RefCount.hh" 31#include "FbTk/RefCount.hh"
32#include "FbTk/KeyUtil.hh" 32#include "FbTk/KeyUtil.hh"
33#include "FbTk/ObjectRegistry.hh" 33#include "FbTk/CommandParser.hh"
34#include "FbTk/I18n.hh" 34#include "FbTk/I18n.hh"
35 35
36#ifdef HAVE_CONFIG_H 36#ifdef HAVE_CONFIG_H
@@ -135,7 +135,7 @@ public:
135 unsigned int key; // key code or button number 135 unsigned int key; // key code or button number
136 int context; // ON_TITLEBAR, etc.: bitwise-or of all desired contexts 136 int context; // ON_TITLEBAR, etc.: bitwise-or of all desired contexts
137 bool isdouble; 137 bool isdouble;
138 FbTk::RefCount<FbTk::Command> m_command; 138 FbTk::RefCount<FbTk::Command<void> > m_command;
139 139
140 keylist_t keylist; 140 keylist_t keylist;
141}; 141};
@@ -461,7 +461,7 @@ bool Keys::addBinding(const string &linebuffer) {
461 const char *str = FbTk::StringUtil::strcasestr(linebuffer.c_str(), 461 const char *str = FbTk::StringUtil::strcasestr(linebuffer.c_str(),
462 val[argc].c_str() + 1); // +1 to skip ':' 462 val[argc].c_str() + 1); // +1 to skip ':'
463 if (str) 463 if (str)
464 current_key->m_command = FbTk::ObjectRegistry<FbTk::Command>::instance().parse(str); 464 current_key->m_command = FbTk::CommandParser<void>::instance().parse(str);
465 465
466 if (!str || *current_key->m_command == 0 || mod) { 466 if (!str || *current_key->m_command == 0 || mod) {
467 delete first_new_key; 467 delete first_new_key;