X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fdccsettingspage.cpp;h=54a7fd40811efbfedf49318ee0275142413e3ec2;hp=829c877623b69e9b696ad2136d21b1fc210faaac;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/qtui/settingspages/dccsettingspage.cpp b/src/qtui/settingspages/dccsettingspage.cpp
index 829c8776..54a7fd40 100644
--- a/src/qtui/settingspages/dccsettingspage.cpp
+++ b/src/qtui/settingspages/dccsettingspage.cpp
@@ -22,31 +22,30 @@
 
 #include "client.h"
 #include "clienttransfermanager.h"
+#include "util.h"
 
-DccSettingsPage::DccSettingsPage(QWidget *parent)
+DccSettingsPage::DccSettingsPage(QWidget* parent)
     : SettingsPage(tr("IRC"), tr("DCC"), parent)
 {
     ui.setupUi(this);
     initAutoWidgets();
-    connect(ui.ipDetectionMode, SIGNAL(currentIndexChanged(int)), SLOT(updateWidgetStates()));
-    connect(ui.portSelectionMode, SIGNAL(currentIndexChanged(int)), SLOT(updateWidgetStates()));
+    connect(ui.ipDetectionMode, selectOverload<int>(&QComboBox::currentIndexChanged), this, &DccSettingsPage::updateWidgetStates);
+    connect(ui.portSelectionMode, selectOverload<int>(&QComboBox::currentIndexChanged), this, &DccSettingsPage::updateWidgetStates);
     updateWidgetStates();
 
-    connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), SLOT(onClientConfigChanged()));
+    connect(Client::instance(), &Client::coreConnectionStateChanged, this, &DccSettingsPage::onClientConfigChanged);
     setClientConfig(Client::dccConfig());
 }
 
-
 bool DccSettingsPage::isClientConfigValid() const
 {
     return _clientConfig != nullptr;
 }
 
-
-void DccSettingsPage::setClientConfig(DccConfig *config)
+void DccSettingsPage::setClientConfig(DccConfig* config)
 {
     if (_clientConfig) {
-        disconnect(_clientConfig, 0, this, 0);
+        disconnect(_clientConfig, nullptr, this, nullptr);
     }
     if (config && !isClientConfigValid()) {
         qWarning() << "Client DCC config is not valid/synchronized!";
@@ -56,7 +55,7 @@ void DccSettingsPage::setClientConfig(DccConfig *config)
     }
     _clientConfig = config;
     if (_clientConfig) {
-        connect(_clientConfig, SIGNAL(updated()), SLOT(load()));
+        connect(_clientConfig, &DccConfig::updated, this, &DccSettingsPage::load);
         load();
         ui.dccEnabled->setEnabled(true);
     }
@@ -65,24 +64,21 @@ void DccSettingsPage::setClientConfig(DccConfig *config)
     }
 }
 
-
 void DccSettingsPage::onClientConfigChanged()
 {
     if (Client::isConnected() && Client::dccConfig() && !Client::dccConfig()->isInitialized()) {
-        connect(Client::dccConfig(), SIGNAL(initDone()), SLOT(onClientConfigChanged()));
+        connect(Client::dccConfig(), &SyncableObject::initDone, this, &DccSettingsPage::onClientConfigChanged);
     }
     else {
         setClientConfig(Client::isConnected() ? Client::dccConfig() : nullptr);
     }
 }
 
-
 bool DccSettingsPage::hasDefaults() const
 {
     return true;
 }
 
-
 void DccSettingsPage::defaults()
 {
     _localConfig = DccConfig();
@@ -90,7 +86,6 @@ void DccSettingsPage::defaults()
     widgetHasChanged();
 }
 
-
 void DccSettingsPage::load()
 {
     _localConfig = isClientConfigValid() ? *_clientConfig : DccConfig{};
@@ -98,7 +93,6 @@ void DccSettingsPage::load()
     widgetHasChanged();
 }
 
-
 void DccSettingsPage::save()
 {
     SettingsPage::save();
@@ -108,7 +102,6 @@ void DccSettingsPage::save()
     setChangedState(false);
 }
 
-
 QVariant DccSettingsPage::loadAutoWidgetValue(const QString& widgetName)
 {
     if (widgetName == "dccEnabled")
@@ -138,7 +131,6 @@ QVariant DccSettingsPage::loadAutoWidgetValue(const QString& widgetName)
     return {};
 }
 
-
 void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVariant& value)
 {
     if (widgetName == "dccEnabled")
@@ -162,7 +154,7 @@ void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVari
     else if (widgetName == "useFastSend")
         _localConfig.setUseFastSend(value.toBool());
     else if (widgetName == "outgoingIp") {
-        QHostAddress address {QHostAddress::LocalHost};
+        QHostAddress address{QHostAddress::LocalHost};
         if (!address.setAddress(value.toString())) {
             qWarning() << "Invalid IP address!";
             address = QHostAddress{QHostAddress::LocalHost};
@@ -174,14 +166,12 @@ void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVari
     }
 }
 
-
 void DccSettingsPage::widgetHasChanged()
 {
     bool same = isClientConfigValid() && (_localConfig == *_clientConfig);
     setChangedState(!same);
 }
 
-
 void DccSettingsPage::updateWidgetStates()
 {
     ui.outgoingIp->setEnabled(ui.ipDetectionMode->currentIndex() != 0);