clazy: Convert many old-style connects into function pointer based

[quassel.git] / src / qtui / settingspages / ignorelistmodel.cpp

diff --git a/src/qtui/settingspages/ignorelistmodel.cpp b/src/qtui/settingspages/ignorelistmodel.cpp
index 6f639bd..74df6e1 100644 (file)
--- a/src/qtui/settingspages/ignorelistmodel.cpp
+++ b/src/qtui/settingspages/ignorelistmodel.cpp
@@ -28,13 +28,11 @@
 #include "signalproxy.h"
 
 IgnoreListModel::IgnoreListModel(QObject *parent)
-    : QAbstractItemModel(parent),
-    _configChanged(false),
-    _modelReady(false)
+    : QAbstractItemModel(parent)
 {
     // we need this signal for future connects to reset the data;
-    connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
-    connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
+    connect(Client::instance(), &Client::connected, this, &IgnoreListModel::clientConnected);
+    connect(Client::instance(), &Client::disconnected, this, &IgnoreListModel::clientDisconnected);
 
     if (Client::isConnected())
         clientConnected();
@@ -92,6 +90,7 @@ QVariant IgnoreListModel::data(const QModelIndex &index, int role) const
             else
                 return tr("By Message");
         }
+        // Intentional fallthrough
     case Qt::EditRole:
         switch (index.column()) {
         case 0:
@@ -222,7 +221,7 @@ QModelIndex IgnoreListModel::index(int row, int column, const QModelIndex &paren
 {
     Q_UNUSED(parent);
     if (row >= rowCount() || column >= columnCount())
-        return QModelIndex();
+        return {};
 
     return createIndex(row, column);
 }
@@ -294,7 +293,7 @@ void IgnoreListModel::clientConnected()
     if (Client::ignoreListManager()->isInitialized())
         initDone();
     else
-        connect(Client::ignoreListManager(), SIGNAL(initDone()), SLOT(initDone()));
+        connect(Client::ignoreListManager(), &SyncableObject::initDone, this, &IgnoreListModel::initDone);
 }