Change the semantics of 'none' and 'auto' viewers/editors: 'none' means now

[lyx.git] / src / frontends / xforms / XLyXKeySym.C

diff --git a/src/frontends/xforms/XLyXKeySym.C b/src/frontends/xforms/XLyXKeySym.C
index d8597fb29ecfa976e747ceda65123c7edad91d5f..a16a7bc6c12e90eb9a66f9851463d79761a17e26 100644 (file)
--- a/src/frontends/xforms/XLyXKeySym.C
+++ b/src/frontends/xforms/XLyXKeySym.C
@@ -3,25 +3,34 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Asger and Juergen
+ * \author Asger and Jürgen
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "XLyXKeySym.h"
 
 #include "debug.h"
+#include "kbmap.h"
 
-#include <X11/Xlib.h>
 #include <X11/keysym.h>
 
 using std::endl;
+using std::string;
+
+
+bool operator==(LyXKeySym const & k1, LyXKeySym const & k2)
+{
+       using lyx::frontend::XLyXKeySym;
+       return static_cast<XLyXKeySym const &>(k1).keysym()
+               == static_cast<XLyXKeySym const &>(k2).keysym();
+}
+
+
+namespace lyx {
+namespace frontend {
 
 XLyXKeySym::XLyXKeySym()
        : LyXKeySym(), keysym_(NoSymbol)
@@ -69,7 +78,7 @@ string XLyXKeySym::getSymbolName() const
 }
 
 
-char XLyXKeySym::getISOEncoded() const
+char XLyXKeySym::getISOEncoded(string const &) const
 {
        if (keysym_ == NoSymbol) {
                return 0;
@@ -103,8 +112,10 @@ char XLyXKeySym::getISOEncoded() const
 }
 
 
-bool operator==(LyXKeySym const & k1, LyXKeySym const & k2)
+string const XLyXKeySym::print(key_modifier::state mod) const
 {
-       return static_cast<XLyXKeySym const &>(k1).keysym()
-               == static_cast<XLyXKeySym const &>(k2).keysym();
+       return kb_keymap::printKeySym(*this, mod);
 }
+
+} // namespace frontend
+} // namespace lyx