From 43bc3656ebbbc3922228de22b018f14eba0ab9b4 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 10 Jul 2018 14:29:17 -0400 Subject: [PATCH] Qt/CheatsManager: Move concealable types into the cpp file CompareType, DataType, and Result aren't directly used externally, so these can have their definitions moved into the cpp file. --- Source/Core/DolphinQt/CheatsManager.cpp | 31 ++++++++++++++++++++ Source/Core/DolphinQt/CheatsManager.h | 39 ++++--------------------- 2 files changed, 37 insertions(+), 33 deletions(-) diff --git a/Source/Core/DolphinQt/CheatsManager.cpp b/Source/Core/DolphinQt/CheatsManager.cpp index c76737e7f3..020e7692c9 100644 --- a/Source/Core/DolphinQt/CheatsManager.cpp +++ b/Source/Core/DolphinQt/CheatsManager.cpp @@ -41,6 +41,35 @@ constexpr u32 MAX_RESULTS = 50; constexpr int INDEX_ROLE = Qt::UserRole; constexpr int COLUMN_ROLE = Qt::UserRole + 1; +enum class CompareType : int +{ + Equal = 0, + NotEqual = 1, + Less = 2, + LessEqual = 3, + More = 4, + MoreEqual = 5 +}; + +enum class DataType : int +{ + Byte = 0, + Short = 1, + Int = 2, + Float = 3, + Double = 4, + String = 5 +}; + +struct Result +{ + u32 address; + DataType type; + QString name; + bool locked = false; + u32 locked_value; +}; + CheatsManager::CheatsManager(QWidget* parent) : QDialog(parent) { setWindowTitle(tr("Cheats Manager")); @@ -57,6 +86,8 @@ CheatsManager::CheatsManager(QWidget* parent) : QDialog(parent) Update(); } +CheatsManager::~CheatsManager() = default; + void CheatsManager::OnStateChanged(Core::State state) { if (state != Core::State::Running && state != Core::State::Paused) diff --git a/Source/Core/DolphinQt/CheatsManager.h b/Source/Core/DolphinQt/CheatsManager.h index 8d4a5a12b4..6992daec2a 100644 --- a/Source/Core/DolphinQt/CheatsManager.h +++ b/Source/Core/DolphinQt/CheatsManager.h @@ -15,6 +15,7 @@ class ARCodeWidget; class QComboBox; class QDialogButtonBox; +class QLabel; class QLineEdit; class QPushButton; class QRadioButton; @@ -22,52 +23,24 @@ class QSplitter; class QTabWidget; class QTableWidget; class QTableWidgetItem; -class QLabel; - -namespace UICommon -{ -class GameFile; -} +struct Result; namespace Core { enum class State; } -enum class CompareType : int +namespace UICommon { - Equal = 0, - NotEqual = 1, - Less = 2, - LessEqual = 3, - More = 4, - MoreEqual = 5 -}; - -enum class DataType : int -{ - Byte = 0, - Short = 1, - Int = 2, - Float = 3, - Double = 4, - String = 5 -}; - -struct Result -{ - u32 address; - DataType type; - QString name; - bool locked = false; - u32 locked_value; -}; +class GameFile; +} class CheatsManager : public QDialog { Q_OBJECT public: explicit CheatsManager(QWidget* parent = nullptr); + ~CheatsManager(); private: QWidget* CreateCheatSearch();