X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbasichandler.cpp;h=5c3140fd350f0ee9e082327f6e1589ed02e46931;hp=42841c428f5860a7fc584124c0459b26f59bf74c;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=f13ee12590d103b3512ba74c0bef3b0817c4c947

diff --git a/src/common/basichandler.cpp b/src/common/basichandler.cpp
index 42841c42..5c3140fd 100644
--- a/src/common/basichandler.cpp
+++ b/src/common/basichandler.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,9 +20,9 @@
 
 #include "basichandler.h"
 
+#include <QDebug>
 #include <QMetaMethod>
-
-#include "logger.h"
+#include <utility>
 
 BasicHandler::BasicHandler(QObject *parent)
     : QObject(parent),
@@ -33,11 +33,11 @@ BasicHandler::BasicHandler(QObject *parent)
 }
 
 
-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))
 {
 }
 
@@ -52,11 +52,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;
@@ -93,14 +89,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);
 }