ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8247 from lioncash/core-include 

Core/HW/AddressSpace: Remove unnecessary inclusion of Core.h
This commit is contained in:
Connor McLaughlin 2019-07-16 14:32:18 +10:00 committed by GitHub
parent 1606528093 2b00eefbef
commit 9dd8f82e78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/AddressSpace.h
View File

@ -6,7 +6,7 @@
#include <optional> #include <optional>
#include "Core/Core.h" #include "Common/CommonTypes.h"
namespace AddressSpace namespace AddressSpace
{ {

1
Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
View File

@ -15,6 +15,7 @@
#include <cmath> #include <cmath>
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/HW/AddressSpace.h"
#include "Core/PowerPC/BreakPoints.h" #include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PowerPC.h" #include "Core/PowerPC/PowerPC.h"
#include "DolphinQt/Resources.h" #include "DolphinQt/Resources.h"

8
Source/Core/DolphinQt/Debugger/MemoryViewWidget.h
View File

@ -7,7 +7,11 @@
#include <QTableWidget> #include <QTableWidget>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/AddressSpace.h"
namespace AddressSpace
{
enum class Type;
}
class MemoryViewWidget : public QTableWidget class MemoryViewWidget : public QTableWidget
{ {
@ -59,7 +63,7 @@ private:
void OnCopyAddress(); void OnCopyAddress();
void OnCopyHex(); void OnCopyHex();
AddressSpace::Type m_address_space = AddressSpace::Type::Effective; AddressSpace::Type m_address_space{};
Type m_type = Type::U8; Type m_type = Type::U8;
BPType m_bp_type = BPType::ReadWrite; BPType m_bp_type = BPType::ReadWrite;
bool m_do_log = true; bool m_do_log = true;

1
Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
View File

@ -23,6 +23,7 @@
#include "Common/File.h" #include "Common/File.h"
#include "Common/FileUtil.h" #include "Common/FileUtil.h"
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/HW/AddressSpace.h"
#include "DolphinQt/Debugger/MemoryViewWidget.h" #include "DolphinQt/Debugger/MemoryViewWidget.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h" #include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings.h" #include "DolphinQt/Settings.h"

1
Source/Core/DolphinQt/Debugger/MemoryWidget.h
View File

@ -9,7 +9,6 @@
#include <QDockWidget> #include <QDockWidget>
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
#include "Core/HW/AddressSpace.h"
class MemoryViewWidget; class MemoryViewWidget;
class QCheckBox; class QCheckBox;