Merge pull request #6845 from lioncash/patch-dlg

NewPatchDialog/PatchesWidget: Use forward declarations where applicable

4 files changed, 22 insertions, 3 deletions

diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
index 34745ceafc..ae229a15dd 100644
--- a/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
+++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.cpp
@@ -15,6 +15,8 @@
 #include <QScrollArea>
 #include <QVBoxLayout>
 
+#include "Core/PatchEngine.h"
+
 NewPatchDialog::NewPatchDialog(QWidget* parent, PatchEngine::Patch& patch)
     : QDialog(parent), m_patch(patch)
 {
diff --git a/Source/Core/DolphinQt2/Config/NewPatchDialog.h b/Source/Core/DolphinQt2/Config/NewPatchDialog.h
index cc62712d9a..2ac8edb630 100644
--- a/Source/Core/DolphinQt2/Config/NewPatchDialog.h
+++ b/Source/Core/DolphinQt2/Config/NewPatchDialog.h
@@ -9,7 +9,10 @@
 #include <QDialog>
 #include <QWidget>
 
-#include "Core/PatchEngine.h"
+namespace PatchEngine
+{
+struct Patch;
+}
 
 class QDialogButtonBox;
 class QGroupBox;
diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
index 6b063d0136..e222189581 100644
--- a/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
+++ b/Source/Core/DolphinQt2/Config/PatchesWidget.cpp
@@ -11,9 +11,14 @@
 #include "Common/FileUtil.h"
 #include "Common/IniFile.h"
 #include "Common/StringUtil.h"
+
 #include "Core/ConfigManager.h"
+#include "Core/PatchEngine.h"
+
 #include "DolphinQt2/Config/NewPatchDialog.h"
 
+#include "UICommon/GameFile.h"
+
 PatchesWidget::PatchesWidget(const UICommon::GameFile& game)
     : m_game(game), m_game_id(game.GetGameID()), m_game_revision(game.GetRevision())
 {
diff --git a/Source/Core/DolphinQt2/Config/PatchesWidget.h b/Source/Core/DolphinQt2/Config/PatchesWidget.h
index f8998f121b..fd68171203 100644
--- a/Source/Core/DolphinQt2/Config/PatchesWidget.h
+++ b/Source/Core/DolphinQt2/Config/PatchesWidget.h
@@ -9,13 +9,22 @@
 
 #include <QWidget>
 
-#include "Core/PatchEngine.h"
-#include "UICommon/GameFile.h"
+#include "Common/CommonTypes.h"
+
+namespace PatchEngine
+{
+struct Patch;
+}
 
 class QListWidget;
 class QListWidgetItem;
 class QPushButton;
 
+namespace UICommon
+{
+class GameFile;
+}
+
 class PatchesWidget : public QWidget
 {
 public: