X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fconnectionsettingspage.cpp;h=2e0dc29a5be535251661f42a3ffc936fe8708d0a;hp=3d4ac7a36ce4414986fd5559e71304e1715bf10f;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=4a5065255e652dd0c301bac0db41b7afb777ef49

diff --git a/src/qtui/settingspages/connectionsettingspage.cpp b/src/qtui/settingspages/connectionsettingspage.cpp
index 3d4ac7a3..2e0dc29a 100644
--- a/src/qtui/settingspages/connectionsettingspage.cpp
+++ b/src/qtui/settingspages/connectionsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2020 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -23,54 +23,49 @@
 #include "client.h"
 #include "networkconfig.h"
 
-ConnectionSettingsPage::ConnectionSettingsPage(QWidget *parent)
+ConnectionSettingsPage::ConnectionSettingsPage(QWidget* parent)
     : SettingsPage(tr("IRC"), QString(), parent)
 {
     ui.setupUi(this);
     initAutoWidgets();
 
-    connect(Client::instance(), SIGNAL(connected()), this, SLOT(clientConnected()));
-    connect(Client::instance(), SIGNAL(disconnected()), this, SLOT(clientDisconnected()));
+    connect(Client::instance(), &Client::connected, this, &ConnectionSettingsPage::clientConnected);
+    connect(Client::instance(), &Client::disconnected, this, &ConnectionSettingsPage::clientDisconnected);
 
     setEnabled(false);
     if (Client::isConnected())
         clientConnected();
 }
 
-
 void ConnectionSettingsPage::clientConnected()
 {
     if (Client::networkConfig()->isInitialized())
         initDone();
     else
-        connect(Client::networkConfig(), SIGNAL(initDone()), SLOT(initDone()));
+        connect(Client::networkConfig(), &SyncableObject::initDone, this, &ConnectionSettingsPage::initDone);
 }
 
-
 void ConnectionSettingsPage::clientDisconnected()
 {
     setEnabled(false);
     setChangedState(false);
 }
 
-
 void ConnectionSettingsPage::initDone()
 {
     setEnabled(true);
 }
 
-
 bool ConnectionSettingsPage::hasDefaults() const
 {
     return true;
 }
 
-
-QVariant ConnectionSettingsPage::loadAutoWidgetValue(const QString &widgetName)
+QVariant ConnectionSettingsPage::loadAutoWidgetValue(const QString& widgetName)
 {
     if (!isEnabled())
         return QVariant();
-    NetworkConfig *config = Client::networkConfig();
+    NetworkConfig* config = Client::networkConfig();
     if (widgetName == "pingTimeoutEnabled")
         return config->pingTimeoutEnabled();
     if (widgetName == "pingInterval")
@@ -85,16 +80,17 @@ QVariant ConnectionSettingsPage::loadAutoWidgetValue(const QString &widgetName)
         return config->autoWhoNickLimit();
     if (widgetName == "autoWhoDelay")
         return config->autoWhoDelay();
+    if (widgetName == "standardCtcp")
+        return config->standardCtcp();
 
     return SettingsPage::loadAutoWidgetValue(widgetName);
 }
 
-
-void ConnectionSettingsPage::saveAutoWidgetValue(const QString &widgetName, const QVariant &value)
+void ConnectionSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVariant& value)
 {
     if (!isEnabled())
         return;
-    NetworkConfig *config = Client::networkConfig();
+    NetworkConfig* config = Client::networkConfig();
     if (widgetName == "pingTimeoutEnabled")
         config->requestSetPingTimeoutEnabled(value.toBool());
     else if (widgetName == "pingInterval")
@@ -109,6 +105,8 @@ void ConnectionSettingsPage::saveAutoWidgetValue(const QString &widgetName, cons
         config->requestSetAutoWhoNickLimit(value.toInt());
     else if (widgetName == "autoWhoDelay")
         config->requestSetAutoWhoDelay(value.toInt());
+    else if (widgetName == "standardCtcp")
+        config->requestSetStandardCtcp(value.toBool());
 
     else
         SettingsPage::saveAutoWidgetValue(widgetName, value);