drop multimedia keys enums

native (X11) key codes and modifiers can be obtained via
QKeyEvent::nativeScanCode() and QKeyEvent::nativeModifiers()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/global/qnamespace.h b/src/core/global/qnamespace.h
index 13d214a..dbb903e 100644 (file)
--- a/src/core/global/qnamespace.h
+++ b/src/core/global/qnamespace.h
@@ -364,192 +364,6 @@ public:
         Key_thorn                         = 0x00fe,
         Key_ydiaeresis                    = 0x00ff,
 
-        // multimedia
-        Key_ModeLock                      = 0x1008FF01,
-        Key_MonBrightnessUp               = 0x1008FF02,
-        Key_MonBrightnessDown             = 0x1008FF03,
-        Key_KbdLightOnOff                 = 0x1008FF04,
-        Key_KbdBrightnessUp               = 0x1008FF05,
-        Key_KbdBrightnessDown             = 0x1008FF06,
-        Key_MonBrightnessCycle            = 0x1008FF07,
-        Key_Standby                       = 0x1008FF10,
-        Key_AudioLowerVolume              = 0x1008FF11,
-        Key_AudioMute                     = 0x1008FF12,
-        Key_AudioRaiseVolume              = 0x1008FF13,
-        Key_AudioPlay                     = 0x1008FF14,
-        Key_AudioStop                     = 0x1008FF15,
-        Key_AudioPrev                     = 0x1008FF16,
-        Key_AudioNext                     = 0x1008FF17,
-        Key_HomePage                      = 0x1008FF18,
-        Key_Mail                          = 0x1008FF19,
-        Key_Start                         = 0x1008FF1A,
-        Key_Search                        = 0x1008FF1B,
-        Key_AudioRecord                   = 0x1008FF1C,
-        Key_Calculator                    = 0x1008FF1D,
-        Key_Memo                          = 0x1008FF1E,
-        Key_ToDoList                      = 0x1008FF1F,
-        Key_Calendar                      = 0x1008FF20,
-        Key_PowerDown                     = 0x1008FF21,
-        Key_ContrastAdjust                = 0x1008FF22,
-        Key_RockerUp                      = 0x1008FF23,
-        Key_RockerDown                    = 0x1008FF24,
-        Key_RockerEnter                   = 0x1008FF25,
-        Key_Back                          = 0x1008FF26,
-        Key_Forward                       = 0x1008FF27,
-        Key_Stop                          = 0x1008FF28,
-        Key_Refresh                       = 0x1008FF29,
-        Key_PowerOff                      = 0x1008FF2A,
-        Key_WakeUp                        = 0x1008FF2B,
-        Key_Eject                         = 0x1008FF2C,
-        Key_ScreenSaver                   = 0x1008FF2D,
-        Key_WWW                           = 0x1008FF2E,
-        Key_Sleep                         = 0x1008FF2F,
-        Key_Favorites                     = 0x1008FF30,
-        Key_AudioPause                    = 0x1008FF31,
-        Key_AudioMedia                    = 0x1008FF32,
-        Key_MyComputer                    = 0x1008FF33,
-        Key_VendorHome                    = 0x1008FF34,
-        Key_LightBulb                     = 0x1008FF35,
-        Key_Shop                          = 0x1008FF36,
-        Key_History                       = 0x1008FF37,
-        Key_OpenURL                       = 0x1008FF38,
-        Key_AddFavorite                   = 0x1008FF39,
-        Key_HotLinks                      = 0x1008FF3A,
-        Key_BrightnessAdjust              = 0x1008FF3B,
-        Key_Finance                       = 0x1008FF3C,
-        Key_Community                     = 0x1008FF3D,
-        Key_AudioRewind                   = 0x1008FF3E,
-        Key_BackForward                   = 0x1008FF3F,
-        Key_Launch0                       = 0x1008FF40,
-        Key_Launch1                       = 0x1008FF41,
-        Key_Launch2                       = 0x1008FF42,
-        Key_Launch3                       = 0x1008FF43,
-        Key_Launch4                       = 0x1008FF44,
-        Key_Launch5                       = 0x1008FF45,
-        Key_Launch6                       = 0x1008FF46,
-        Key_Launch7                       = 0x1008FF47,
-        Key_Launch8                       = 0x1008FF48,
-        Key_Launch9                       = 0x1008FF49,
-        Key_LaunchA                       = 0x1008FF4A,
-        Key_LaunchB                       = 0x1008FF4B,
-        Key_LaunchC                       = 0x1008FF4C,
-        Key_LaunchD                       = 0x1008FF4D,
-        Key_LaunchE                       = 0x1008FF4E,
-        Key_LaunchF                       = 0x1008FF4F,
-        Key_ApplicationLeft               = 0x1008FF50,
-        Key_ApplicationRight              = 0x1008FF51,
-        Key_Book                          = 0x1008FF52,
-        Key_CD                            = 0x1008FF53,
-        Key_Calculater                    = 0x1008FF54,
-        // Key_Clear                         = 0x1008FF55,
-        Key_Close                         = 0x1008FF56,
-        Key_Copy                          = 0x1008FF57,
-        Key_Cut                           = 0x1008FF58,
-        Key_Display                       = 0x1008FF59,
-        Key_DOS                           = 0x1008FF5A,
-        Key_Documents                     = 0x1008FF5B,
-        Key_Excel                         = 0x1008FF5C,
-        Key_Explorer                      = 0x1008FF5D,
-        Key_Game                          = 0x1008FF5E,
-        Key_Go                            = 0x1008FF5F,
-        Key_iTouch                        = 0x1008FF60,
-        Key_LogOff                        = 0x1008FF61,
-        Key_Market                        = 0x1008FF62,
-        Key_Meeting                       = 0x1008FF63,
-        Key_MenuKB                        = 0x1008FF65,
-        Key_MenuPB                        = 0x1008FF66,
-        Key_MySites                       = 0x1008FF67,
-        Key_New                           = 0x1008FF68,
-        Key_News                          = 0x1008FF69,
-        Key_OfficeHome                    = 0x1008FF6A,
-        Key_Open                          = 0x1008FF6B,
-        Key_Option                        = 0x1008FF6C,
-        Key_Paste                         = 0x1008FF6D,
-        Key_Phone                         = 0x1008FF6E,
-        // Key_Q                             = 0x1008FF70,
-        Key_Reply                         = 0x1008FF72,
-        Key_Reload                        = 0x1008FF73,
-        Key_RotateWindows                 = 0x1008FF74,
-        Key_RotationPB                    = 0x1008FF75,
-        Key_RotationKB                    = 0x1008FF76,
-        Key_Save                          = 0x1008FF77,
-        Key_ScrollUp                      = 0x1008FF78,
-        Key_ScrollDown                    = 0x1008FF79,
-        Key_ScrollClick                   = 0x1008FF7A,
-        Key_Send                          = 0x1008FF7B,
-        Key_Spell                         = 0x1008FF7C,
-        Key_SplitScreen                   = 0x1008FF7D,
-        Key_Support                       = 0x1008FF7E,
-        Key_TaskPane                      = 0x1008FF7F,
-        Key_Terminal                      = 0x1008FF80,
-        Key_Tools                         = 0x1008FF81,
-        Key_Travel                        = 0x1008FF82,
-        Key_UserPB                        = 0x1008FF84,
-        Key_User1KB                       = 0x1008FF85,
-        Key_User2KB                       = 0x1008FF86,
-        Key_Video                         = 0x1008FF87,
-        Key_WheelButton                   = 0x1008FF88,
-        Key_Word                          = 0x1008FF89,
-        Key_Xfer                          = 0x1008FF8A,
-        Key_ZoomIn                        = 0x1008FF8B,
-        Key_ZoomOut                       = 0x1008FF8C,
-        Key_Away                          = 0x1008FF8D,
-        Key_Messenger                     = 0x1008FF8E,
-        Key_WebCam                        = 0x1008FF8F,
-        Key_MailForward                   = 0x1008FF90,
-        Key_Pictures                      = 0x1008FF91,
-        Key_Music                         = 0x1008FF92,
-        Key_Battery                       = 0x1008FF93,
-        Key_Bluetooth                     = 0x1008FF94,
-        Key_WLAN                          = 0x1008FF95,
-        Key_UWB                           = 0x1008FF96,
-        Key_AudioForward                  = 0x1008FF97,
-        Key_AudioRepeat                   = 0x1008FF98,
-        Key_AudioRandomPlay               = 0x1008FF99,
-        Key_Subtitle                      = 0x1008FF9A,
-        Key_AudioCycleTrack               = 0x1008FF9B,
-        Key_CycleAngle                    = 0x1008FF9C,
-        Key_FrameBack                     = 0x1008FF9D,
-        Key_FrameForward                  = 0x1008FF9E,
-        Key_Time                          = 0x1008FF9F,
-        // Key_Select                       = 0x1008FFA0,
-        Key_View                          = 0x1008FFA1,
-        Key_TopMenu                       = 0x1008FFA2,
-        Key_Red                           = 0x1008FFA3,
-        Key_Green                         = 0x1008FFA4,
-        Key_Yellow                        = 0x1008FFA5,
-        Key_Blue                          = 0x1008FFA6,
-        Key_Suspend                       = 0x1008FFA7,
-        Key_Hibernate                     = 0x1008FFA8,
-        Key_TouchpadToggle                = 0x1008FFA9,
-        Key_TouchpadOn                    = 0x1008FFB0,
-        Key_TouchpadOff                   = 0x1008FFB1,
-        Key_AudioMicMute                  = 0x1008FFB2,
-        Key_Keyboard                      = 0x1008FFB3,
-        Key_WWAN                          = 0x1008FFB4,
-        Key_RFKill                        = 0x1008FFB5,
-        Key_AudioPreset                   = 0x1008FFB6,
-        Key_RotationLockToggle            = 0x1008FFB7,
-        Key_FullScreen                    = 0x1008FFB8,
-        Key_Switch_VT_1                   = 0x1008FE01,
-        Key_Switch_VT_2                   = 0x1008FE02,
-        Key_Switch_VT_3                   = 0x1008FE03,
-        Key_Switch_VT_4                   = 0x1008FE04,
-        Key_Switch_VT_5                   = 0x1008FE05,
-        Key_Switch_VT_6                   = 0x1008FE06,
-        Key_Switch_VT_7                   = 0x1008FE07,
-        Key_Switch_VT_8                   = 0x1008FE08,
-        Key_Switch_VT_9                   = 0x1008FE09,
-        Key_Switch_VT_10                  = 0x1008FE0A,
-        Key_Switch_VT_11                  = 0x1008FE0B,
-        Key_Switch_VT_12                  = 0x1008FE0C,
-        Key_Ungrab                        = 0x1008FE20,
-        Key_ClearGrab                     = 0x1008FE21,
-        Key_Next_VMode                    = 0x1008FE22,
-        Key_Prev_VMode                    = 0x1008FE23,
-        Key_LogWindowTree                 = 0x1008FE24,
-        Key_LogGrabInfo                   = 0x1008FE25,
-
         // pseudo
         Key_Shift                         = 0x1008FE30,
         Key_Control                       = 0x1008FE31,
@@ -563,23 +377,6 @@ public:
         Key_CapsLock = Key_Caps_Lock,
         Key_ScrollLock = Key_Scroll_Lock,
         Key_SysReq = Key_Sys_Req,
-        Key_VolumeDown = Key_AudioLowerVolume,
-        Key_VolumeUp = Key_AudioRaiseVolume,
-        Key_VolumeMute = Key_AudioMute,
-        Key_OpenUrl = Key_OpenURL,
-        Key_MediaRecord = Key_AudioRecord,
-        Key_LaunchMail = Key_Mail,
-        Key_LaunchMedia = Key_AudioMedia,
-        Key_MediaNext = Key_AudioNext,
-        Key_MediaPrevious = Key_AudioPrev,
-        Key_MediaStop = Key_AudioStop,
-        Key_MediaPlay = Key_AudioPlay,
-        Key_MediaPause = Key_AudioPause,
-        Key_KeyboardLightOnOff = Key_KbdLightOnOff,
-        Key_KeyboardBrightnessUp = Key_KbdBrightnessUp,
-        Key_KeyboardBrightnessDown = Key_KbdBrightnessDown,
-        Key_Camera = Key_WebCam,
-        Key_Call = Key_Phone,
 
         // deprecated and aliases
         Key_Next = Key_Page_Down,

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index c47c77c..c818049 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -1158,13 +1158,6 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror)
 */
 
 /*!
-    \qmlsignal Keys::onBackPressed(KeyEvent event)
-
-    This handler is called when the Back key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
     \qmlsignal Keys::onCancelPressed(KeyEvent event)
 
     This handler is called when the Cancel key has been pressed. The \a event
@@ -1221,33 +1214,12 @@ void QDeclarativeItemPrivate::setLayoutMirror(bool mirror)
 */
 
 /*!
-    \qmlsignal Keys::onCallPressed(KeyEvent event)
-
-    This handler is called when the Call key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
     \qmlsignal Keys::onMenuPressed(KeyEvent event)
 
     This handler is called when the Menu key has been pressed. The \a event
     parameter provides information about the event.
 */
 
-/*!
-    \qmlsignal Keys::onVolumeUpPressed(KeyEvent event)
-
-    This handler is called when the VolumeUp key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
-/*!
-    \qmlsignal Keys::onVolumeDownPressed(KeyEvent event)
-
-    This handler is called when the VolumeDown key has been pressed. The \a event
-    parameter provides information about the event.
-*/
-
 QDeclarativeKeysAttached::QDeclarativeKeysAttached(QObject *parent)
 : QObject(*(new QDeclarativeKeysAttachedPrivate), parent),
   QDeclarativeItemKeyFilter(qobject_cast<QDeclarativeItem*>(parent))
@@ -1302,13 +1274,9 @@ static const struct KeySignalTblData {
     { Qt::Key_Enter, "enterPressed(QDeclarativeKeyEvent*)" },
     { Qt::Key_Delete, "deletePressed(QDeclarativeKeyEvent*)" },
     { Qt::Key_Space, "spacePressed(QDeclarativeKeyEvent*)" },
-    { Qt::Key_Back, "backPressed(QDeclarativeKeyEvent*)" },
     { Qt::Key_Cancel, "cancelPressed(QDeclarativeKeyEvent*)" },
     { Qt::Key_Select, "selectPressed(QDeclarativeKeyEvent*)" },
-    { Qt::Key_Call, "callPressed(QDeclarativeKeyEvent*)" },
     { Qt::Key_Menu, "menuPressed(QDeclarativeKeyEvent*)" },
-    { Qt::Key_VolumeUp, "volumeUpPressed(QDeclarativeKeyEvent*)" },
-    { Qt::Key_VolumeDown, "volumeDownPressed(QDeclarativeKeyEvent*)" }
 };
 static const qint16 KeySignalTblSize = sizeof(KeySignalTbl) / sizeof(KeySignalTblData);
 

diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index baf55fd..1ba75a9 100644 (file)
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -521,13 +521,9 @@ Q_SIGNALS:
     void enterPressed(QDeclarativeKeyEvent *event);
     void deletePressed(QDeclarativeKeyEvent *event);
     void spacePressed(QDeclarativeKeyEvent *event);
-    void backPressed(QDeclarativeKeyEvent *event);
     void cancelPressed(QDeclarativeKeyEvent *event);
     void selectPressed(QDeclarativeKeyEvent *event);
-    void callPressed(QDeclarativeKeyEvent *event);
     void menuPressed(QDeclarativeKeyEvent *event);
-    void volumeUpPressed(QDeclarativeKeyEvent *event);
-    void volumeDownPressed(QDeclarativeKeyEvent *event);
 
 private:
     virtual void keyPressed(QKeyEvent *event, bool post);

diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index e89405e..0451345 100644 (file)
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -2894,9 +2894,8 @@ bool QFileDialogPrivate::itemViewKeyboardEvent(QKeyEvent *event) {
     case Qt::Key_Backspace:
         _q_navigateToParent();
         return true;
-    case Qt::Key_Back:
     case Qt::Key_Left:
-        if (event->key() == Qt::Key_Back || event->modifiers() == Qt::AltModifier) {
+        if (event->modifiers() == Qt::AltModifier) {
             _q_navigateBackward();
             return true;
         }

diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 9b3e48a..ac44e1c 100644 (file)
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -465,187 +465,6 @@ static const struct KeyNameTblData {
     { Qt::Key_yacute,                   QT_TRANSLATE_NOOP("QShortcut", "yacute") },
     { Qt::Key_thorn,                    QT_TRANSLATE_NOOP("QShortcut", "thorn") },
     { Qt::Key_ydiaeresis,               QT_TRANSLATE_NOOP("QShortcut", "ydiaeresis") },
-    { Qt::Key_ModeLock,                 QT_TRANSLATE_NOOP("QShortcut", "Mode Lock") },
-    { Qt::Key_MonBrightnessUp,          QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Up") },
-    { Qt::Key_MonBrightnessDown,        QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Down") },
-    { Qt::Key_KbdLightOnOff,            QT_TRANSLATE_NOOP("QShortcut", "Keyboard Light On/Off") },
-    { Qt::Key_KbdBrightnessUp,          QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Up") },
-    { Qt::Key_KbdBrightnessDown,        QT_TRANSLATE_NOOP("QShortcut", "Keyboard Brightness Down") },
-    { Qt::Key_MonBrightnessCycle,       QT_TRANSLATE_NOOP("QShortcut", "Monitor Brightness Cycle") },
-    { Qt::Key_Standby,                  QT_TRANSLATE_NOOP("QShortcut", "Standby") },
-    { Qt::Key_AudioLowerVolume,         QT_TRANSLATE_NOOP("QShortcut", "Volume Down") },
-    { Qt::Key_AudioMute,                QT_TRANSLATE_NOOP("QShortcut", "Volume Mute") },
-    { Qt::Key_AudioRaiseVolume,         QT_TRANSLATE_NOOP("QShortcut", "Volume Up") },
-    { Qt::Key_AudioPlay,                QT_TRANSLATE_NOOP("QShortcut", "Media Play") },
-    { Qt::Key_AudioStop,                QT_TRANSLATE_NOOP("QShortcut", "Media Stop") },
-    { Qt::Key_AudioPrev,                QT_TRANSLATE_NOOP("QShortcut", "Media Previous") },
-    { Qt::Key_AudioNext,                QT_TRANSLATE_NOOP("QShortcut", "Media Next") },
-    { Qt::Key_HomePage,                 QT_TRANSLATE_NOOP("QShortcut", "Home Page") },
-    { Qt::Key_Mail,                     QT_TRANSLATE_NOOP("QShortcut", "Launch Mail") },
-    { Qt::Key_Start,                    QT_TRANSLATE_NOOP("QShortcut", "Start") },
-    { Qt::Key_Search,                   QT_TRANSLATE_NOOP("QShortcut", "Search") },
-    { Qt::Key_AudioRecord,              QT_TRANSLATE_NOOP("QShortcut", "Media Record") },
-    { Qt::Key_Calculator,               QT_TRANSLATE_NOOP("QShortcut", "Calculator") },
-    { Qt::Key_Memo,                     QT_TRANSLATE_NOOP("QShortcut", "Memo") },
-    { Qt::Key_ToDoList,                 QT_TRANSLATE_NOOP("QShortcut", "ToDo List") },
-    { Qt::Key_Calendar,                 QT_TRANSLATE_NOOP("QShortcut", "Calendar") },
-    { Qt::Key_PowerDown,                QT_TRANSLATE_NOOP("QShortcut", "Power Down") },
-    { Qt::Key_ContrastAdjust,           QT_TRANSLATE_NOOP("QShortcut", "Contrast Adjust") },
-    { Qt::Key_RockerUp,                 QT_TRANSLATE_NOOP("QShortcut", "Rocker Up") },
-    { Qt::Key_RockerDown,               QT_TRANSLATE_NOOP("QShortcut", "Rocker Down") },
-    { Qt::Key_RockerEnter,              QT_TRANSLATE_NOOP("QShortcut", "Rocker Enter") },
-    { Qt::Key_Back,                     QT_TRANSLATE_NOOP("QShortcut", "Back") },
-    { Qt::Key_Forward,                  QT_TRANSLATE_NOOP("QShortcut", "Forward") },
-    { Qt::Key_Stop,                     QT_TRANSLATE_NOOP("QShortcut", "Stop") },
-    { Qt::Key_Refresh,                  QT_TRANSLATE_NOOP("QShortcut", "Refresh") },
-    { Qt::Key_PowerOff,                 QT_TRANSLATE_NOOP("QShortcut", "Power Off") },
-    { Qt::Key_WakeUp,                   QT_TRANSLATE_NOOP("QShortcut", "Wake Up") },
-    { Qt::Key_Eject,                    QT_TRANSLATE_NOOP("QShortcut", "Eject") },
-    { Qt::Key_ScreenSaver,              QT_TRANSLATE_NOOP("QShortcut", "Screensaver") },
-    { Qt::Key_WWW,                      QT_TRANSLATE_NOOP("QShortcut", "WWW") },
-    { Qt::Key_Sleep,                    QT_TRANSLATE_NOOP("QShortcut", "Sleep") },
-    { Qt::Key_Favorites,                QT_TRANSLATE_NOOP("QShortcut", "Favorites") },
-    { Qt::Key_AudioPause,               QT_TRANSLATE_NOOP("QShortcut", "Media Pause") },
-    { Qt::Key_AudioMedia,               QT_TRANSLATE_NOOP("QShortcut", "Launch Media") },
-    { Qt::Key_MyComputer,               QT_TRANSLATE_NOOP("QShortcut", "My Computer") },
-    { Qt::Key_VendorHome,               QT_TRANSLATE_NOOP("QShortcut", "Vendor Home") },
-    { Qt::Key_LightBulb,                QT_TRANSLATE_NOOP("QShortcut", "LightBulb") },
-    { Qt::Key_Shop,                     QT_TRANSLATE_NOOP("QShortcut", "Shop") },
-    { Qt::Key_History,                  QT_TRANSLATE_NOOP("QShortcut", "History") },
-    { Qt::Key_OpenURL,                  QT_TRANSLATE_NOOP("QShortcut", "Open URL") },
-    { Qt::Key_AddFavorite,              QT_TRANSLATE_NOOP("QShortcut", "Add Favorite") },
-    { Qt::Key_HotLinks,                 QT_TRANSLATE_NOOP("QShortcut", "Hot Links") },
-    { Qt::Key_BrightnessAdjust,         QT_TRANSLATE_NOOP("QShortcut", "Adjust Brightness") },
-    { Qt::Key_Finance,                  QT_TRANSLATE_NOOP("QShortcut", "Finance") },
-    { Qt::Key_Community,                QT_TRANSLATE_NOOP("QShortcut", "Community") },
-    { Qt::Key_AudioRewind,              QT_TRANSLATE_NOOP("QShortcut", "Audio Rewind") },
-    { Qt::Key_BackForward,              QT_TRANSLATE_NOOP("QShortcut", "Back Forward") },
-    { Qt::Key_Launch0,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (0)") },
-    { Qt::Key_Launch1,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (1)") },
-    { Qt::Key_Launch2,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (2)") },
-    { Qt::Key_Launch3,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (3)") },
-    { Qt::Key_Launch4,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (4)") },
-    { Qt::Key_Launch5,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (5)") },
-    { Qt::Key_Launch6,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (6)") },
-    { Qt::Key_Launch7,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (7)") },
-    { Qt::Key_Launch8,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (8)") },
-    { Qt::Key_Launch9,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (9)") },
-    { Qt::Key_LaunchA,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (A)") },
-    { Qt::Key_LaunchB,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (B)") },
-    { Qt::Key_LaunchC,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (C)") },
-    { Qt::Key_LaunchD,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (D)") },
-    { Qt::Key_LaunchE,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (E)") },
-    { Qt::Key_LaunchF,                  QT_TRANSLATE_NOOP("QShortcut", "Launch (F)") },
-    { Qt::Key_ApplicationLeft,          QT_TRANSLATE_NOOP("QShortcut", "Application Left") },
-    { Qt::Key_ApplicationRight,         QT_TRANSLATE_NOOP("QShortcut", "Application Right") },
-    { Qt::Key_Book,                     QT_TRANSLATE_NOOP("QShortcut", "Book") },
-    { Qt::Key_CD,                       QT_TRANSLATE_NOOP("QShortcut", "CD") },
-    { Qt::Key_Calculater,               QT_TRANSLATE_NOOP("QShortcut", "Calculater") },
-    { Qt::Key_Close,                    QT_TRANSLATE_NOOP("QShortcut", "Close") },
-    { Qt::Key_Copy,                     QT_TRANSLATE_NOOP("QShortcut", "Copy") },
-    { Qt::Key_Cut,                      QT_TRANSLATE_NOOP("QShortcut", "Cut") },
-    { Qt::Key_Display,                  QT_TRANSLATE_NOOP("QShortcut", "Display") },
-    { Qt::Key_DOS,                      QT_TRANSLATE_NOOP("QShortcut", "DOS") },
-    { Qt::Key_Documents,                QT_TRANSLATE_NOOP("QShortcut", "Documents") },
-    { Qt::Key_Excel,                    QT_TRANSLATE_NOOP("QShortcut", "Spreadsheet") },
-    { Qt::Key_Explorer,                 QT_TRANSLATE_NOOP("QShortcut", "Browser") },
-    { Qt::Key_Game,                     QT_TRANSLATE_NOOP("QShortcut", "Game") },
-    { Qt::Key_Go,                       QT_TRANSLATE_NOOP("QShortcut", "Go") },
-    { Qt::Key_iTouch,                   QT_TRANSLATE_NOOP("QShortcut", "iTouch") },
-    { Qt::Key_LogOff,                   QT_TRANSLATE_NOOP("QShortcut", "Logoff") },
-    { Qt::Key_Market,                   QT_TRANSLATE_NOOP("QShortcut", "Market") },
-    { Qt::Key_Meeting,                  QT_TRANSLATE_NOOP("QShortcut", "Meeting") },
-    { Qt::Key_MenuKB,                   QT_TRANSLATE_NOOP("QShortcut", "Keyboard Menu") },
-    { Qt::Key_MenuPB,                   QT_TRANSLATE_NOOP("QShortcut", "Menu PB") },
-    { Qt::Key_MySites,                  QT_TRANSLATE_NOOP("QShortcut", "My Sites") },
-    { Qt::Key_New,                      QT_TRANSLATE_NOOP("QShortcut", "New") },
-    { Qt::Key_News,                     QT_TRANSLATE_NOOP("QShortcut", "News") },
-    { Qt::Key_OfficeHome,               QT_TRANSLATE_NOOP("QShortcut", "Home Office") },
-    { Qt::Key_Open,                     QT_TRANSLATE_NOOP("QShortcut", "Open") },
-    { Qt::Key_Option,                   QT_TRANSLATE_NOOP("QShortcut", "Option") },
-    { Qt::Key_Paste,                    QT_TRANSLATE_NOOP("QShortcut", "Paste") },
-    { Qt::Key_Phone,                    QT_TRANSLATE_NOOP("QShortcut", "Phone") },
-    { Qt::Key_Reply,                    QT_TRANSLATE_NOOP("QShortcut", "Reply") },
-    { Qt::Key_Reload,                   QT_TRANSLATE_NOOP("QShortcut", "Reload") },
-    { Qt::Key_RotateWindows,            QT_TRANSLATE_NOOP("QShortcut", "Rotate Windows") },
-    { Qt::Key_RotationPB,               QT_TRANSLATE_NOOP("QShortcut", "Rotation PB") },
-    { Qt::Key_RotationKB,               QT_TRANSLATE_NOOP("QShortcut", "Rotation KB") },
-    { Qt::Key_Save,                     QT_TRANSLATE_NOOP("QShortcut", "Save") },
-    { Qt::Key_ScrollUp,                 QT_TRANSLATE_NOOP("QShortcut", "Scroll Up") },
-    { Qt::Key_ScrollDown,               QT_TRANSLATE_NOOP("QShortcut", "Scroll Down") },
-    { Qt::Key_ScrollClick,              QT_TRANSLATE_NOOP("QShortcut", "Scroll Click") },
-    { Qt::Key_Send,                     QT_TRANSLATE_NOOP("QShortcut", "Send") },
-    { Qt::Key_Spell,                    QT_TRANSLATE_NOOP("QShortcut", "Spellchecker") },
-    { Qt::Key_SplitScreen,              QT_TRANSLATE_NOOP("QShortcut", "Split Screen") },
-    { Qt::Key_Support,                  QT_TRANSLATE_NOOP("QShortcut", "Support") },
-    { Qt::Key_TaskPane,                 QT_TRANSLATE_NOOP("QShortcut", "Task Panel") },
-    { Qt::Key_Terminal,                 QT_TRANSLATE_NOOP("QShortcut", "Terminal") },
-    { Qt::Key_Tools,                    QT_TRANSLATE_NOOP("QShortcut", "Tools") },
-    { Qt::Key_Travel,                   QT_TRANSLATE_NOOP("QShortcut", "Travel") },
-    { Qt::Key_UserPB,                   QT_TRANSLATE_NOOP("QShortcut", "User PB") },
-    { Qt::Key_User1KB,                  QT_TRANSLATE_NOOP("QShortcut", "User1 KB") },
-    { Qt::Key_User2KB,                  QT_TRANSLATE_NOOP("QShortcut", "User2 KB") },
-    { Qt::Key_Video,                    QT_TRANSLATE_NOOP("QShortcut", "Video") },
-    { Qt::Key_WheelButton,              QT_TRANSLATE_NOOP("QShortcut", "Wheel Button") },
-    { Qt::Key_Word,                     QT_TRANSLATE_NOOP("QShortcut", "Word Processor") },
-    { Qt::Key_Xfer,                     QT_TRANSLATE_NOOP("QShortcut", "Xfer") },
-    { Qt::Key_ZoomIn,                   QT_TRANSLATE_NOOP("QShortcut", "Zoom In") },
-    { Qt::Key_ZoomOut,                  QT_TRANSLATE_NOOP("QShortcut", "Zoom Out") },
-    { Qt::Key_Away,                     QT_TRANSLATE_NOOP("QShortcut", "Away") },
-    { Qt::Key_Messenger,                QT_TRANSLATE_NOOP("QShortcut", "Messenger") },
-    { Qt::Key_WebCam,                   QT_TRANSLATE_NOOP("QShortcut", "WebCam") },
-    { Qt::Key_MailForward,              QT_TRANSLATE_NOOP("QShortcut", "Mail Forward") },
-    { Qt::Key_Pictures,                 QT_TRANSLATE_NOOP("QShortcut", "Pictures") },
-    { Qt::Key_Music,                    QT_TRANSLATE_NOOP("QShortcut", "Music") },
-    { Qt::Key_Battery,                  QT_TRANSLATE_NOOP("QShortcut", "Battery") },
-    { Qt::Key_Bluetooth,                QT_TRANSLATE_NOOP("QShortcut", "Bluetooth") },
-    { Qt::Key_WLAN,                     QT_TRANSLATE_NOOP("QShortcut", "WLAN") },
-    { Qt::Key_UWB,                      QT_TRANSLATE_NOOP("QShortcut", "Ultra Wide Band") },
-    { Qt::Key_AudioForward,             QT_TRANSLATE_NOOP("QShortcut", "Media Forward") },
-    { Qt::Key_AudioRepeat,              QT_TRANSLATE_NOOP("QShortcut", "Media Repeat") },
-    { Qt::Key_AudioRandomPlay,          QT_TRANSLATE_NOOP("QShortcut", "Media Random Play") },
-    { Qt::Key_Subtitle,                 QT_TRANSLATE_NOOP("QShortcut", "Subtitle") },
-    { Qt::Key_AudioCycleTrack,          QT_TRANSLATE_NOOP("QShortcut", "Media Cycle Track") },
-    { Qt::Key_CycleAngle,               QT_TRANSLATE_NOOP("QShortcut", "Cycle Angle") },
-    { Qt::Key_FrameBack,                QT_TRANSLATE_NOOP("QShortcut", "Frame Back") },
-    { Qt::Key_FrameForward,             QT_TRANSLATE_NOOP("QShortcut", "Frame Forward") },
-    { Qt::Key_Time,                     QT_TRANSLATE_NOOP("QShortcut", "Time") },
-    { Qt::Key_View,                     QT_TRANSLATE_NOOP("QShortcut", "View") },
-    { Qt::Key_TopMenu,                  QT_TRANSLATE_NOOP("QShortcut", "Top Menu") },
-    { Qt::Key_Red,                      QT_TRANSLATE_NOOP("QShortcut", "Red") },
-    { Qt::Key_Green,                    QT_TRANSLATE_NOOP("QShortcut", "Green") },
-    { Qt::Key_Yellow,                   QT_TRANSLATE_NOOP("QShortcut", "Yellow") },
-    { Qt::Key_Blue,                     QT_TRANSLATE_NOOP("QShortcut", "Blue") },
-    { Qt::Key_Suspend,                  QT_TRANSLATE_NOOP("QShortcut", "Suspend") },
-    { Qt::Key_Hibernate,                QT_TRANSLATE_NOOP("QShortcut", "Hibernate") },
-    { Qt::Key_TouchpadToggle,           QT_TRANSLATE_NOOP("QShortcut", "Touchpad Toggle") },
-    { Qt::Key_TouchpadOn,               QT_TRANSLATE_NOOP("QShortcut", "Touchpad On") },
-    { Qt::Key_TouchpadOff,              QT_TRANSLATE_NOOP("QShortcut", "Touchpad Off") },
-    { Qt::Key_AudioMicMute,             QT_TRANSLATE_NOOP("QShortcut", "Media Microphone Mute") },
-    { Qt::Key_Keyboard,                 QT_TRANSLATE_NOOP("QShortcut", "Keyboard") },
-    { Qt::Key_WWAN,                     QT_TRANSLATE_NOOP("QShortcut", "WWAN") },
-    { Qt::Key_RFKill,                   QT_TRANSLATE_NOOP("QShortcut", "RFKill") },
-    { Qt::Key_AudioPreset,              QT_TRANSLATE_NOOP("QShortcut", "Media Preset") },
-    { Qt::Key_RotationLockToggle,       QT_TRANSLATE_NOOP("QShortcut", "Rotation Lock Toggle") },
-    { Qt::Key_FullScreen,               QT_TRANSLATE_NOOP("QShortcut", "FullScreen") },
-    { Qt::Key_Switch_VT_1,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (1)") },
-    { Qt::Key_Switch_VT_2,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (2)") },
-    { Qt::Key_Switch_VT_3,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (3)") },
-    { Qt::Key_Switch_VT_4,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (4)") },
-    { Qt::Key_Switch_VT_5,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (5)") },
-    { Qt::Key_Switch_VT_6,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (6)") },
-    { Qt::Key_Switch_VT_7,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (7)") },
-    { Qt::Key_Switch_VT_8,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (8)") },
-    { Qt::Key_Switch_VT_9,              QT_TRANSLATE_NOOP("QShortcut", "Switch VT (9)") },
-    { Qt::Key_Switch_VT_10,             QT_TRANSLATE_NOOP("QShortcut", "Switch VT (10)") },
-    { Qt::Key_Switch_VT_11,             QT_TRANSLATE_NOOP("QShortcut", "Switch VT (11)") },
-    { Qt::Key_Switch_VT_12,             QT_TRANSLATE_NOOP("QShortcut", "Switch VT (12)") },
-    { Qt::Key_Ungrab,                   QT_TRANSLATE_NOOP("QShortcut", "Ungrab") },
-    { Qt::Key_ClearGrab,                QT_TRANSLATE_NOOP("QShortcut", "Clear Grab") },
-    { Qt::Key_Next_VMode,               QT_TRANSLATE_NOOP("QShortcut", "Next VMode") },
-    { Qt::Key_Prev_VMode,               QT_TRANSLATE_NOOP("QShortcut", "Prev VMode") },
-    { Qt::Key_LogWindowTree,            QT_TRANSLATE_NOOP("QShortcut", "Log Window Tree") },
-    { Qt::Key_LogGrabInfo,              QT_TRANSLATE_NOOP("QShortcut", "Log Grab Info") },
 /*
     { Qt::Key_Shift,                    QT_TRANSLATE_NOOP("QShortcut", "Shift") },
     { Qt::Key_Control,                  QT_TRANSLATE_NOOP("QShortcut", "Control") },
@@ -716,8 +535,6 @@ const QKeyBinding QKeySequencePrivate::keyBindings[] = {
     { QKeySequence::FindNext,                  Qt::Key_F3 },
     { QKeySequence::Refresh,                   Qt::Key_F5 },
     { QKeySequence::Undo,                      Qt::Key_F14 }, // Undo on sun keyboards
-    { QKeySequence::PreviousChild,             Qt::Key_Back },
-    { QKeySequence::NextChild,                 Qt::Key_Forward },
     { QKeySequence::InsertLineSeparator,       Qt::SHIFT | Qt::Key_Enter },
     { QKeySequence::Cut,                       Qt::SHIFT | Qt::Key_Delete },
     { QKeySequence::SelectStartOfLine,         Qt::SHIFT | Qt::Key_Home },

diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 3a83f82..0bbc9f1 100644 (file)
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -123,7 +123,7 @@ QCalendarDateSectionValidator::Section QCalendarDayValidator::handleKey(int key)
         if (m_day < 1)
             m_day = 31;
         return QCalendarDateSectionValidator::ThisSection;
-    } else if (key == Qt::Key_Back || key == Qt::Key_Backspace) {
+    } else if (key == Qt::Key_Backspace) {
         --m_pos;
         if (m_pos < 0)
             m_pos = 1;
@@ -239,7 +239,7 @@ QCalendarDateSectionValidator::Section QCalendarMonthValidator::handleKey(int ke
         if (m_month < 1)
             m_month = 12;
         return QCalendarDateSectionValidator::ThisSection;
-    } else if (key == Qt::Key_Back || key == Qt::Key_Backspace) {
+    } else if (key == Qt::Key_Backspace) {
         --m_pos;
         if (m_pos < 0)
             m_pos = 1;
@@ -361,7 +361,7 @@ QCalendarDateSectionValidator::Section QCalendarYearValidator::handleKey(int key
         m_pos = 0;
         --m_year;
         return QCalendarDateSectionValidator::ThisSection;
-    } else if (key == Qt::Key_Back || key == Qt::Key_Backspace) {
+    } else if (key == Qt::Key_Backspace) {
         --m_pos;
         if (m_pos < 0)
             m_pos = 3;
@@ -632,7 +632,7 @@ void QCalendarDateValidator::handleKeyEvent(QKeyEvent *keyEvent)
 
     int key = keyEvent->key();
     if (m_lastSectionMove == QCalendarDateSectionValidator::NextSection) {
-        if (key == Qt::Key_Back || key == Qt::Key_Backspace)
+        if (key == Qt::Key_Backspace)
             toPreviousToken();
     }
     if (key == Qt::Key_Right)

diff --git a/src/test/qasciikey.cpp b/src/test/qasciikey.cpp
index 8963a68..a7ba2a8 100644 (file)
--- a/src/test/qasciikey.cpp
+++ b/src/test/qasciikey.cpp
@@ -429,48 +429,6 @@ char QTest::keyToAscii(Qt::Key key)
     case Qt::Key_division: return char(0xf7);
     case Qt::Key_ydiaeresis: return char(0xff);
 
-    // multimedia/internet keys - ignored by default - see QKeyEvent c'tor
-
-    case Qt::Key_Back : return 0; // = 0x1061,
-    case Qt::Key_Forward : return 0; // = 0x1062,
-    case Qt::Key_Stop : return 0; // = 0x1063,
-    case Qt::Key_Refresh : return 0; // = 0x1064,
-
-    case Qt::Key_VolumeDown: return 0; // = 0x1070,
-    case Qt::Key_VolumeMute : return 0; // = 0x1071,
-    case Qt::Key_VolumeUp: return 0; // = 0x1072,
-
-    case Qt::Key_MediaPlay : return 0; // = 0x1080,
-    case Qt::Key_MediaStop : return 0; // = 0x1081,
-    case Qt::Key_MediaPrevious : return 0; // = 0x1082,
-    case Qt::Key_MediaNext : return 0; // = 0x1083,
-    case Qt::Key_MediaRecord: return 0; // = 0x1084,
-
-    case Qt::Key_HomePage : return 0; // = 0x1090,
-    case Qt::Key_Favorites : return 0; // = 0x1091,
-    case Qt::Key_Search : return 0; // = 0x1092,
-    case Qt::Key_Standby: return 0; // = 0x1093,
-    case Qt::Key_OpenUrl: return 0; // = 0x1094,
-
-    case Qt::Key_LaunchMail : return 0; // = 0x10a0,
-    case Qt::Key_LaunchMedia: return 0; // = 0x10a1,
-    case Qt::Key_Launch0 : return 0; // = 0x10a2,
-    case Qt::Key_Launch1 : return 0; // = 0x10a3,
-    case Qt::Key_Launch2 : return 0; // = 0x10a4,
-    case Qt::Key_Launch3 : return 0; // = 0x10a5,
-    case Qt::Key_Launch4 : return 0; // = 0x10a6,
-    case Qt::Key_Launch5 : return 0; // = 0x10a7,
-    case Qt::Key_Launch6 : return 0; // = 0x10a8,
-    case Qt::Key_Launch7 : return 0; // = 0x10a9,
-    case Qt::Key_Launch8 : return 0; // = 0x10aa,
-    case Qt::Key_Launch9 : return 0; // = 0x10ab,
-    case Qt::Key_LaunchA : return 0; // = 0x10ac,
-    case Qt::Key_LaunchB : return 0; // = 0x10ad,
-    case Qt::Key_LaunchC : return 0; // = 0x10ae,
-    case Qt::Key_LaunchD : return 0; // = 0x10af,
-    case Qt::Key_LaunchE : return 0; // = 0x10b0,
-    case Qt::Key_LaunchF : return 0; // = 0x10b1,
-
     default: QTEST_ASSERT(false); return 0;
     }
 }