X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fbasichandler.cpp;h=906e82e45aa6be15c0e712e02dc1633bfb365bc3;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hp=fe7531d1ef216bf14b6b96f5126154c1acefc45e;hpb=37110ceaa070167b4f40ed449ac9ea130503a792;p=quassel.git

diff --git a/src/common/basichandler.cpp b/src/common/basichandler.cpp
index fe7531d1..906e82e4 100644
--- a/src/common/basichandler.cpp
+++ b/src/common/basichandler.cpp
@@ -22,21 +22,18 @@
 
 #include <QDebug>
 #include <QMetaMethod>
+#include <utility>
 
 BasicHandler::BasicHandler(QObject *parent)
     : QObject(parent),
-    _defaultHandler(-1),
-    _initDone(false),
     _methodPrefix("handle")
 {
 }
 
 
-BasicHandler::BasicHandler(const QString &methodPrefix, QObject *parent)
+BasicHandler::BasicHandler(QString methodPrefix, QObject *parent)
     : QObject(parent),
-    _defaultHandler(-1),
-    _initDone(false),
-    _methodPrefix(methodPrefix)
+    _methodPrefix(std::move(methodPrefix))
 {
 }
 
@@ -51,11 +48,7 @@ const QHash<QString, int> &BasicHandler::handlerHash()
 {
     if (!_initDone) {
         for (int i = metaObject()->methodOffset(); i < metaObject()->methodCount(); i++) {
-#if QT_VERSION >= 0x050000
             QString methodSignature = metaObject()->method(i).methodSignature();
-#else
-            QString methodSignature = metaObject()->method(i).signature();
-#endif
             if (methodSignature.startsWith("defaultHandler")) {
                 _defaultHandler = i;
                 continue;
@@ -92,14 +85,14 @@ void BasicHandler::handle(const QString &member, QGenericArgument val0,
             return;
         }
         else {
-            void *param[] = { 0, Q_ARG(QString, member).data(), val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
+            void *param[] = { nullptr, Q_ARG(QString, member).data(), val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
                               val5.data(), val6.data(), val7.data(), val8.data(), val8.data() };
             qt_metacall(QMetaObject::InvokeMetaMethod, _defaultHandler, param);
             return;
         }
     }
 
-    void *param[] = { 0, val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
-                      val5.data(), val6.data(), val7.data(), val8.data(), val8.data(), 0 };
+    void *param[] = { nullptr, val0.data(), val1.data(), val2.data(), val3.data(), val4.data(),
+                      val5.data(), val6.data(), val7.data(), val8.data(), val8.data(), nullptr };
     qt_metacall(QMetaObject::InvokeMetaMethod, handlerHash()[handler], param);
 }