modified native hotkey to allow 0 as valid key

This commit is contained in:
Skycoder42
2016-12-04 16:03:12 +01:00
parent 49da8b1c5c
commit 5d770d60a0
4 changed files with 68 additions and 13 deletions
+1 -7
View File
@@ -16,7 +16,6 @@ public:
~QHotkeyPrivate();
static QHotkeyPrivate *instance();
static inline bool testValid(QHotkey::NativeShortcut nativeShortcut);
QHotkey::NativeShortcut nativeShortcut(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
@@ -37,7 +36,7 @@ private:/*functions*/
Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey);
Q_INVOKABLE inline QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
private:
private:
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
};
@@ -49,11 +48,6 @@ private:
return hotkeyPrivate;\
}
inline bool QHotkeyPrivate::testValid(QHotkey::NativeShortcut nativeShortcut)
{
return (nativeShortcut.first != 0);
}
inline QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers) {
return {this->nativeKeycode(keycode), this->nativeModifiers(modifiers)};
}