modernize: Reformat ALL the source... again!

[quassel.git] / src / qtui / settingspages / coreconnectionsettingspage.cpp

diff --git a/src/qtui/settingspages/coreconnectionsettingspage.cpp b/src/qtui/settingspages/coreconnectionsettingspage.cpp
index be48d28..d92632f 100644 (file)
--- a/src/qtui/settingspages/coreconnectionsettingspage.cpp
+++ b/src/qtui/settingspages/coreconnectionsettingspage.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   Copyright (C) 2009 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  *
  *   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,27 +15,23 @@
  *   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 "coreconnectionsettingspage.h"
 
-CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget *parent)
+CoreConnectionSettingsPage::CoreConnectionSettingsPage(QWidget* parent)
     : SettingsPage(tr("Remote Cores"), tr("Connection"), parent)
 {
     ui.setupUi(this);
-#ifndef HAVE_KDE
-    ui.useSolid->hide();
-#endif
 
     initAutoWidgets();
 
-    connect(ui.useSolid, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
-    connect(ui.usePingTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
-    connect(ui.useNoTimeout, SIGNAL(toggled(bool)), SLOT(widgetHasChanged()));
+    connect(ui.useQNetworkConfigurationManager, &QAbstractButton::toggled, this, &CoreConnectionSettingsPage::widgetHasChanged);
+    connect(ui.usePingTimeout, &QAbstractButton::toggled, this, &CoreConnectionSettingsPage::widgetHasChanged);
+    connect(ui.useNoTimeout, &QAbstractButton::toggled, this, &CoreConnectionSettingsPage::widgetHasChanged);
 }
 
-
 void CoreConnectionSettingsPage::widgetHasChanged()
 {
     bool hasChanged = false;
@@ -46,19 +42,13 @@ void CoreConnectionSettingsPage::widgetHasChanged()
     setChangedState(hasChanged);
 }
 
-
 void CoreConnectionSettingsPage::defaults()
 {
-#ifdef HAVE_KDE
-    setRadioButtons(CoreConnectionSettings::UseSolid);
-#else
-    setRadioButtons(CoreConnectionSettings::UsePingTimeout);
-#endif
+    setRadioButtons(CoreConnectionSettings::UseQNetworkConfigurationManager);
 
     SettingsPage::defaults();
 }
 
-
 void CoreConnectionSettingsPage::load()
 {
     CoreConnectionSettings s;
@@ -67,7 +57,6 @@ void CoreConnectionSettingsPage::load()
     SettingsPage::load();
 }
 
-
 void CoreConnectionSettingsPage::save()
 {
     _detectionMode = modeFromRadioButtons();
@@ -76,15 +65,12 @@ void CoreConnectionSettingsPage::save()
     SettingsPage::save();
 }
 
-
 void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::NetworkDetectionMode mode)
 {
     switch (mode) {
-#ifdef HAVE_KDE
-    case CoreConnectionSettings::UseSolid:
-        ui.useSolid->setChecked(true);
+    case CoreConnectionSettings::UseQNetworkConfigurationManager:
+        ui.useQNetworkConfigurationManager->setChecked(true);
         break;
-#endif
     case CoreConnectionSettings::UsePingTimeout:
         ui.usePingTimeout->setChecked(true);
         break;
@@ -93,13 +79,10 @@ void CoreConnectionSettingsPage::setRadioButtons(CoreConnectionSettings::Network
     }
 }
 
-
 CoreConnectionSettings::NetworkDetectionMode CoreConnectionSettingsPage::modeFromRadioButtons() const
 {
-#ifdef HAVE_KDE
-    if (ui.useSolid->isChecked())
-        return CoreConnectionSettings::UseSolid;
-#endif
+    if (ui.useQNetworkConfigurationManager->isChecked())
+        return CoreConnectionSettings::UseQNetworkConfigurationManager;
     if (ui.usePingTimeout->isChecked())
         return CoreConnectionSettings::UsePingTimeout;