From 0243ba91710590396196ca674e75111bb50089a2 Mon Sep 17 00:00:00 2001
From: jnewbon <jamie@symless.com>
Date: Tue, 25 Feb 2020 16:32:46 +0000
Subject: [PATCH] #6583 Changed Server config to pull Settings directly from
 AppConfig instead of maintaining its own pointer

Signed-off-by: jnewbon <jamie@symless.com>
---
 src/gui/src/ServerConfig.cpp | 30 +++++++++++++++++-------------
 src/gui/src/ServerConfig.h   |  7 ++++---
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/gui/src/ServerConfig.cpp b/src/gui/src/ServerConfig.cpp
index fd821e5ad0..11797181c6 100644
--- a/src/gui/src/ServerConfig.cpp
+++ b/src/gui/src/ServerConfig.cpp
@@ -42,21 +42,21 @@ static const struct
 
 const int serverDefaultIndex = 7;
 
-ServerConfig::ServerConfig(QSettings* settings, int numColumns, int numRows ,
+ServerConfig::ServerConfig(AppConfig* appConfig, int numColumns, int numRows ,
                 QString serverName, MainWindow* mainWindow) :
-    m_pSettings(settings),
-    m_Screens(),
-    m_NumColumns(numColumns),
-    m_NumRows(numRows),
-    m_ServerName(serverName),
-    m_IgnoreAutoConfigClient(false),
-    m_EnableDragAndDrop(false),
-    m_DisableLockToScreen(false),
-    m_ClipboardSharing(true),
-    m_ClipboardSharingSize(defaultClipboardSharingSize()),
-    m_pMainWindow(mainWindow)
+        m_pAppConfig(appConfig),
+        m_Screens(),
+        m_NumColumns(numColumns),
+        m_NumRows(numRows),
+        m_ServerName(serverName),
+        m_IgnoreAutoConfigClient(false),
+        m_EnableDragAndDrop(false),
+        m_DisableLockToScreen(false),
+        m_ClipboardSharing(true),
+        m_ClipboardSharingSize(defaultClipboardSharingSize()),
+        m_pMainWindow(mainWindow)
 {
-    Q_ASSERT(m_pSettings);
+    Q_ASSERT(m_pAppConfig);
 
     loadSettings();
 }
@@ -430,3 +430,7 @@ size_t ServerConfig::setClipboardSharingSize(size_t size) {
 	swap (size, m_ClipboardSharingSize);
 	return size;
 }
+
+QSettings &ServerConfig::settings() {
+    return m_pAppConfig->settings();
+}
diff --git a/src/gui/src/ServerConfig.h b/src/gui/src/ServerConfig.h
index fb3284ce52..506e4edfd6 100644
--- a/src/gui/src/ServerConfig.h
+++ b/src/gui/src/ServerConfig.h
@@ -32,6 +32,7 @@ class QString;
 class QFile;
 class ServerConfigDialog;
 class MainWindow;
+class AppConfig;
 
 class ServerConfig : public BaseConfig
 {
@@ -39,7 +40,7 @@ class ServerConfig : public BaseConfig
     friend QTextStream& operator<<(QTextStream& outStream, const ServerConfig& config);
 
     public:
-        ServerConfig(QSettings* settings, int numColumns, int numRows,
+        ServerConfig(AppConfig* settings, int numColumns, int numRows,
             QString serverName, MainWindow* mainWindow);
         ~ServerConfig();
 
@@ -75,7 +76,7 @@ class ServerConfig : public BaseConfig
         int autoAddScreen(const QString name);
 
     protected:
-        QSettings& settings() { return *m_pSettings; }
+        QSettings& settings();
         ScreenList& screens() { return m_Screens; }
         void setScreens(const ScreenList& screens) { m_Screens = screens; }
         void addScreen(const Screen& screen) { m_Screens.append(screen); }
@@ -110,7 +111,7 @@ class ServerConfig : public BaseConfig
         void addToFirstEmptyGrid(const QString& clientName);
 
     private:
-        QSettings* m_pSettings;
+        AppConfig* m_pAppConfig;
         ScreenList m_Screens;
         int m_NumColumns;
         int m_NumRows;