X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Fconnectionsettingspage.cpp;h=f06c6c8fba26f6291e26cf484838e168dd5fddac;hp=4fcc70a6fcb0361e54c36c4b25fc758c146183ad;hb=cc6e7c08709c4e761e2fd9c2e322751015497003;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a diff --git a/src/qtui/settingspages/connectionsettingspage.cpp b/src/qtui/settingspages/connectionsettingspage.cpp index 4fcc70a6..f06c6c8f 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-2019 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") @@ -91,12 +86,11 @@ QVariant ConnectionSettingsPage::loadAutoWidgetValue(const QString &widgetName) 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")