diff --git a/src/core/global/qnamespace.h b/src/core/global/qnamespace.h index 154ff75df..1a2f2c084 100644 --- a/src/core/global/qnamespace.h +++ b/src/core/global/qnamespace.h @@ -414,17 +414,12 @@ public: Key_Kana_Shift = 0xff2e, Key_Eisu_Shift = 0xff2f, Key_Eisu_toggle = 0xff30, - Key_Kanji_Bangou = 0xff37, - Key_Zen_Koho = 0xff3d, - Key_Mae_Koho = 0xff3e, Key_Home = 0xff50, Key_Left = 0xff51, Key_Up = 0xff52, Key_Right = 0xff53, Key_Down = 0xff54, - Key_Prior = 0xff55, Key_Page_Up = 0xff55, - Key_Next = 0xff56, Key_Page_Down = 0xff56, Key_End = 0xff57, Key_Begin = 0xff58, @@ -440,7 +435,6 @@ public: Key_Help = 0xff6a, Key_Break = 0xff6b, Key_Mode_switch = 0xff7e, - Key_script_switch = 0xff7e, Key_Num_Lock = 0xff7f, Key_F1 = 0xffbe, Key_F2 = 0xffbf, @@ -610,7 +604,6 @@ public: Key_Icircumflex = 0x00ce, Key_Idiaeresis = 0x00cf, Key_ETH = 0x00d0, - Key_Eth = 0x00d0, Key_Ntilde = 0x00d1, Key_Ograve = 0x00d2, Key_Oacute = 0x00d3, @@ -619,14 +612,12 @@ public: Key_Odiaeresis = 0x00d6, Key_multiply = 0x00d7, Key_Oslash = 0x00d8, - Key_Ooblique = 0x00d8, Key_Ugrave = 0x00d9, Key_Uacute = 0x00da, Key_Ucircumflex = 0x00db, Key_Udiaeresis = 0x00dc, Key_Yacute = 0x00dd, Key_THORN = 0x00de, - Key_Thorn = 0x00de, Key_ssharp = 0x00df, Key_agrave = 0x00e0, Key_aacute = 0x00e1, @@ -653,7 +644,6 @@ public: Key_odiaeresis = 0x00f6, Key_division = 0x00f7, Key_oslash = 0x00f8, - Key_ooblique = 0x00f8, Key_ugrave = 0x00f9, Key_uacute = 0x00fa, Key_ucircumflex = 0x00fb, @@ -881,11 +871,21 @@ public: Key_KeyboardBrightnessDown = Key_KbdBrightnessDown, Key_Camera = Key_WebCam, Key_Call = Key_Phone, - Key_Henkan_Mode = Key_Henkan, - // deprecated + // deprecated and aliases + Key_Next = Key_Page_Down, + Key_Prior = Key_Page_Up, + Key_ooblique = Key_oslash, + Key_Ooblique = Key_Oslash, + Key_Thorn = Key_THORN, Key_QuoteLeft = Key_Underscore, Key_QuoteRight = Key_Apostrophe, + Key_Eth = Key_ETH, + Key_Henkan_Mode = Key_Henkan, + Key_Kanji_Bangou = Key_Codeinput, + Key_Zen_Koho = Key_MultipleCandidate, + Key_Mae_Koho = Key_PreviousCandidate, + Key_script_switch = Key_Mode_switch, Key_Any = Key_Space, Key_Enter = 0xff8d, diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 527edea9c..b09198b77 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -225,17 +225,12 @@ static const struct KeyNameTblData { { Qt::Key_Kana_Shift, QT_TRANSLATE_NOOP("QShortcut", "Kana Shift") }, { Qt::Key_Eisu_Shift, QT_TRANSLATE_NOOP("QShortcut", "Eisu Shift") }, { Qt::Key_Eisu_toggle, QT_TRANSLATE_NOOP("QShortcut", "Eisu toggle") }, - { Qt::Key_Kanji_Bangou, QT_TRANSLATE_NOOP("QShortcut", "Kanji Bangou") }, - { Qt::Key_Zen_Koho, QT_TRANSLATE_NOOP("QShortcut", "Zen Koho") }, - { Qt::Key_Mae_Koho, QT_TRANSLATE_NOOP("QShortcut", "Mae Koho") }, { Qt::Key_Home, QT_TRANSLATE_NOOP("QShortcut", "Home") }, { Qt::Key_Left, QT_TRANSLATE_NOOP("QShortcut", "Left") }, { Qt::Key_Up, QT_TRANSLATE_NOOP("QShortcut", "Up") }, { Qt::Key_Right, QT_TRANSLATE_NOOP("QShortcut", "Right") }, { Qt::Key_Down, QT_TRANSLATE_NOOP("QShortcut", "Down") }, - { Qt::Key_Prior, QT_TRANSLATE_NOOP("QShortcut", "Prior") }, { Qt::Key_Page_Up, QT_TRANSLATE_NOOP("QShortcut", "Page Up") }, - { Qt::Key_Next, QT_TRANSLATE_NOOP("QShortcut", "Next") }, { Qt::Key_Page_Down, QT_TRANSLATE_NOOP("QShortcut", "Page Down") }, { Qt::Key_End, QT_TRANSLATE_NOOP("QShortcut", "End") }, { Qt::Key_Begin, QT_TRANSLATE_NOOP("QShortcut", "Begin") }, @@ -251,7 +246,6 @@ static const struct KeyNameTblData { { Qt::Key_Help, QT_TRANSLATE_NOOP("QShortcut", "Help") }, { Qt::Key_Break, QT_TRANSLATE_NOOP("QShortcut", "Break") }, { Qt::Key_Mode_switch, QT_TRANSLATE_NOOP("QShortcut", "Mode switch") }, - { Qt::Key_script_switch, QT_TRANSLATE_NOOP("QShortcut", "Script switch") }, { Qt::Key_Num_Lock, QT_TRANSLATE_NOOP("QShortcut", "Num Lock") }, { Qt::Key_F1, QT_TRANSLATE_NOOP("QShortcut", "F1") }, { Qt::Key_F2, QT_TRANSLATE_NOOP("QShortcut", "F2") }, @@ -423,7 +417,6 @@ static const struct KeyNameTblData { { Qt::Key_Icircumflex, QT_TRANSLATE_NOOP("QShortcut", "Icircumflex") }, { Qt::Key_Idiaeresis, QT_TRANSLATE_NOOP("QShortcut", "Idiaeresis") }, { Qt::Key_ETH, QT_TRANSLATE_NOOP("QShortcut", "ETH") }, - { Qt::Key_Eth, QT_TRANSLATE_NOOP("QShortcut", "Eth") }, { Qt::Key_Ntilde, QT_TRANSLATE_NOOP("QShortcut", "Ntilde") }, { Qt::Key_Ograve, QT_TRANSLATE_NOOP("QShortcut", "Ograve") }, { Qt::Key_Oacute, QT_TRANSLATE_NOOP("QShortcut", "Oacute") }, @@ -432,14 +425,12 @@ static const struct KeyNameTblData { { Qt::Key_Odiaeresis, QT_TRANSLATE_NOOP("QShortcut", "Odiaeresis") }, { Qt::Key_multiply, QT_TRANSLATE_NOOP("QShortcut", "multiply") }, { Qt::Key_Oslash, QT_TRANSLATE_NOOP("QShortcut", "Oslash") }, - { Qt::Key_Ooblique, QT_TRANSLATE_NOOP("QShortcut", "Ooblique") }, { Qt::Key_Ugrave, QT_TRANSLATE_NOOP("QShortcut", "Ugrave") }, { Qt::Key_Uacute, QT_TRANSLATE_NOOP("QShortcut", "Uacute") }, { Qt::Key_Ucircumflex, QT_TRANSLATE_NOOP("QShortcut", "Ucircumflex") }, { Qt::Key_Udiaeresis, QT_TRANSLATE_NOOP("QShortcut", "Udiaeresis") }, { Qt::Key_Yacute, QT_TRANSLATE_NOOP("QShortcut", "Yacute") }, { Qt::Key_THORN, QT_TRANSLATE_NOOP("QShortcut", "THORN") }, - { Qt::Key_Thorn, QT_TRANSLATE_NOOP("QShortcut", "Thorn") }, { Qt::Key_ssharp, QT_TRANSLATE_NOOP("QShortcut", "ssharp") }, { Qt::Key_agrave, QT_TRANSLATE_NOOP("QShortcut", "agrave") }, { Qt::Key_aacute, QT_TRANSLATE_NOOP("QShortcut", "aacute") }, @@ -466,7 +457,6 @@ static const struct KeyNameTblData { { Qt::Key_odiaeresis, QT_TRANSLATE_NOOP("QShortcut", "odiaeresis") }, { Qt::Key_division, QT_TRANSLATE_NOOP("QShortcut", "division") }, { Qt::Key_oslash, QT_TRANSLATE_NOOP("QShortcut", "oslash") }, - { Qt::Key_ooblique, QT_TRANSLATE_NOOP("QShortcut", "ooblique") }, { Qt::Key_ugrave, QT_TRANSLATE_NOOP("QShortcut", "ugrave") }, { Qt::Key_uacute, QT_TRANSLATE_NOOP("QShortcut", "uacute") }, { Qt::Key_ucircumflex, QT_TRANSLATE_NOOP("QShortcut", "ucircumflex") },