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

[quassel.git] / src / client / selectionmodelsynchronizer.cpp

diff --git a/src/client/selectionmodelsynchronizer.cpp b/src/client/selectionmodelsynchronizer.cpp
index 14c57c0..fc732d4 100644 (file)
--- a/src/client/selectionmodelsynchronizer.cpp
+++ b/src/client/selectionmodelsynchronizer.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -28,14 +28,12 @@
 SelectionModelSynchronizer::SelectionModelSynchronizer(QAbstractItemModel *parent)
     : QObject(parent),
     _model(parent),
-    _selectionModel(parent),
-    _changeCurrentEnabled(true),
-    _changeSelectionEnabled(true)
+    _selectionModel(parent)
 {
-    connect(&_selectionModel, SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-        this, SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
-    connect(&_selectionModel, SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
-        this, SLOT(selectionChanged(const QItemSelection &, const QItemSelection &)));
+    connect(&_selectionModel, &QItemSelectionModel::currentChanged,
+        this, &SelectionModelSynchronizer::currentChanged);
+    connect(&_selectionModel, &QItemSelectionModel::selectionChanged,
+        this, &SelectionModelSynchronizer::selectionChanged);
 }
 
 
@@ -45,8 +43,8 @@ bool SelectionModelSynchronizer::checkBaseModel(QItemSelectionModel *selectionMo
         return false;
 
     const QAbstractItemModel *baseModel = selectionModel->model();
-    const QAbstractProxyModel *proxyModel = 0;
-    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != 0) {
+    const QAbstractProxyModel *proxyModel = nullptr;
+    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != nullptr) {
         baseModel = proxyModel->sourceModel();
         if (baseModel == model())
             break;
@@ -68,12 +66,12 @@ void SelectionModelSynchronizer::synchronizeSelectionModel(QItemSelectionModel *
         return;
     }
 
-    connect(selectionModel, SIGNAL(currentChanged(QModelIndex, QModelIndex)),
-        this, SLOT(syncedCurrentChanged(QModelIndex, QModelIndex)));
-    connect(selectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
-        this, SLOT(syncedSelectionChanged(QItemSelection, QItemSelection)));
+    connect(selectionModel, &QItemSelectionModel::currentChanged,
+        this, &SelectionModelSynchronizer::syncedCurrentChanged);
+    connect(selectionModel, &QItemSelectionModel::selectionChanged,
+        this, &SelectionModelSynchronizer::syncedSelectionChanged);
 
-    connect(selectionModel, SIGNAL(destroyed(QObject *)), this, SLOT(selectionModelDestroyed(QObject *)));
+    connect(selectionModel, &QObject::destroyed, this, &SelectionModelSynchronizer::selectionModelDestroyed);
 
     _selectionModels << selectionModel;
 }
@@ -81,15 +79,15 @@ void SelectionModelSynchronizer::synchronizeSelectionModel(QItemSelectionModel *
 
 void SelectionModelSynchronizer::removeSelectionModel(QItemSelectionModel *model)
 {
-    disconnect(model, 0, this, 0);
-    disconnect(this, 0, model, 0);
+    disconnect(model, nullptr, this, nullptr);
+    disconnect(this, nullptr, model, nullptr);
     selectionModelDestroyed(model);
 }
 
 
 void SelectionModelSynchronizer::selectionModelDestroyed(QObject *object)
 {
-    QItemSelectionModel *model = static_cast<QItemSelectionModel *>(object);
+    auto *model = static_cast<QItemSelectionModel *>(object);
     QSet<QItemSelectionModel *>::iterator iter = _selectionModels.begin();
     while (iter != _selectionModels.end()) {
         if (*iter == model) {
@@ -109,7 +107,7 @@ void SelectionModelSynchronizer::syncedCurrentChanged(const QModelIndex &current
     if (!_changeCurrentEnabled)
         return;
 
-    QItemSelectionModel *selectionModel = qobject_cast<QItemSelectionModel *>(sender());
+    auto *selectionModel = qobject_cast<QItemSelectionModel *>(sender());
     Q_ASSERT(selectionModel);
     QModelIndex newSourceCurrent = mapToSource(current, selectionModel);
     if (newSourceCurrent.isValid() && newSourceCurrent != currentIndex())
@@ -125,7 +123,7 @@ void SelectionModelSynchronizer::syncedSelectionChanged(const QItemSelection &se
     if (!_changeSelectionEnabled)
         return;
 
-    QItemSelectionModel *selectionModel = qobject_cast<QItemSelectionModel *>(sender());
+    auto *selectionModel = qobject_cast<QItemSelectionModel *>(sender());
     Q_ASSERT(selectionModel);
 
     QItemSelection mappedSelection = selectionModel->selection();
@@ -156,8 +154,8 @@ QModelIndex SelectionModelSynchronizer::mapFromSource(const QModelIndex &sourceI
     // make a list of all involved proxies, wie have to traverse backwards
     QList<const QAbstractProxyModel *> proxyModels;
     const QAbstractItemModel *baseModel = selectionModel->model();
-    const QAbstractProxyModel *proxyModel = 0;
-    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != 0) {
+    const QAbstractProxyModel *proxyModel = nullptr;
+    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != nullptr) {
         if (baseModel == model())
             break;
         proxyModels << proxyModel;
@@ -182,8 +180,8 @@ QItemSelection SelectionModelSynchronizer::mapSelectionFromSource(const QItemSel
     // make a list of all involved proxies, wie have to traverse backwards
     QList<const QAbstractProxyModel *> proxyModels;
     const QAbstractItemModel *baseModel = selectionModel->model();
-    const QAbstractProxyModel *proxyModel = 0;
-    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != 0) {
+    const QAbstractProxyModel *proxyModel = nullptr;
+    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != nullptr) {
         if (baseModel == model())
             break;
         proxyModels << proxyModel;
@@ -204,8 +202,8 @@ QModelIndex SelectionModelSynchronizer::mapToSource(const QModelIndex &index, QI
 
     QModelIndex sourceIndex = index;
     const QAbstractItemModel *baseModel = selectionModel->model();
-    const QAbstractProxyModel *proxyModel = 0;
-    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != 0) {
+    const QAbstractProxyModel *proxyModel = nullptr;
+    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != nullptr) {
         sourceIndex = proxyModel->mapToSource(sourceIndex);
         baseModel = proxyModel->sourceModel();
         if (baseModel == model())
@@ -221,8 +219,8 @@ QItemSelection SelectionModelSynchronizer::mapSelectionToSource(const QItemSelec
 
     QItemSelection sourceSelection = selection;
     const QAbstractItemModel *baseModel = selectionModel->model();
-    const QAbstractProxyModel *proxyModel = 0;
-    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != 0) {
+    const QAbstractProxyModel *proxyModel = nullptr;
+    while ((proxyModel = qobject_cast<const QAbstractProxyModel *>(baseModel)) != nullptr) {
         sourceSelection = proxyModel->mapSelectionToSource(sourceSelection);
         baseModel = proxyModel->sourceModel();
         if (baseModel == model())