Merge pull request #6845 from lioncash/patch-dlg

NewPatchDialog/PatchesWidget: Use forward declarations where applicable
dolphin-emu · May 13, 2018 · 1fe92b8 · 1fe92b8
2 parents 07b57c7 + 799e415
commit 1fe92b8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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: