From: André Pönitz Date: Fri, 21 Mar 2008 22:31:57 +0000 (+0000) Subject: cosmetics X-Git-Tag: 1.6.10~5494 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=a7f29a35ee4a6c7d58ca1291e551fe53faa07a9e;p=features.git cosmetics git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23892 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/KeyMap.cpp b/src/KeyMap.cpp index 77009b98e3..d1c7040c7d 100644 --- a/src/KeyMap.cpp +++ b/src/KeyMap.cpp @@ -250,7 +250,7 @@ bool KeyMap::read(string const & bind_file, KeyMap * unbind_map) void KeyMap::write(string const & bind_file, bool append, bool unbind) const { ofstream os(bind_file.c_str(), - append ? (ios::app | ios:: out): ios::out); + append ? (ios::app | ios::out) : ios::out); if (!append) os << "## This file is automatically generated by lyx\n" @@ -403,7 +403,7 @@ void KeyMap::unbind(KeySequence * seq, FuncRequest const & func, unsigned int r) remove = it; if (it->table.get()) it->table.reset(); - } + } } else if (it->table.get()) { it->table->unbind(seq, func, r + 1); if (it->table->empty()) diff --git a/src/KeyMap.h b/src/KeyMap.h index acb0c22110..d715c9776a 100644 --- a/src/KeyMap.h +++ b/src/KeyMap.h @@ -121,7 +121,6 @@ public: std::pair find1keybinding(FuncRequest const & func) const; - /** * Returns a string of the given keysym, with modifiers. * @param key the key as a keysym @@ -130,10 +129,10 @@ public: static std::string const printKeySym(KeySymbol const & key, KeyModifier mod); +private: + /// typedef std::pair ModifierPair; - -private: /// struct Key { /// Keysym