Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QLyXKeySym.C

diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index aeeccc9dcb49a41103543fd42426714a3c4a1161..afe75d39a923b1365f62255327e3b60ce8346acd 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -1,10 +1,12 @@
 /**
  * \file QLyXKeySym.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Asger and Juergen
- * \author John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -15,54 +17,72 @@
 
 #include "QLyXKeySym.h"
 #include "qlkey.h"
- 
+#include "debug.h"
+
+#include <qevent.h>
+
+using std::endl;
+
+
 QLyXKeySym::QLyXKeySym()
-       : LyXKeySym(), key_(0), text_("")
+       : LyXKeySym(), key_(0)
 {
 }
- 
- 
-void QLyXKeySym::set(int key, QString const & text)
+
+
+void QLyXKeySym::set(QKeyEvent * ev)
 {
-       key_ = key;
-       text_ = text;
+       key_ = ev->key();
+       text_ = ev->text();
 }
- 
+
 
 void QLyXKeySym::init(string const & symbolname)
 {
        key_ = string_to_qkey(symbolname);
+       text_ = symbolname.c_str();
+       lyxerr[Debug::KEY] << "Init key to " << key_ << ", " << text_ << endl;
 }
 
- 
+
 bool QLyXKeySym::isOK() const
 {
-       // FIXME
-       return key_ != 0;
+       return ! key_ == 0;
 }
- 
+
 
 bool QLyXKeySym::isModifier() const
 {
        return q_is_modifier(key_);
 }
 
- 
+
 string QLyXKeySym::getSymbolName() const
 {
-       return qkey_to_string(key_);
+       string sym(qkey_to_string(key_));
+
+       if (sym.empty()) {
+               lyxerr[Debug::KEY] << "sym empty in getSymbolName()" << endl;
+               sym = text_.latin1();
+       }
+       lyxerr[Debug::KEY] << "getSymbolName() -> " << sym << endl;
+       return sym;
 }
 
- 
+
 char QLyXKeySym::getISOEncoded() const
 {
-       // FIXME
+       lyxerr[Debug::KEY] << "getISO returning " << text_.latin1()[0] << endl;
        return text_.latin1()[0];
 }
- 
 
-bool QLyXKeySym::operator==(LyXKeySym const & k) const
+
+bool operator==(LyXKeySym const & k1, LyXKeySym const & k2)
 {
-       QLyXKeySym const & o = static_cast<QLyXKeySym const &>(k);
-       return o.key_ == key_;
+       // note we ignore text_ here (non-strict ==), because
+       // text_ is not filled out by keymap initialisation
+
+       return static_cast<QLyXKeySym const &>(k1).key()
+               == static_cast<QLyXKeySym const &>(k2).key();
+
 }