common: Make SyncableObject non-copyable

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

diff --git a/src/qtui/settingspages/dccsettingspage.cpp b/src/qtui/settingspages/dccsettingspage.cpp
index f84a81a..3d74449 100644 (file)
--- a/src/qtui/settingspages/dccsettingspage.cpp
+++ b/src/qtui/settingspages/dccsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-2018 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  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -24,7 +24,7 @@
 #include "clienttransfermanager.h"
 #include "util.h"
 
 #include "clienttransfermanager.h"
 #include "util.h"
 

-DccSettingsPage::DccSettingsPage(QWidget *parent)
+DccSettingsPage::DccSettingsPage(QWidget* parent)

     : SettingsPage(tr("IRC"), tr("DCC"), parent)
 {
     ui.setupUi(this);
     : SettingsPage(tr("IRC"), tr("DCC"), parent)
 {
     ui.setupUi(this);


@@ -37,14 +37,12 @@ DccSettingsPage::DccSettingsPage(QWidget *parent)
     setClientConfig(Client::dccConfig());
 }
 
     setClientConfig(Client::dccConfig());
 }
 

-

 bool DccSettingsPage::isClientConfigValid() const
 {
     return _clientConfig != nullptr;
 }
 
 bool DccSettingsPage::isClientConfigValid() const
 {
     return _clientConfig != nullptr;
 }
 

-
-void DccSettingsPage::setClientConfig(DccConfig *config)
+void DccSettingsPage::setClientConfig(DccConfig* config)

 {
     if (_clientConfig) {
         disconnect(_clientConfig, nullptr, this, nullptr);
 {
     if (_clientConfig) {
         disconnect(_clientConfig, nullptr, this, nullptr);


@@ -66,7 +64,6 @@ void DccSettingsPage::setClientConfig(DccConfig *config)
     }
 }
 
     }
 }
 

-

 void DccSettingsPage::onClientConfigChanged()
 {
     if (Client::isConnected() && Client::dccConfig() && !Client::dccConfig()->isInitialized()) {
 void DccSettingsPage::onClientConfigChanged()
 {
     if (Client::isConnected() && Client::dccConfig() && !Client::dccConfig()->isInitialized()) {


@@ -77,29 +74,25 @@ void DccSettingsPage::onClientConfigChanged()
     }
 }
 
     }
 }
 

-

 bool DccSettingsPage::hasDefaults() const
 {
     return true;
 }
 
 bool DccSettingsPage::hasDefaults() const
 {
     return true;
 }
 

-

 void DccSettingsPage::defaults()
 {
 void DccSettingsPage::defaults()
 {

-    _localConfig = DccConfig();
+    _localConfig.fromVariantMap(DccConfig{}.toVariantMap());

     SettingsPage::load();
     widgetHasChanged();
 }
 
     SettingsPage::load();
     widgetHasChanged();
 }
 

-

 void DccSettingsPage::load()
 {
 void DccSettingsPage::load()
 {

-    _localConfig = isClientConfigValid() ? *_clientConfig : DccConfig{};
+    _localConfig.fromVariantMap(isClientConfigValid() ? _clientConfig->toVariantMap() : DccConfig{}.toVariantMap());

     SettingsPage::load();
     widgetHasChanged();
 }
 
     SettingsPage::load();
     widgetHasChanged();
 }
 

-

 void DccSettingsPage::save()
 {
     SettingsPage::save();
 void DccSettingsPage::save()
 {
     SettingsPage::save();


@@ -109,7 +102,6 @@ void DccSettingsPage::save()
     setChangedState(false);
 }
 
     setChangedState(false);
 }
 

-

 QVariant DccSettingsPage::loadAutoWidgetValue(const QString& widgetName)
 {
     if (widgetName == "dccEnabled")
 QVariant DccSettingsPage::loadAutoWidgetValue(const QString& widgetName)
 {
     if (widgetName == "dccEnabled")


@@ -139,7 +131,6 @@ QVariant DccSettingsPage::loadAutoWidgetValue(const QString& widgetName)
     return {};
 }
 
     return {};
 }
 

-

 void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVariant& value)
 {
     if (widgetName == "dccEnabled")
 void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVariant& value)
 {
     if (widgetName == "dccEnabled")


@@ -163,7 +154,7 @@ void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVari
     else if (widgetName == "useFastSend")
         _localConfig.setUseFastSend(value.toBool());
     else if (widgetName == "outgoingIp") {
     else if (widgetName == "useFastSend")
         _localConfig.setUseFastSend(value.toBool());
     else if (widgetName == "outgoingIp") {

-        QHostAddress address {QHostAddress::LocalHost};
+        QHostAddress address{QHostAddress::LocalHost};

         if (!address.setAddress(value.toString())) {
             qWarning() << "Invalid IP address!";
             address = QHostAddress{QHostAddress::LocalHost};
         if (!address.setAddress(value.toString())) {
             qWarning() << "Invalid IP address!";
             address = QHostAddress{QHostAddress::LocalHost};


@@ -175,14 +166,12 @@ void DccSettingsPage::saveAutoWidgetValue(const QString& widgetName, const QVari
     }
 }
 
     }
 }
 

-

 void DccSettingsPage::widgetHasChanged()
 {
     bool same = isClientConfigValid() && (_localConfig == *_clientConfig);
     setChangedState(!same);
 }
 
 void DccSettingsPage::widgetHasChanged()
 {
     bool same = isClientConfigValid() && (_localConfig == *_clientConfig);
     setChangedState(!same);
 }
 

-

 void DccSettingsPage::updateWidgetStates()
 {
     ui.outgoingIp->setEnabled(ui.ipDetectionMode->currentIndex() != 0);
 void DccSettingsPage::updateWidgetStates()
 {
     ui.outgoingIp->setEnabled(ui.ipDetectionMode->currentIndex() != 0);