summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/CMakeLists.txt4
-rw-r--r--src/citra_qt/debugger/ramview.cpp12
-rw-r--r--src/citra_qt/debugger/ramview.h17
-rw-r--r--src/citra_qt/main.cpp3
4 files changed, 2 insertions, 34 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 93f1c339d..d4460bf01 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -14,7 +14,6 @@ set(SRCS
14 debugger/graphics/graphics_tracing.cpp 14 debugger/graphics/graphics_tracing.cpp
15 debugger/graphics/graphics_vertex_shader.cpp 15 debugger/graphics/graphics_vertex_shader.cpp
16 debugger/profiler.cpp 16 debugger/profiler.cpp
17 debugger/ramview.cpp
18 debugger/registers.cpp 17 debugger/registers.cpp
19 debugger/wait_tree.cpp 18 debugger/wait_tree.cpp
20 util/spinbox.cpp 19 util/spinbox.cpp
@@ -48,7 +47,6 @@ set(HEADERS
48 debugger/graphics/graphics_tracing.h 47 debugger/graphics/graphics_tracing.h
49 debugger/graphics/graphics_vertex_shader.h 48 debugger/graphics/graphics_vertex_shader.h
50 debugger/profiler.h 49 debugger/profiler.h
51 debugger/ramview.h
52 debugger/registers.h 50 debugger/registers.h
53 debugger/wait_tree.h 51 debugger/wait_tree.h
54 util/spinbox.h 52 util/spinbox.h
@@ -100,7 +98,7 @@ if (APPLE)
100else() 98else()
101 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) 99 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
102endif() 100endif()
103target_link_libraries(citra-qt core video_core audio_core common qhexedit) 101target_link_libraries(citra-qt core video_core audio_core common)
104target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS}) 102target_link_libraries(citra-qt ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS})
105target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads) 103target_link_libraries(citra-qt ${PLATFORM_LIBRARIES} Threads::Threads)
106 104
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
deleted file mode 100644
index 10a09dda8..000000000
--- a/src/citra_qt/debugger/ramview.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#include "citra_qt/debugger/ramview.h"
6
7GRamView::GRamView(QWidget* parent) : QHexEdit(parent) {}
8
9void GRamView::OnCPUStepped() {
10 // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams...
11 // setData(QByteArray((const char*)Mem_RAM,sizeof(Mem_RAM)/8));
12}
diff --git a/src/citra_qt/debugger/ramview.h b/src/citra_qt/debugger/ramview.h
deleted file mode 100644
index d01cea93b..000000000
--- a/src/citra_qt/debugger/ramview.h
+++ /dev/null
@@ -1,17 +0,0 @@
1// Copyright 2014 Citra Emulator Project
2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included.
4
5#pragma once
6
7#include "qhexedit.h"
8
9class GRamView : public QHexEdit {
10 Q_OBJECT
11
12public:
13 explicit GRamView(QWidget* parent = nullptr);
14
15public slots:
16 void OnCPUStepped();
17};
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 6d59cf640..f765c0147 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -12,6 +12,7 @@
12#include <QFileDialog> 12#include <QFileDialog>
13#include <QMessageBox> 13#include <QMessageBox>
14#include <QtGui> 14#include <QtGui>
15#include <QtWidgets>
15#include "citra_qt/bootmanager.h" 16#include "citra_qt/bootmanager.h"
16#include "citra_qt/config.h" 17#include "citra_qt/config.h"
17#include "citra_qt/configure_dialog.h" 18#include "citra_qt/configure_dialog.h"
@@ -24,7 +25,6 @@
24#include "citra_qt/debugger/graphics/graphics_tracing.h" 25#include "citra_qt/debugger/graphics/graphics_tracing.h"
25#include "citra_qt/debugger/graphics/graphics_vertex_shader.h" 26#include "citra_qt/debugger/graphics/graphics_vertex_shader.h"
26#include "citra_qt/debugger/profiler.h" 27#include "citra_qt/debugger/profiler.h"
27#include "citra_qt/debugger/ramview.h"
28#include "citra_qt/debugger/registers.h" 28#include "citra_qt/debugger/registers.h"
29#include "citra_qt/debugger/wait_tree.h" 29#include "citra_qt/debugger/wait_tree.h"
30#include "citra_qt/game_list.h" 30#include "citra_qt/game_list.h"
@@ -46,7 +46,6 @@
46#include "core/gdbstub/gdbstub.h" 46#include "core/gdbstub/gdbstub.h"
47#include "core/loader/loader.h" 47#include "core/loader/loader.h"
48#include "core/settings.h" 48#include "core/settings.h"
49#include "qhexedit.h"
50#include "video_core/video_core.h" 49#include "video_core/video_core.h"
51 50
52#ifdef QT_STATICPLUGIN 51#ifdef QT_STATICPLUGIN