test: Add build system support and a main function for unit tests

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

diff --git a/src/client/buffermodel.cpp b/src/client/buffermodel.cpp
index b1bfef3..0d9ec2d 100644 (file)
--- a/src/client/buffermodel.cpp
+++ b/src/client/buffermodel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 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  *
@@ -32,11 +32,11 @@ BufferModel::BufferModel(NetworkModel *parent)
 {
     setSourceModel(parent);
     if (Quassel::isOptionSet("debugbufferswitches")) {
-        connect(_selectionModelSynchronizer.selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(debug_currentChanged(const QModelIndex &, const QModelIndex &)));
+        connect(_selectionModelSynchronizer.selectionModel(), &QItemSelectionModel::currentChanged,
+            this, &BufferModel::debug_currentChanged);
     }
-    connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), this, SLOT(newNetwork(NetworkId)));
-    connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(newBuffers(const QModelIndex &, int, int)));
+    connect(Client::instance(), &Client::networkCreated, this, &BufferModel::newNetwork);
+    connect(this, &QAbstractItemModel::rowsInserted, this, &BufferModel::newBuffers);
 }
 
 
@@ -57,8 +57,8 @@ void BufferModel::newNetwork(NetworkId id)
 {
     const Network *net = Client::network(id);
     Q_ASSERT(net);
-    connect(net, SIGNAL(connectionStateSet(Network::ConnectionState)),
-        this, SLOT(networkConnectionChanged(Network::ConnectionState)));
+    connect(net, &Network::connectionStateSet,
+        this, &BufferModel::networkConnectionChanged);
 }
 
 
@@ -70,7 +70,7 @@ void BufferModel::networkConnectionChanged(Network::ConnectionState state)
         if (currentIndex().isValid())
             return;
         {
-            Network *net = qobject_cast<Network *>(sender());
+            auto *net = qobject_cast<Network *>(sender());
             Q_ASSERT(net);
             setCurrentIndex(mapFromSource(Client::networkModel()->networkIndex(net->networkId())));
         }