X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fconnectionsettingspage.cpp;h=f06c6c8fba26f6291e26cf484838e168dd5fddac;hb=ec747d2e6065e645e2cd768abc84923ef6a19705;hp=c42e70530dc416b625461f13c9a6032180ca37fd;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git

diff --git a/src/qtui/settingspages/connectionsettingspage.cpp b/src/qtui/settingspages/connectionsettingspage.cpp
index c42e7053..f06c6c8f 100644
--- a/src/qtui/settingspages/connectionsettingspage.cpp
+++ b/src/qtui/settingspages/connectionsettingspage.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
+ *   (at your option) version 3.                                           *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "connectionsettingspage.h"
@@ -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);