#include <config.h>
#include "kbmap.h"
-#include "commandtags.h"
+#include "lfuns.h"
#include "kbsequence.h"
#include "debug.h"
string const s = key->getSymbolName();
- if (mod & key_modifier::shift) buf += "S-";
- if (mod & key_modifier::ctrl) buf += "C-";
- if (mod & key_modifier::alt) buf += "M-";
+ if (mod & key_modifier::shift)
+ buf += "S-";
+ if (mod & key_modifier::ctrl)
+ buf += "C-";
+ if (mod & key_modifier::alt)
+ buf += "M-";
+
buf += s;
return buf;
}
+
string const kb_keymap::printKey(kb_key const & key) const
{
return printKeysym(key.code, key.mod.first);
return LFUN_UNKNOWN_ACTION;
}
- for (Table::const_iterator cit = table.begin();
- cit != table.end(); ++cit) {
+ Table::const_iterator end = table.end();
+ for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
key_modifier::state mask(cit->mod.second);
key_modifier::state check =
static_cast<key_modifier::state>(mod & ~mask);
string const kb_keymap::print() const
{
string buf;
- for (Table::const_iterator cit = table.begin();
- cit != table.end(); ++cit) {
+ Table::const_iterator end = table.end();
+ for (Table::const_iterator cit = table.begin(); cit != end; ++cit) {
buf += printKey((*cit));
buf += ' ';
}
key_modifier::state const mod2 = seq->modifiers[r].second;
// check if key is already there
- for (Table::iterator it = table.begin(); it != table.end(); ++it) {
+ Table::iterator end = table.end();
+ for (Table::iterator it = table.begin(); it != end; ++it) {
if (*(code) == *(it->code)
&& mod1 == it->mod.first
&& mod2 == it->mod.second) {