mirror of
https://github.com/Skycoder42/QHotkey.git
synced 2026-11-19 12:49:58 +03:00
Fix Clang Tidy warnings
readability-convert-member-functions-to-static modernize-use-auto readability-else-after-return readability-static-accessed-through-instance readability-inconsistent-declaration-parameter-name
This commit is contained in:
+12
-12
@@ -22,7 +22,7 @@ protected:
|
||||
// QHotkeyPrivate interface
|
||||
quint32 nativeKeycode(Qt::Key keycode, 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 unregisterShortcut(QHotkey::NativeShortcut shortcut) Q_DECL_OVERRIDE;
|
||||
|
||||
@@ -64,7 +64,7 @@ bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *mes
|
||||
Q_UNUSED(eventType)
|
||||
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) {
|
||||
xcb_key_press_event_t keyEvent = *static_cast<xcb_key_press_event_t *>(message);
|
||||
this->prevEvent = keyEvent;
|
||||
@@ -75,7 +75,7 @@ bool QHotkeyPrivateX11::nativeEventFilter(const QByteArray &eventType, void *mes
|
||||
} else if (genericEvent->response_type == XCB_KEY_RELEASE) {
|
||||
xcb_key_release_event_t keyEvent = *static_cast<xcb_key_release_event_t *>(message);
|
||||
this->prevEvent = keyEvent;
|
||||
QTimer *timer = new QTimer(this);
|
||||
auto *timer = new QTimer(this);
|
||||
timer->setSingleShot(true);
|
||||
timer->setInterval(50);
|
||||
connect(timer, &QTimer::timeout, this, [this, keyEvent, timer] {
|
||||
@@ -132,8 +132,8 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
|
||||
if(res != 0)
|
||||
ok = true;
|
||||
return res;
|
||||
} else
|
||||
return 0;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
quint32 QHotkeyPrivateX11::nativeModifiers(Qt::KeyboardModifiers modifiers, bool &ok)
|
||||
@@ -173,8 +173,8 @@ bool QHotkeyPrivateX11::registerShortcut(QHotkey::NativeShortcut shortcut)
|
||||
error = errorHandler.errorString;
|
||||
this->unregisterShortcut(shortcut);
|
||||
return false;
|
||||
} else
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut)
|
||||
@@ -188,15 +188,15 @@ bool QHotkeyPrivateX11::unregisterShortcut(QHotkey::NativeShortcut shortcut)
|
||||
XUngrabKey(display,
|
||||
shortcut.key,
|
||||
shortcut.modifier | specialMod,
|
||||
DefaultRootWindow(display));
|
||||
XDefaultRootWindow(display));
|
||||
}
|
||||
XSync(display, False);
|
||||
|
||||
if(errorHandler.hasError) {
|
||||
error = errorHandler.errorString;
|
||||
if(HotkeyErrorHandler::hasError) {
|
||||
error = HotkeyErrorHandler::errorString;
|
||||
return false;
|
||||
} else
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
QString QHotkeyPrivateX11::formatX11Error(Display *display, int errorCode)
|
||||
|
||||
Reference in New Issue
Block a user