diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index 860f6e6110..0969a7018d 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -193,7 +193,7 @@ void CheatsManager::OnStateChanged(Core::State state) if (m_ar_code) m_ar_code->deleteLater(); - m_ar_code = new ARCodeWidget(*m_game_file, false); + m_ar_code = new ARCodeWidget(m_game_file->GetGameID(), m_game_file->GetRevision(), false); m_tab_widget->insertTab(0, m_ar_code, tr("AR Code")); m_tab_widget->insertTab(1, new GeckoCodeWidget(*m_game_file, false), tr("Gecko Codes")); } diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp index 4a1769ff3b..8c11c9618e 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.cpp +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.cpp @@ -4,6 +4,8 @@ #include "DolphinQt/Config/ARCodeWidget.h" +#include + #include #include #include @@ -23,8 +25,8 @@ #include "UICommon/GameFile.h" -ARCodeWidget::ARCodeWidget(const UICommon::GameFile& game, bool restart_required) - : m_game(game), m_game_id(game.GetGameID()), m_game_revision(game.GetRevision()), +ARCodeWidget::ARCodeWidget(std::string game_id, u16 game_revision, bool restart_required) + : m_game_id(std::move(game_id)), m_game_revision(game_revision), m_restart_required(restart_required) { CreateWidgets(); diff --git a/Source/Core/DolphinQt/Config/ARCodeWidget.h b/Source/Core/DolphinQt/Config/ARCodeWidget.h index 48af85ec22..32f3495993 100644 --- a/Source/Core/DolphinQt/Config/ARCodeWidget.h +++ b/Source/Core/DolphinQt/Config/ARCodeWidget.h @@ -16,11 +16,6 @@ namespace ActionReplay struct ARCode; } -namespace UICommon -{ -class GameFile; -} - class CheatWarningWidget; class QLabel; class QListWidget; @@ -31,7 +26,7 @@ class ARCodeWidget : public QWidget { Q_OBJECT public: - explicit ARCodeWidget(const UICommon::GameFile& game, bool restart_required = true); + explicit ARCodeWidget(std::string game_id, u16 game_revision, bool restart_required = true); ~ARCodeWidget() override; void AddCode(ActionReplay::ARCode code); @@ -56,7 +51,6 @@ private: void OnListReordered(); - const UICommon::GameFile& m_game; std::string m_game_id; u16 m_game_revision; diff --git a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp index e84ddc558a..0764e5011f 100644 --- a/Source/Core/DolphinQt/Config/PropertiesDialog.cpp +++ b/Source/Core/DolphinQt/Config/PropertiesDialog.cpp @@ -38,7 +38,7 @@ PropertiesDialog::PropertiesDialog(QWidget* parent, const UICommon::GameFile& ga QTabWidget* tab_widget = new QTabWidget(this); InfoWidget* info = new InfoWidget(game); - ARCodeWidget* ar = new ARCodeWidget(game); + ARCodeWidget* ar = new ARCodeWidget(game.GetGameID(), game.GetRevision()); GeckoCodeWidget* gecko = new GeckoCodeWidget(game); PatchesWidget* patches = new PatchesWidget(game); GameConfigWidget* game_config = new GameConfigWidget(game);