X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspages%2Fconnectionsettingspage.cpp;h=364e9fdbad026045e87923d9d0a39a8cfaf888b3;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hp=edec88a1d25ed966a1896d618e25f53a7bc429d0;hpb=5b686746c880e5cda6d5de3e08180ea4332ff222;p=quassel.git

diff --git a/src/qtui/settingspages/connectionsettingspage.cpp b/src/qtui/settingspages/connectionsettingspage.cpp
index edec88a1..364e9fdb 100644
--- a/src/qtui/settingspages/connectionsettingspage.cpp
+++ b/src/qtui/settingspages/connectionsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 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  *
@@ -29,8 +29,8 @@ ConnectionSettingsPage::ConnectionSettingsPage(QWidget *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())
@@ -43,7 +43,7 @@ void ConnectionSettingsPage::clientConnected()
     if (Client::networkConfig()->isInitialized())
         initDone();
     else
-        connect(Client::networkConfig(), SIGNAL(initDone()), SLOT(initDone()));
+        connect(Client::networkConfig(), &SyncableObject::initDone, this, &ConnectionSettingsPage::initDone);
 }
 
 
@@ -85,6 +85,8 @@ 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);
 }
@@ -109,6 +111,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);