X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Ftoolbaractionprovider.cpp;h=b444deb430fbf08f4e681bfd3bea80a533e89c97;hb=2c8434f74c68194d56f2084f637419123e61d18b;hp=0ae1078d9f91a57b4bd00822ea4341416f579e75;hpb=b7447afe8e836376776dac26704e227a678d2913;p=quassel.git

diff --git a/src/uisupport/toolbaractionprovider.cpp b/src/uisupport/toolbaractionprovider.cpp
index 0ae1078d..b444deb4 100644
--- a/src/uisupport/toolbaractionprovider.cpp
+++ b/src/uisupport/toolbaractionprovider.cpp
@@ -61,18 +61,13 @@ ToolBarActionProvider::ToolBarActionProvider(QObject *parent)
     action(NetworkDisconnectAllWithDropdown)->setMenu(_networksDisconnectMenu);
     action(NetworkDisconnectAllWithDropdown)->setEnabled(false);
 
-    connect(Client::instance(), SIGNAL(networkCreated(NetworkId)), SLOT(networkCreated(NetworkId)));
-    connect(Client::instance(), SIGNAL(networkRemoved(NetworkId)), SLOT(networkRemoved(NetworkId)));
+    connect(Client::instance(), &Client::networkCreated, this, &ToolBarActionProvider::networkCreated);
+    connect(Client::instance(), &Client::networkRemoved, this, &ToolBarActionProvider::networkRemoved);
 
     updateStates();
 }
 
 
-ToolBarActionProvider::~ToolBarActionProvider()
-{
-}
-
-
 void ToolBarActionProvider::disconnectedFromCore()
 {
     _currentBuffer = QModelIndex();
@@ -116,14 +111,14 @@ void ToolBarActionProvider::addActions(QToolBar *bar, ToolBarType type)
 }
 
 
-void ToolBarActionProvider::currentBufferChanged(const QModelIndex &index)
+void ToolBarActionProvider::onCurrentBufferChanged(const QModelIndex &index)
 {
     _currentBuffer = index;
     updateStates();
 }
 
 
-void ToolBarActionProvider::nickSelectionChanged(const QModelIndexList &indexList)
+void ToolBarActionProvider::onNickSelectionChanged(const QModelIndexList &indexList)
 {
     _selectedNicks = indexList;
     updateStates();
@@ -166,8 +161,8 @@ void ToolBarActionProvider::networkCreated(NetworkId id)
     _networkActions[id] = act;
     act->setObjectName(QString("NetworkAction-%1").arg(id.toInt()));
     act->setData(QVariant::fromValue<NetworkId>(id));
-    connect(net, SIGNAL(updatedRemotely()), SLOT(networkUpdated()));
-    connect(act, SIGNAL(triggered()), SLOT(connectOrDisconnectNet()));
+    connect(net, &Network::updatedRemotely, this, [this]() { networkUpdated(); });
+    connect(act, &QAction::triggered, this, &ToolBarActionProvider::connectOrDisconnectNet);
     networkUpdated(net);
 }
 
@@ -215,7 +210,7 @@ void ToolBarActionProvider::networkUpdated(const Network *net)
 
 void ToolBarActionProvider::connectOrDisconnectNet()
 {
-    QAction *act = qobject_cast<QAction *>(sender());
+    auto *act = qobject_cast<QAction *>(sender());
     if (!act)
         return;
     const Network *net = Client::network(act->data().value<NetworkId>());