Replace LString.h with support/std_string.h,

[features.git] / src / frontends / qt2 / qlkey.h

diff --git a/src/frontends/qt2/qlkey.h b/src/frontends/qt2/qlkey.h
index 6b0a0708294124fe991bd00cd9c840ec3a055465..77995364db1bc384903bc04e3cf2e5f3e57802e2 100644 (file)
--- a/src/frontends/qt2/qlkey.h
+++ b/src/frontends/qt2/qlkey.h
@@ -6,18 +6,15 @@
  *
  * \author John Levon
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 
 #ifndef QLKEY_H
 #define QLKEY_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include <qnamespace.h>
-#include "LString.h"
+#include "support/std_string.h"
 
 /**
  * Return true if the key event is a modifier.
@@ -34,10 +31,6 @@ bool q_is_modifier(int qkey)
                case Qt::Key_Meta:
                case Qt::Key_Alt:
                        return true;
-
-               // AltGr becomes Key_unknown on at least one keyboard
-               case Qt::Key_unknown:
-                       return true;
        }
        return false;
 }
@@ -50,14 +43,17 @@ bool q_is_modifier(int qkey)
 int string_to_qkey(string const & str)
 {
        // FIX! (Lgb)
-       
+
        if (str == "Escape") return Qt::Key_Escape;
        if (str == "Tab") return Qt::Key_Tab;
+       if (str == "ISO_Left_Tab") return Qt::Key_Tab;
        if (str == "BackSpace") return Qt::Key_BackSpace;
        if (str == "Return") return Qt::Key_Return;
        if (str == "KP_Enter") return Qt::Key_Enter; // correct ?
        if (str == "Insert") return Qt::Key_Insert;
+       if (str == "KP_Insert") return Qt::Key_Insert;
        if (str == "Delete") return Qt::Key_Delete;
+       if (str == "KP_Delete") return Qt::Key_Delete;
        if (str == "Pause") return Qt::Key_Pause;
        if (str == "Print") return Qt::Key_Print;
        if (str == "Sys_Req") return Qt::Key_SysReq;
@@ -69,6 +65,14 @@ int string_to_qkey(string const & str)
        if (str == "Down") return Qt::Key_Down;
        if (str == "Prior") return Qt::Key_Prior;
        if (str == "Next") return Qt::Key_Next;
+       if (str == "KP_Home") return Qt::Key_Home;
+       if (str == "KP_End") return Qt::Key_End;
+       if (str == "KP_Left") return Qt::Key_Left;
+       if (str == "KP_Up") return Qt::Key_Up;
+       if (str == "KP_Right") return Qt::Key_Right;
+       if (str == "KP_Down") return Qt::Key_Down;
+       if (str == "KP_Prior") return Qt::Key_Prior;
+       if (str == "KP_Next") return Qt::Key_Next;
        if (str == "Shift_L") return Qt::Key_Shift;
        if (str == "Control_L") return Qt::Key_Control;
        if (str == "Alt_L") return Qt::Key_Meta; // correct ?
@@ -121,6 +125,16 @@ int string_to_qkey(string const & str)
        if (str == "7") return Qt::Key_7;
        if (str == "8") return Qt::Key_8;
        if (str == "9") return Qt::Key_9;
+       if (str == "KP_0") return Qt::Key_0;
+       if (str == "KP_1") return Qt::Key_1;
+       if (str == "KP_2") return Qt::Key_2;
+       if (str == "KP_3") return Qt::Key_3;
+       if (str == "KP_4") return Qt::Key_4;
+       if (str == "KP_5") return Qt::Key_5;
+       if (str == "KP_6") return Qt::Key_6;
+       if (str == "KP_7") return Qt::Key_7;
+       if (str == "KP_8") return Qt::Key_8;
+       if (str == "KP_9") return Qt::Key_9;
        if (str == "colon") return Qt::Key_Colon;
        if (str == "semicolon") return Qt::Key_Semicolon;
        if (str == "less") return Qt::Key_Less;
@@ -183,11 +197,14 @@ int string_to_qkey(string const & str)
        if (str == "bracketleft") return Qt::Key_BracketLeft;
        if (str == "backslash") return Qt::Key_Backslash;
        if (str == "bracketright") return Qt::Key_BracketRight;
+       if (str == "bar") return Qt::Key_Bar;
        if (str == "underscore") return Qt::Key_Underscore;
        if (str == "space") return Qt::Key_Space;
        if (str == "parenleft") return Qt::Key_ParenLeft;
        if (str == "parenright") return Qt::Key_ParenRight;
        if (str == "quotedbl") return Qt::Key_QuoteDbl;
+       if (str == "quoteright") return Qt::Key_Apostrophe;
+       if (str == "quoteleft") return Qt::Key_QuoteLeft;
        if (str == "exclam") return Qt::Key_Exclam;
        if (str == "numbersign") return Qt::Key_NumberSign;
        if (str == "asciicircum") return Qt::Key_AsciiCircum;
@@ -195,12 +212,17 @@ int string_to_qkey(string const & str)
        if (str == "percent") return Qt::Key_Percent;
        if (str == "ampersand") return Qt::Key_Ampersand;
        if (str == "asterisk") return Qt::Key_Asterisk;
+       if (str == "KP_Multiply") return Qt::Key_Asterisk;
        if (str == "apostrophe") return Qt::Key_Apostrophe;
        if (str == "plus") return Qt::Key_Plus;
+       if (str == "KP_Add") return Qt::Key_Plus;
        if (str == "minus") return Qt::Key_Minus;
+       if (str == "KP_Subtract") return Qt::Key_Minus;
        if (str == "comma") return Qt::Key_Comma;
        if (str == "period") return Qt::Key_Period;
+       if (str == "KP_Decimal") return Qt::Key_Period;
        if (str == "slash") return Qt::Key_Slash;
+       if (str == "KP_Divide") return Qt::Key_Slash;
        if (str == "asciitilde") return Qt::Key_AsciiTilde;
        if (str == "braceleft") return Qt::Key_BraceLeft;
        if (str == "braceright") return Qt::Key_BraceRight;
@@ -309,7 +331,6 @@ int string_to_qkey(string const & str)
        if (str == "Hyper_L") return Qt::Key_Hyper_L;
        if (str == "Hyper_R") return Qt::Key_Hyper_R;
        if (str == "Help") return Qt::Key_Help;
-       if (str == "Bar") return Qt::Key_Bar;
        if (str == "BackTab") return Qt::Key_Backtab;
 
        return Qt::Key_unknown;