move some selection related stuff over to textcursor.C

[lyx.git] / src / kbmap.C

diff --git a/src/kbmap.C b/src/kbmap.C
index 3d86b2c74c857dc81bbea5a47023f1d66f8f0b2a..9ac6de0943ca555fb82005b12181d42516a90765 100644 (file)
--- a/src/kbmap.C
+++ b/src/kbmap.C
@@ -9,12 +9,8 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "kbmap.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "kbsequence.h"
 #include "debug.h"
 
@@ -27,13 +23,18 @@ string const kb_keymap::printKeysym(LyXKeySymPtr key,
 
        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);
@@ -45,7 +46,7 @@ string::size_type kb_keymap::bind(string const & seq, int action)
        if (lyxerr.debugging(Debug::KBMAP)) {
                lyxerr << "BIND: Sequence `"
                       << seq << "' Action `"
-                      << action << "'" << endl;
+                      << action << '\'' << endl;
        }
 
        kb_sequence k(0, 0);
@@ -72,12 +73,12 @@ int kb_keymap::lookup(LyXKeySymPtr key,
                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);
- 
+
                if (*(cit->code) == *key && cit->mod.first == check) {
                        // match found
                        if (cit->table.get()) {
@@ -103,8 +104,8 @@ int kb_keymap::lookup(LyXKeySymPtr key,
 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 += ' ';
        }
@@ -122,7 +123,8 @@ void kb_keymap::defkey(kb_sequence * seq, int action, unsigned int r)
        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) {
@@ -177,9 +179,9 @@ string const kb_keymap::findbinding(int act, string const & prefix) const
                        res += cit->table->findbinding(act,
                                                       prefix
                                                       + printKey((*cit))
-                                                      + " ");
+                                                      + ' ');
                } else if (cit->action == act) {
-                       res += "[";
+                       res += '[';
                        res += prefix + printKey((*cit));
                        res += "] ";
                }