diff --git a/QHotkey/qhotkey.cpp b/QHotkey/qhotkey.cpp index ea3957e..ae6da22 100644 --- a/QHotkey/qhotkey.cpp +++ b/QHotkey/qhotkey.cpp @@ -8,7 +8,7 @@ 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, Q_ARG(Qt::Key, Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask)), @@ -40,7 +40,7 @@ QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegi 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) { setNativeShortcut(shortcut, autoRegister); @@ -263,7 +263,7 @@ void QHotkeyPrivate::releaseShortcut(QHotkey::NativeShortcut shortcut) 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); } @@ -335,26 +335,26 @@ bool QHotkey::NativeShortcut::isValid() const return valid; } -bool QHotkey::NativeShortcut::operator ==(const QHotkey::NativeShortcut &other) const +bool QHotkey::NativeShortcut::operator ==(QHotkey::NativeShortcut other) const { return (key == other.key) && (modifier == other.modifier) && valid == other.valid; } -bool QHotkey::NativeShortcut::operator !=(const QHotkey::NativeShortcut &other) const +bool QHotkey::NativeShortcut::operator !=(QHotkey::NativeShortcut other) const { return (key != other.key) || (modifier != other.modifier) || valid != other.valid; } -uint qHash(const QHotkey::NativeShortcut &key) +uint qHash(QHotkey::NativeShortcut key) { 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); } diff --git a/QHotkey/qhotkey.h b/QHotkey/qhotkey.h index 3fc988e..f669640 100644 --- a/QHotkey/qhotkey.h +++ b/QHotkey/qhotkey.h @@ -46,16 +46,16 @@ public: bool isValid() const; //! Equality operator - bool operator ==(const NativeShortcut &other) const; + bool operator ==(NativeShortcut other) const; //! Inequality operator - bool operator !=(const NativeShortcut &other) const; + bool operator !=(NativeShortcut other) const; private: bool valid; }; //! 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 static bool isPlatformSupported(); @@ -67,7 +67,7 @@ public: //! 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); //! 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() override; //! @readAcFn{QHotkey::registered} @@ -94,7 +94,7 @@ public slots: bool resetShortcut(); //! Set this hotkey to a native shortcut - bool setNativeShortcut(NativeShortcut nativeShortcut, bool autoRegister = false); + bool setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool autoRegister = false); signals: //! Will be emitted if the shortcut is pressed @@ -114,8 +114,8 @@ private: bool _registered; }; -uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key); -uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed); +uint QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key); +uint QHOTKEY_SHARED_EXPORT qHash(QHotkey::NativeShortcut key, uint seed); QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey) diff --git a/QHotkey/qhotkey_p.h b/QHotkey/qhotkey_p.h index eec3bd6..b7c1721 100644 --- a/QHotkey/qhotkey_p.h +++ b/QHotkey/qhotkey_p.h @@ -39,7 +39,7 @@ private: QHash, QHotkey::NativeShortcut> mapping; QMultiHash 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 removeShortcutInvoked(QHotkey *hotkey); Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);