From f051b88f81910942bc253f115705b2f55ae3266a Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Tue, 12 Sep 2023 16:28:02 -0700 Subject: [PATCH] Qt: SaveConverter doesn't use the controller --- src/platform/qt/SaveConverter.cpp | 3 +-- src/platform/qt/SaveConverter.h | 3 +-- src/platform/qt/Window.cpp | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/platform/qt/SaveConverter.cpp b/src/platform/qt/SaveConverter.cpp index e51a3f044..44e061c8f 100644 --- a/src/platform/qt/SaveConverter.cpp +++ b/src/platform/qt/SaveConverter.cpp @@ -27,9 +27,8 @@ using namespace QGBA; -SaveConverter::SaveConverter(std::shared_ptr controller, QWidget* parent) +SaveConverter::SaveConverter(QWidget* parent) : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint) - , m_controller(controller) { m_ui.setupUi(this); diff --git a/src/platform/qt/SaveConverter.h b/src/platform/qt/SaveConverter.h index 6b9f3df62..2fa133071 100644 --- a/src/platform/qt/SaveConverter.h +++ b/src/platform/qt/SaveConverter.h @@ -31,7 +31,7 @@ class SaveConverter : public QDialog { Q_OBJECT public: - SaveConverter(std::shared_ptr controller, QWidget* parent = nullptr); + SaveConverter(QWidget* parent = nullptr); static mPlatform getStatePlatform(VFile*); static QByteArray getState(VFile*, mPlatform); @@ -100,7 +100,6 @@ private: Ui::SaveConverter m_ui; - std::shared_ptr m_controller; QList m_validSaves; QList m_validOutputs; }; diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp index d3a858de1..048da5039 100644 --- a/src/platform/qt/Window.cpp +++ b/src/platform/qt/Window.cpp @@ -1283,7 +1283,7 @@ void Window::setupMenu(QMenuBar* menubar) { m_actions.addSeparator("saves"); - m_actions.addAction(tr("Convert save game..."), "convertSave", openControllerTView(), "saves"); + m_actions.addAction(tr("Convert save game..."), "convertSave", openTView(), "saves"); #ifdef M_CORE_GBA auto importShark = addGameAction(tr("Import GameShark Save..."), "importShark", this, &Window::importSharkport, "saves");