Fix Clang Tidy warnings

Shatur · Shatur · commit f0799fd4a47d · 2020-10-15T21:50:58.000+03:00
readability-convert-member-functions-to-static
modernize-use-auto
readability-else-after-return
readability-static-accessed-through-instance
readability-inconsistent-declaration-parameter-name
diff --git a/QHotkey/qhotkey.cpp b/QHotkey/qhotkey.cpp
@@ -25,14 +25,13 @@ QHotkey::QHotkey(QObject *parent) :
 	QObject(parent),
 	_keyCode(Qt::Key_unknown),
 	_modifiers(Qt::NoModifier),
-	_nativeShortcut(),
 	_registered(false)
 {}
 
-QHotkey::QHotkey(const QKeySequence &sequence, bool autoRegister, QObject *parent) :
+QHotkey::QHotkey(const QKeySequence &shortcut, bool autoRegister, QObject *parent) :
 	QHotkey(parent)
 {
-	setShortcut(sequence, autoRegister);
+	setShortcut(shortcut, autoRegister);
 }
 
 QHotkey::QHotkey(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool autoRegister, QObject *parent) :
@@ -57,8 +56,7 @@ QKeySequence QHotkey::shortcut() const
 {
 	if(_keyCode == Qt::Key_unknown)
 		return QKeySequence();
-	else
-		return QKeySequence(_keyCode | _modifiers);
+	return QKeySequence(static_cast<int>(_keyCode | _modifiers));
 }
 
 Qt::Key QHotkey::keyCode() const
@@ -83,9 +81,9 @@ bool QHotkey::isRegistered() const
 
 bool QHotkey::setShortcut(const QKeySequence &shortcut, bool autoRegister)
 {
-	if(shortcut.isEmpty()) {
+	if(shortcut.isEmpty())
 		return resetShortcut();
-	} else if(shortcut.count() > 1) {
+	if(shortcut.count() > 1) {
 		qCWarning(logQHotkey, "Keysequences with multiple shortcuts are not allowed! "
 							  "Only the first shortcut will be used!");
 	}
@@ -118,15 +116,14 @@ bool QHotkey::setShortcut(Qt::Key keyCode, Qt::KeyboardModifiers modifiers, bool
 	if(_nativeShortcut.isValid()) {
 		if(autoRegister)
 			return QHotkeyPrivate::instance()->addShortcut(this);
-		else
-			return true;
-	} else {
-		qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << keyCode << "Modifiers:" << modifiers;
-		_keyCode = Qt::Key_unknown;
-		_modifiers = Qt::NoModifier;
-		_nativeShortcut = NativeShortcut();
-		return false;
+		return true;
 	}
+
+	qCWarning(logQHotkey) << "Unable to map shortcut to native keys. Key:" << keyCode << "Modifiers:" << modifiers;
+	_keyCode = Qt::Key_unknown;
+	_modifiers = Qt::NoModifier;
+	_nativeShortcut = NativeShortcut();
+	return false;
 }
 
 bool QHotkey::resetShortcut()
@@ -158,35 +155,32 @@ bool QHotkey::setNativeShortcut(QHotkey::NativeShortcut nativeShortcut, bool aut
 		_nativeShortcut = nativeShortcut;
 		if(autoRegister)
 			return QHotkeyPrivate::instance()->addShortcut(this);
-		else
-			return true;
-	} else {
-		_keyCode = Qt::Key_unknown;
-		_modifiers = Qt::NoModifier;
-		_nativeShortcut = NativeShortcut();
 		return true;
-	}
+	} 
+
+	_keyCode = Qt::Key_unknown;
+	_modifiers = Qt::NoModifier;
+	_nativeShortcut = NativeShortcut();
+	return true;
 }
 
 bool QHotkey::setRegistered(bool registered)
 {
 	if(_registered && !registered)
 		return QHotkeyPrivate::instance()->removeShortcut(this);
-	else if(!_registered && registered) {
+	if(!_registered && registered) {
 		if(!_nativeShortcut.isValid())
 			return false;
-		else
-			return QHotkeyPrivate::instance()->addShortcut(this);
-	} else
-		return true;
+		return QHotkeyPrivate::instance()->addShortcut(this);
+	}
+	return true;
 }
 
 
 
 // ---------- QHotkeyPrivate implementation ----------
 
-QHotkeyPrivate::QHotkeyPrivate() :
-	shortcuts()
+QHotkeyPrivate::QHotkeyPrivate()
 {
 	Q_ASSERT_X(qApp, Q_FUNC_INFO, "QHotkey requires QCoreApplication to be instantiated");
 	qApp->eventDispatcher()->installNativeEventFilter(this);
@@ -211,8 +205,8 @@ QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcut(Qt::Key keycode, Qt::Keyb
 								  Q_ARG(Qt::Key, keycode),
 								  Q_ARG(Qt::KeyboardModifiers, modifiers))) {
 		return QHotkey::NativeShortcut();
-	} else
-		return res;
+	}
+	return res;
 }
 
 bool QHotkeyPrivate::addShortcut(QHotkey *hotkey)
@@ -228,11 +222,11 @@ bool QHotkeyPrivate::addShortcut(QHotkey *hotkey)
 								  Q_RETURN_ARG(bool, res),
 								  Q_ARG(QHotkey*, hotkey))) {
 		return false;
-	} else {
-		if(res)
-			emit hotkey->registeredChanged(true);
-		return res;
 	}
+
+	if(res)
+		emit hotkey->registeredChanged(true);
+	return res;
 }
 
 bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
@@ -248,11 +242,11 @@ bool QHotkeyPrivate::removeShortcut(QHotkey *hotkey)
 								  Q_RETURN_ARG(bool, res),
 								  Q_ARG(QHotkey*, hotkey))) {
 		return false;
-	} else {
-		if(res)
-			emit hotkey->registeredChanged(false);
-		return res;
 	}
+
+	if(res)
+		emit hotkey->registeredChanged(false);
+	return res;
 }
 
 void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut)
@@ -302,24 +296,24 @@ bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey)
 		if (!unregisterShortcut(shortcut)) {
 			qCWarning(logQHotkey) << QHotkey::tr("Failed to unregister %1. Error: %2").arg(hotkey->shortcut().toString(), error);
 			return false;
-		} else
-			return true;
-	} else
+		}
 		return true;
+	}
+	return true;
 }
 
 QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
 {
 	if(mapping.contains({keycode, modifiers}))
 		return mapping.value({keycode, modifiers});
 
-	bool ok1, ok2 = false;
+	bool ok1 = false;
 	auto k = nativeKeycode(keycode, ok1);
+	bool ok2 = false;
 	auto m = nativeModifiers(modifiers, ok2);
 	if(ok1 && ok2)
 		return {k, m};
-	else
-		return {};
+	return {};
 }
 
 
diff --git a/QHotkey/qhotkey_x11.cpp b/QHotkey/qhotkey_x11.cpp
@@ -22,7 +22,7 @@ class QHotkeyPrivateX11 : public QHotkeyPrivate
 	// 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)
