From 5c4e4e978e2ae26004c294841d2388e8fff60955 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Mon, 27 Jun 2016 03:52:54 +0200
Subject: [PATCH] refs #681, removed old FSD settings (we use server based FSD
 setup now)

---
 src/blackcore/settings/network.h              | 24 -----------
 .../components/settingsnetworkcomponent.cpp   | 12 ------
 .../components/settingsnetworkcomponent.h     |  7 ----
 .../components/settingsnetworkcomponent.ui    | 42 +++++++------------
 4 files changed, 14 insertions(+), 71 deletions(-)

diff --git a/src/blackcore/settings/network.h b/src/blackcore/settings/network.h
index 74a4cd8c3..0cc025bed 100644
--- a/src/blackcore/settings/network.h
+++ b/src/blackcore/settings/network.h
@@ -22,19 +22,6 @@ namespace BlackCore
     {
         namespace Network
         {
-            //! Name of text codec to use with text in FSD protocol
-            struct WireTextCodec : public BlackMisc::CSettingTrait<QString>
-            {
-                //! \copydoc BlackMisc::CSettingTrait::key
-                static const char *key() { return "network/wiretextcodec"; }
-
-                //! \copydoc BlackMisc::CSettingTrait::defaultValue
-                static const QString &defaultValue() { static const QString dv("latin1"); return dv; }
-
-                //! \copydoc BlackMisc::CSettingTrait::isValid
-                static bool isValid(const QString &value) { return QTextCodec::codecForName(qPrintable(value)); }
-            };
-
             //! Virtual air traffic servers
             struct TrafficServers : public BlackMisc::CSettingTrait<BlackMisc::Network::CServerList>
             {
@@ -66,17 +53,6 @@ namespace BlackCore
                 //! \copydoc BlackMisc::CSettingTrait::defaultValue
                 static const QString &defaultValue() { static const QString dv("session"); return dv; }
             };
-
-            //! Interim positions enabled
-            struct InterimPositionsEnabled : public BlackMisc::CSettingTrait<bool>
-            {
-                //! \copydoc BlackMisc::CSettingTrait::key
-                static const char *key() { return "network/interimpositions"; }
-
-                //! \copydoc BlackMisc::CSettingTrait::defaultValue
-                static bool defaultValue() { return true; }
-            };
-
         } // ns
     } // ns
 } // ns
diff --git a/src/blackgui/components/settingsnetworkcomponent.cpp b/src/blackgui/components/settingsnetworkcomponent.cpp
index 2717ae460..928b2a9ca 100644
--- a/src/blackgui/components/settingsnetworkcomponent.cpp
+++ b/src/blackgui/components/settingsnetworkcomponent.cpp
@@ -25,20 +25,8 @@ namespace BlackGui
             ui(new Ui::CSettingsNetworkComponent)
         {
             ui->setupUi(this);
-            connect(this->ui->cb_FastPositionUpdates, &QCheckBox::released, this, &CSettingsNetworkComponent::ps_guiValuesChanged);
-            this->ui->cb_FastPositionUpdates->setChecked(m_interimPositionsEnabled.get());
         }
 
         CSettingsNetworkComponent::~CSettingsNetworkComponent() { }
-
-        void CSettingsNetworkComponent::ps_guiValuesChanged()
-        {
-            QObject *sender = QObject::sender();
-            if (sender == ui->cb_FastPositionUpdates)
-            {
-                bool enabled = this->ui->cb_FastPositionUpdates->isChecked();
-                m_interimPositionsEnabled.set(enabled);
-            }
-        }
     } // ns
 } // ns
diff --git a/src/blackgui/components/settingsnetworkcomponent.h b/src/blackgui/components/settingsnetworkcomponent.h
index 6f61f096f..5b5bedb4c 100644
--- a/src/blackgui/components/settingsnetworkcomponent.h
+++ b/src/blackgui/components/settingsnetworkcomponent.h
@@ -27,7 +27,6 @@ namespace BlackGui
 {
     namespace Components
     {
-
         //! General settings for network
         class BLACKGUI_EXPORT CSettingsNetworkComponent :
             public QFrame
@@ -41,15 +40,9 @@ namespace BlackGui
             //! Destructor
             ~CSettingsNetworkComponent();
 
-        private:
-            //! GUI values have been changed
-            void ps_guiValuesChanged();
-
         private:
             QScopedPointer<Ui::CSettingsNetworkComponent> ui;
-            BlackMisc::CSetting<BlackCore::Settings::Network::InterimPositionsEnabled> m_interimPositionsEnabled { this };
         };
-
     } // ns
 } // ns
 
diff --git a/src/blackgui/components/settingsnetworkcomponent.ui b/src/blackgui/components/settingsnetworkcomponent.ui
index 5f9667a89..46d934500 100644
--- a/src/blackgui/components/settingsnetworkcomponent.ui
+++ b/src/blackgui/components/settingsnetworkcomponent.ui
@@ -20,34 +20,7 @@
    <enum>QFrame::Raised</enum>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
-    <widget class="QCheckBox" name="cb_FastPositionUpdates">
-     <property name="text">
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="lbl_FastPositionUpdates">
-     <property name="text">
-      <string>Enable fast position updates</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <spacer name="vs_NetworkSettings">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="1" column="0" colspan="2">
+   <item row="0" column="0" colspan="2">
     <widget class="QGroupBox" name="gb_Services">
      <property name="title">
       <string>Services</string>
@@ -72,6 +45,19 @@
      </layout>
     </widget>
    </item>
+   <item row="1" column="0">
+    <spacer name="vs_NetworkSettings">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <customwidgets>