From b4d91cc612faccab995f3f66765baa38066a0e35 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Mon, 9 Jul 2018 00:45:27 -0400
Subject: [PATCH] DolphinQt/Settings: Replace includes with forward
 declarations

Avoids dragging in netplay-related headers where they aren't explicitly
necessary.
---
 Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp        |  3 +++
 Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp |  8 +++++---
 Source/Core/DolphinQt/Settings.cpp                 |  4 ++++
 Source/Core/DolphinQt/Settings.h                   | 11 ++++++++---
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
index 4b778849dc..b86b1e782e 100644
--- a/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/MD5Dialog.cpp
@@ -13,6 +13,9 @@
 #include <QProgressBar>
 #include <QVBoxLayout>
 
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayServer.h"
+
 #include "DolphinQt/Settings.h"
 
 static QString GetPlayerNameFromPID(int pid)
diff --git a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
index a01c2c53c8..fbfe64e538 100644
--- a/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
+++ b/Source/Core/DolphinQt/NetPlay/PadMappingDialog.cpp
@@ -3,15 +3,17 @@
 // Refer to the license.txt file included.
 
 #include "DolphinQt/NetPlay/PadMappingDialog.h"
-#include "DolphinQt/Settings.h"
-
-#include "Core/NetPlayClient.h"
 
 #include <QComboBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
 #include <QLabel>
 
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayServer.h"
+
+#include "DolphinQt/Settings.h"
+
 PadMappingDialog::PadMappingDialog(QWidget* parent) : QDialog(parent)
 {
   setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
diff --git a/Source/Core/DolphinQt/Settings.cpp b/Source/Core/DolphinQt/Settings.cpp
index 58b22431b0..7db5017a32 100644
--- a/Source/Core/DolphinQt/Settings.cpp
+++ b/Source/Core/DolphinQt/Settings.cpp
@@ -19,6 +19,8 @@
 #include "Core/Config/MainSettings.h"
 #include "Core/ConfigManager.h"
 #include "Core/Core.h"
+#include "Core/NetPlayClient.h"
+#include "Core/NetPlayServer.h"
 
 #include "DolphinQt/GameList/GameListModel.h"
 #include "DolphinQt/QtUtils/QueueOnObject.h"
@@ -38,6 +40,8 @@ Settings::Settings()
   SetCurrentUserStyle(GetCurrentUserStyle());
 }
 
+Settings::~Settings() = default;
+
 Settings& Settings::Instance()
 {
   static Settings settings;
diff --git a/Source/Core/DolphinQt/Settings.h b/Source/Core/DolphinQt/Settings.h
index 5af90a3da6..8636d21bdb 100644
--- a/Source/Core/DolphinQt/Settings.h
+++ b/Source/Core/DolphinQt/Settings.h
@@ -11,9 +11,6 @@
 #include <QSettings>
 #include <QVector>
 
-#include "Core/NetPlayClient.h"
-#include "Core/NetPlayServer.h"
-
 namespace Core
 {
 enum class State;
@@ -24,6 +21,12 @@ namespace DiscIO
 enum class Language;
 }
 
+namespace NetPlay
+{
+class NetPlayClient;
+class NetPlayServer;
+}
+
 class GameListModel;
 class InputConfig;
 class QFont;
@@ -39,6 +42,8 @@ public:
   Settings(Settings&&) = delete;
   Settings& operator=(Settings&&) = delete;
 
+  ~Settings();
+
   static Settings& Instance();
   static QSettings& GetQSettings();