remove UPnP

bitcoin/bitcoin#31130

Author: pinheadmz

qml/components/ConnectionSettings.qml

@@ -25,19 +25,6 @@ ColumnLayout {
         }
     }
     Separator { Layout.fillWidth: true }
-    Setting {
-        Layout.fillWidth: true
-        header: qsTr("Map port using UPnP")
-        actionItem: OptionSwitch {
-            checked: optionsModel.upnp
-            onToggled: optionsModel.upnp = checked
-        }
-        onClicked: {
-          loadedItem.toggle()
-          loadedItem.toggled()
-        }
-    }
-    Separator { Layout.fillWidth: true }
     Setting {
         Layout.fillWidth: true
         header: qsTr("Map port using NAT-PMP")

qml/models/options_model.cpp

@@ -43,8 +43,6 @@ OptionsQmlModel::OptionsQmlModel(interfaces::Node& node, bool is_onboarded)
 
     m_server = SettingToBool(m_node.getPersistentSetting("server"), false);
 
-    m_upnp = SettingToBool(m_node.getPersistentSetting("upnp"), DEFAULT_UPNP);
-
     m_dataDir = getDefaultDataDirString();
 }
 
@@ -125,17 +123,6 @@ void OptionsQmlModel::setServer(bool new_server)
     }
 }
 
-void OptionsQmlModel::setUpnp(bool new_upnp)
-{
-    if (new_upnp != m_upnp) {
-        m_upnp = new_upnp;
-        if (m_onboarded) {
-            m_node.updateRwSetting("upnp", new_upnp);
-        }
-        Q_EMIT upnpChanged(new_upnp);
-    }
-}
-
 common::SettingsValue OptionsQmlModel::pruneSetting() const
 {
     assert(!m_prune || m_prune_size_gb >= 1);
@@ -223,8 +210,5 @@ void OptionsQmlModel::onboard()
     if (m_server) {
         m_node.updateRwSetting("server", m_server);
     }
-    if (m_upnp) {
-        m_node.updateRwSetting("upnp", m_upnp);
-    }
     m_onboarded = true;
 }

qml/models/options_model.h

@@ -35,7 +35,6 @@ class OptionsQmlModel : public QObject
     Q_PROPERTY(int pruneSizeGB READ pruneSizeGB WRITE setPruneSizeGB NOTIFY pruneSizeGBChanged)
     Q_PROPERTY(int scriptThreads READ scriptThreads WRITE setScriptThreads NOTIFY scriptThreadsChanged)
     Q_PROPERTY(bool server READ server WRITE setServer NOTIFY serverChanged)
-    Q_PROPERTY(bool upnp READ upnp WRITE setUpnp NOTIFY upnpChanged)
     Q_PROPERTY(QString dataDir READ dataDir WRITE setDataDir NOTIFY dataDirChanged)
     Q_PROPERTY(QString getDefaultDataDirString READ getDefaultDataDirString CONSTANT)
     Q_PROPERTY(QUrl getDefaultDataDirectory READ getDefaultDataDirectory CONSTANT)
@@ -61,8 +60,6 @@ class OptionsQmlModel : public QObject
     void setScriptThreads(int new_script_threads);
     bool server() const { return m_server; }
     void setServer(bool new_server);
-    bool upnp() const { return m_upnp; }
-    void setUpnp(bool new_upnp);
     QString dataDir() const { return m_dataDir; }
     void setDataDir(QString new_data_dir);
     QString getDefaultDataDirString();
@@ -84,7 +81,6 @@ public Q_SLOTS:
     void pruneSizeGBChanged(int new_prune_size_gb);
     void scriptThreadsChanged(int new_script_threads);
     void serverChanged(bool new_server);
-    void upnpChanged(bool new_upnp);
     void customDataDirStringChanged(QString new_custom_datadir_string);
     void dataDirChanged(QString new_data_dir);
 
@@ -104,7 +100,6 @@ public Q_SLOTS:
     int m_prune_size_gb;
     int m_script_threads;
     bool m_server;
-    bool m_upnp;
     QString m_custom_datadir_string;
     QString m_dataDir;