Merge pull request #47 from Shatur95/fix-clang-tidy-warnings

Fix Clang Tidy warnings
This commit is contained in:
Felix Barz
2020-10-21 07:10:48 +02:00
committed by GitHub
4 changed files with 72 additions and 85 deletions
+28 -34
View File
@@ -8,7 +8,7 @@
Q_LOGGING_CATEGORY(logQHotkey, "QHotkey") Q_LOGGING_CATEGORY(logQHotkey, "QHotkey")
void QHotkey::addGlobalMapping(const QKeySequence &shortcut, const QHotkey::NativeShortcut &nativeShortcut) void QHotkey::addGlobalMapping(const QKeySequence &shortcut, QHotkey::NativeShortcut nativeShortcut)
{ {
QMetaObject::invokeMethod(QHotkeyPrivate::instance(), "addMappingInvoked", Qt::QueuedConnection, QMetaObject::invokeMethod(QHotkeyPrivate::instance(), "addMappingInvoked", Qt::QueuedConnection,
Q_ARG(Qt::Key, Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask)), Q_ARG(Qt::Key, Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask)),
@@ -25,14 +25,13 @@ QHotkey::QHotkey(QObject *parent) :
QObject(parent), QObject(parent),
_keyCode(Qt::Key_unknown), _keyCode(Qt::Key_unknown),
_modifiers(Qt::NoModifier), _modifiers(Qt::NoModifier),
_nativeShortcut(),
_registered(false) _registered(false)
{} {}
QHotkey::QHotkey(const QKeySequence &sequence, bool autoRegister, QObject *parent) : QHotkey::QHotkey(const QKeySequence &shortcut, bool autoRegister, QObject *parent) :
QHotkey(parent) QHotkey(parent)
{ {
setShortcut(sequence, autoRegister); setShortcut(shortcut, autoRegister);
} }
QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister, QObject *parent) : QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister, QObject *parent) :
@@ -41,7 +40,7 @@ QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegi
setShortcut(keyCode, modifiers, autoRegister); setShortcut(keyCode, modifiers, autoRegister);
} }
QHotkey::QHotkey(const QHotkey::NativeShortcut &shortcut, bool autoRegister, QObject *parent) : QHotkey::QHotkey(QHotkey::NativeShortcut shortcut, bool autoRegister, QObject *parent) :
QHotkey(parent) QHotkey(parent)
{ {
setNativeShortcut(shortcut, autoRegister); setNativeShortcut(shortcut, autoRegister);
@@ -57,8 +56,7 @@ QKeySequence QHotkey::shortcut() const
{ {
if(_keyCode == Qt::Key_unknown) if(_keyCode == Qt::Key_unknown)
return QKeySequence(); return QKeySequence();
else return QKeySequence(static_cast<int>(_keyCode | _modifiers));
return QKeySequence(_keyCode | _modifiers);
} }
Qt::Key QHotkey::keyCode() const Qt::Key QHotkey::keyCode() const
@@ -83,9 +81,9 @@ bool QHotkey::isRegistered() const
bool QHotkey::setShortcut(const QKeySequence &shortcut, bool autoRegister) bool QHotkey::setShortcut(const QKeySequence &shortcut, bool autoRegister)
{ {
if(shortcut.isEmpty()) { if(shortcut.isEmpty())
return resetShortcut(); return resetShortcut();
} else if(shortcut.count() > 1) { if(shortcut.count() > 1) {
qCWarning(logQHotkey, "Keysequences with multiple shortcuts are not allowed! " qCWarning(logQHotkey, "Keysequences with multiple shortcuts are not allowed! "
"Only the first shortcut will be used!"); "Only the first shortcut will be used!");
} }
@@ -118,16 +116,15 @@ bool QHotkey::setShortcut(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool
if(_nativeShortcut.isValid()) { if(_nativeShortcut.isValid()) {
if(autoRegister) if(autoRegister)
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
else
return true; return true;
} else { }
qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << keyCode << "Modifiers:" << modifiers; qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << keyCode << "Modifiers:" << modifiers;
_keyCode = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
_modifiers = Qt::NoModifier; _modifiers = Qt::NoModifier;
_nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return false; return false;
} }
}
bool QHotkey::resetShortcut() bool QHotkey::resetShortcut()
{ {
@@ -158,26 +155,24 @@ bool QHotkey::setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool aut
_nativeShortcut = nativeShortcut; _nativeShortcut = nativeShortcut;
if(autoRegister) if(autoRegister)
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
else
return true; return true;
} else { }
_keyCode = Qt::Key_unknown; _keyCode = Qt::Key_unknown;
_modifiers = Qt::NoModifier; _modifiers = Qt::NoModifier;
_nativeShortcut = NativeShortcut(); _nativeShortcut = NativeShortcut();
return true; return true;
} }
}
bool QHotkey::setRegistered(bool registered) bool QHotkey::setRegistered(bool registered)
{ {
if(_registered && !registered) if(_registered && !registered)
return QHotkeyPrivate::instance()->removeShortcut(this); return QHotkeyPrivate::instance()->removeShortcut(this);
else if(!_registered && registered) { if(!_registered && registered) {
if(!_nativeShortcut.isValid()) if(!_nativeShortcut.isValid())
return false; return false;
else
return QHotkeyPrivate::instance()->addShortcut(this); return QHotkeyPrivate::instance()->addShortcut(this);
} else }
return true; return true;
} }
@@ -185,8 +180,7 @@ bool QHotkey::setRegistered(bool registered)
// ---------- QHotkeyPrivate implementation ---------- // ---------- QHotkeyPrivate implementation ----------
QHotkeyPrivate::QHotkeyPrivate() : QHotkeyPrivate::QHotkeyPrivate()
shortcuts()
{ {
Q_ASSERT_X(qApp, Q_FUNC_INFO, "QHotkey requires QCoreApplication to be instantiated"); Q_ASSERT_X(qApp, Q_FUNC_INFO, "QHotkey requires QCoreApplication to be instantiated");
qApp->eventDispatcher()->installNativeEventFilter(this); qApp->eventDispatcher()->installNativeEventFilter(this);
@@ -211,7 +205,7 @@ QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcut(Qt::Key keycode, Qt::Keyb
Q_ARG(Qt::Key, keycode), Q_ARG(Qt::Key, keycode),
Q_ARG(Qt::KeyboardModifiers, modifiers))) { Q_ARG(Qt::KeyboardModifiers, modifiers))) {
return QHotkey::NativeShortcut(); return QHotkey::NativeShortcut();
} else }
return res; return res;
} }
@@ -228,12 +222,12 @@ bool QHotkeyPrivate::addShortcut(QHotkey *hotkey)
Q_RETURN_ARG(bool, res), Q_RETURN_ARG(bool, res),
Q_ARG(QHotkey*, hotkey))) { Q_ARG(QHotkey*, hotkey))) {
return false; return false;
} else { }
if(res) if(res)
emit hotkey->registeredChanged(true); emit hotkey->registeredChanged(true);
return res; return res;
} }
}
bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey) bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
{ {
@@ -248,12 +242,12 @@ bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
Q_RETURN_ARG(bool, res), Q_RETURN_ARG(bool, res),
Q_ARG(QHotkey*, hotkey))) { Q_ARG(QHotkey*, hotkey))) {
return false; return false;
} else { }
if(res) if(res)
emit hotkey->registeredChanged(false); emit hotkey->registeredChanged(false);
return res; return res;
} }
}
void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut) void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut)
{ {
@@ -269,7 +263,7 @@ void QHotkeyPrivate::releaseShortcut(QHotkey::NativeShortcut shortcut)
signal.invoke(hkey, Qt::QueuedConnection); signal.invoke(hkey, Qt::QueuedConnection);
} }
void QHotkeyPrivate::addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut) void QHotkeyPrivate::addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, QHotkey::NativeShortcut nativeShortcut)
{ {
mapping.insert({keycode, modifiers}, nativeShortcut); mapping.insert({keycode, modifiers}, nativeShortcut);
} }
@@ -302,9 +296,9 @@ bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey)
if (!unregisterShortcut(shortcut)) { if (!unregisterShortcut(shortcut)) {
qCWarning(logQHotkey) << QHotkey::tr("Failed to unregister %1. Error: %2").arg(hotkey->shortcut().toString(), error); qCWarning(logQHotkey) << QHotkey::tr("Failed to unregister %1. Error: %2").arg(hotkey->shortcut().toString(), error);
return false; return false;
} else }
return true; return true;
} else }
return true; return true;
} }
@@ -313,12 +307,12 @@ QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Q
if(mapping.contains({keycode, modifiers})) if(mapping.contains({keycode, modifiers}))
return mapping.value({keycode, modifiers}); return mapping.value({keycode, modifiers});
bool ok1, ok2 = false; bool ok1 = false;
auto k = nativeKeycode(keycode, ok1); auto k = nativeKeycode(keycode, ok1);
bool ok2 = false;
auto m = nativeModifiers(modifiers, ok2); auto m = nativeModifiers(modifiers, ok2);
if(ok1 && ok2) if(ok1 && ok2)
return {k, m}; return {k, m};
else
return {}; return {};
} }
@@ -341,26 +335,26 @@ bool QHotkey::NativeShortcut::isValid() const
return valid; return valid;
} }
bool QHotkey::NativeShortcut::operator ==(const QHotkey::NativeShortcut &other) const bool QHotkey::NativeShortcut::operator ==(QHotkey::NativeShortcut other) const
{ {
return (key == other.key) && return (key == other.key) &&
(modifier == other.modifier) && (modifier == other.modifier) &&
valid == other.valid; valid == other.valid;
} }
bool QHotkey::NativeShortcut::operator !=(const QHotkey::NativeShortcut &other) const bool QHotkey::NativeShortcut::operator !=(QHotkey::NativeShortcut other) const
{ {
return (key != other.key) || return (key != other.key) ||
(modifier != other.modifier) || (modifier != other.modifier) ||
valid != other.valid; valid != other.valid;
} }
uint qHash(const QHotkey::NativeShortcut &key) uint qHash(QHotkey::NativeShortcut key)
{ {
return qHash(key.key) ^ qHash(key.modifier); return qHash(key.key) ^ qHash(key.modifier);
} }
uint qHash(const QHotkey::NativeShortcut &key, uint seed) uint qHash(QHotkey::NativeShortcut key, uint seed)
{ {
return qHash(key.key, seed) ^ qHash(key.modifier, seed); return qHash(key.key, seed) ^ qHash(key.modifier, seed);
} }
+8 -8
View File
@@ -46,16 +46,16 @@ public:
bool isValid() const; bool isValid() const;
//! Equality operator //! Equality operator
bool operator ==(const NativeShortcut &other) const; bool operator ==(NativeShortcut other) const;
//! Inequality operator //! Inequality operator
bool operator !=(const NativeShortcut &other) const; bool operator !=(NativeShortcut other) const;
private: private:
bool valid; bool valid;
}; };
//! Adds a global mapping of a key sequence to a replacement native shortcut //! Adds a global mapping of a key sequence to a replacement native shortcut
static void addGlobalMapping(const QKeySequence &shortcut, const NativeShortcut &nativeShortcut); static void addGlobalMapping(const QKeySequence &shortcut, NativeShortcut nativeShortcut);
//! Checks if global shortcuts are supported by the current platform //! Checks if global shortcuts are supported by the current platform
static bool isPlatformSupported(); static bool isPlatformSupported();
@@ -67,8 +67,8 @@ public:
//! Constructs a hotkey with a key and modifiers and optionally registers it //! Constructs a hotkey with a key and modifiers and optionally registers it
explicit QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister = false, QObject *parent = nullptr); explicit QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister = false, QObject *parent = nullptr);
//! Constructs a hotkey from a native shortcut and optionally registers it //! Constructs a hotkey from a native shortcut and optionally registers it
explicit QHotkey(const NativeShortcut &shortcut, bool autoRegister = false, QObject *parent = nullptr); explicit QHotkey(NativeShortcut shortcut, bool autoRegister = false, QObject *parent = nullptr);
~QHotkey(); ~QHotkey() override;
//! @readAcFn{QHotkey::registered} //! @readAcFn{QHotkey::registered}
bool isRegistered() const; bool isRegistered() const;
@@ -94,7 +94,7 @@ public slots:
bool resetShortcut(); bool resetShortcut();
//! Set this hotkey to a native shortcut //! Set this hotkey to a native shortcut
bool setNativeShortcut(NativeShortcut nativeShortcut, bool autoRegister = false); bool setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool autoRegister = false);
signals: signals:
//! Will be emitted if the shortcut is pressed //! Will be emitted if the shortcut is pressed
@@ -114,8 +114,8 @@ private:
bool _registered; bool _registered;
}; };
uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key); uint QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key);
uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed); uint QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key, uint seed);
QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey) QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
+1 -1
View File
@@ -39,7 +39,7 @@ private:
QHash<QPair<Qt::Key, Qt::KeyboardModifiers>, QHotkey::NativeShortcut> mapping; QHash<QPair<Qt::Key, Qt::KeyboardModifiers>, QHotkey::NativeShortcut> mapping;
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts; QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
Q_INVOKABLE void addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut); Q_INVOKABLE void addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, QHotkey::NativeShortcut nativeShortcut);
Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey);
Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey);
Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers); Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
+14 -21
View File
@@ -22,14 +22,13 @@ protected:
// QHotkeyPrivate interface // QHotkeyPrivate interface
quint32 nativeKeycode(Qt::Key keycode, bool &ok) Q_DECL_OVERRIDE; quint32 nativeKeycode(Qt::Key keycode, bool &ok) Q_DECL_OVERRIDE;
quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) Q_DECL_OVERRIDE; quint32 nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok) Q_DECL_OVERRIDE;
QString getX11String(Qt::Key keycode); static QString getX11String(Qt::Key keycode);
bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool registerShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE; bool unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
private: private:
static const QVector<quint32> specialModifiers; static const QVector<quint32> specialModifiers;
static const quint32 validModsMask; static const quint32 validModsMask;
QTimer *releaseTimer = nullptr;
xcb_key_press_event_t prevHandledEvent; xcb_key_press_event_t prevHandledEvent;
xcb_key_press_event_t prevEvent; xcb_key_press_event_t prevEvent;
@@ -64,7 +63,7 @@ bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *mes
Q_UNUSED(eventType) Q_UNUSED(eventType)
Q_UNUSED(result) Q_UNUSED(result)
xcb_generic_event_t *genericEvent = static_cast<xcb_generic_event_t *>(message); auto *genericEvent = static_cast<xcb_generic_event_t *>(message);
if (genericEvent->response_type == XCB_KEY_PRESS) { if (genericEvent->response_type == XCB_KEY_PRESS) {
xcb_key_press_event_t keyEvent = *static_cast<xcb_key_press_event_t *>(message); xcb_key_press_event_t keyEvent = *static_cast<xcb_key_press_event_t *>(message);
this->prevEvent = keyEvent; this->prevEvent = keyEvent;
@@ -75,17 +74,11 @@ bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *mes
} else if (genericEvent->response_type == XCB_KEY_RELEASE) { } else if (genericEvent->response_type == XCB_KEY_RELEASE) {
xcb_key_release_event_t keyEvent = *static_cast<xcb_key_release_event_t *>(message); xcb_key_release_event_t keyEvent = *static_cast<xcb_key_release_event_t *>(message);
this->prevEvent = keyEvent; this->prevEvent = keyEvent;
QTimer *timer = new QTimer(this); QTimer::singleShot(50, [this, keyEvent] {
timer->setSingleShot(true);
timer->setInterval(50);
connect(timer, &QTimer::timeout, this, [this, keyEvent, timer] {
if(this->prevEvent.time == keyEvent.time && this->prevEvent.response_type == keyEvent.response_type && this->prevEvent.detail == keyEvent.detail){ if(this->prevEvent.time == keyEvent.time && this->prevEvent.response_type == keyEvent.response_type && this->prevEvent.detail == keyEvent.detail){
this->releaseShortcut({keyEvent.detail, keyEvent.state & QHotkeyPrivateX11::validModsMask}); this->releaseShortcut({keyEvent.detail, keyEvent.state & QHotkeyPrivateX11::validModsMask});
} }
delete timer;
}); });
timer->start();
this->releaseTimer = timer;
this->prevHandledEvent = keyEvent; this->prevHandledEvent = keyEvent;
} }
@@ -98,17 +91,17 @@ QString QHotkeyPrivateX11::getX11String(Qt::Key keycode)
case Qt::Key_MediaLast : case Qt::Key_MediaLast :
case Qt::Key_MediaPrevious : case Qt::Key_MediaPrevious :
return "XF86AudioPrev"; return QStringLiteral("XF86AudioPrev");
case Qt::Key_MediaNext : case Qt::Key_MediaNext :
return "XF86AudioNext"; return QStringLiteral("XF86AudioNext");
case Qt::Key_MediaPause : case Qt::Key_MediaPause :
case Qt::Key_MediaPlay : case Qt::Key_MediaPlay :
case Qt::Key_MediaTogglePlayPause : case Qt::Key_MediaTogglePlayPause :
return "XF86AudioPlay"; return QStringLiteral("XF86AudioPlay");
case Qt::Key_MediaRecord : case Qt::Key_MediaRecord :
return "XF86AudioRecord"; return QStringLiteral("XF86AudioRecord");
case Qt::Key_MediaStop : case Qt::Key_MediaStop :
return "XF86AudioStop"; return QStringLiteral("XF86AudioStop");
default : default :
return QKeySequence(keycode).toString(QKeySequence::NativeText); return QKeySequence(keycode).toString(QKeySequence::NativeText);
} }
@@ -132,7 +125,7 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
if(res != 0) if(res != 0)
ok = true; ok = true;
return res; return res;
} else }
return 0; return 0;
} }
@@ -173,7 +166,7 @@ bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut)
error = errorHandler.errorString; error = errorHandler.errorString;
this->unregisterShortcut(shortcut); this->unregisterShortcut(shortcut);
return false; return false;
} else }
return true; return true;
} }
@@ -188,14 +181,14 @@ bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut)
XUngrabKey(display, XUngrabKey(display,
shortcut.key, shortcut.key,
shortcut.modifier | specialMod, shortcut.modifier | specialMod,
DefaultRootWindow(display)); XDefaultRootWindow(display));
} }
XSync(display, False); XSync(display, False);
if(errorHandler.hasError) { if(HotkeyErrorHandler::hasError) {
error = errorHandler.errorString; error = HotkeyErrorHandler::errorString;
return false; return false;
} else }
return true; return true;
} }