mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-22 01:53:22 +02:00
citra_qt: Reorganize headers
This commit is contained in:
parent
abc34ddb88
commit
abe5bb4019
@ -1,6 +1,6 @@
|
||||
#include <QApplication>
|
||||
#include <QHBoxLayout>
|
||||
#include <QKeyEvent>
|
||||
#include <QApplication>
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
// Required for screen DPI information
|
||||
@ -8,23 +8,19 @@
|
||||
#include <QWindow>
|
||||
#endif
|
||||
|
||||
#include "bootmanager.h"
|
||||
#include "main.h"
|
||||
#include "citra_qt/bootmanager.h"
|
||||
|
||||
#include "common/string_util.h"
|
||||
#include "common/scm_rev.h"
|
||||
#include "common/key_map.h"
|
||||
#include "common/microprofile.h"
|
||||
#include "common/scm_rev.h"
|
||||
#include "common/string_util.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/settings.h"
|
||||
#include "core/system.h"
|
||||
|
||||
#include "video_core/debug_utils/debug_utils.h"
|
||||
|
||||
#include "video_core/video_core.h"
|
||||
|
||||
#include "citra_qt/version.h"
|
||||
#include "video_core/debug_utils/debug_utils.h"
|
||||
|
||||
#define APP_NAME "citra"
|
||||
#define APP_VERSION "0.1-" VERSION
|
||||
|
@ -6,8 +6,8 @@
|
||||
#include <condition_variable>
|
||||
#include <mutex>
|
||||
|
||||
#include <QThread>
|
||||
#include <QGLWidget>
|
||||
#include <QThread>
|
||||
|
||||
#include "common/emu_window.h"
|
||||
#include "common/thread.h"
|
||||
|
@ -6,10 +6,10 @@
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
|
||||
#include "core/settings.h"
|
||||
#include "common/file_util.h"
|
||||
#include "citra_qt/config.h"
|
||||
|
||||
#include "config.h"
|
||||
#include "common/file_util.h"
|
||||
#include "core/settings.h"
|
||||
|
||||
Config::Config() {
|
||||
|
||||
|
@ -4,14 +4,14 @@
|
||||
|
||||
#include <QStandardItemModel>
|
||||
|
||||
#include "citra_qt/debugger/callstack.h"
|
||||
|
||||
#include "common/common_types.h"
|
||||
#include "common/symbols.h"
|
||||
|
||||
#include "callstack.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/arm/arm_interface.h"
|
||||
#include "core/memory.h"
|
||||
#include "core/arm/arm_interface.h"
|
||||
#include "core/arm/disassembler/arm_disasm.h"
|
||||
|
||||
CallstackWidget::CallstackWidget(QWidget* parent): QDockWidget(parent)
|
||||
|
@ -4,18 +4,16 @@
|
||||
|
||||
#include <QShortcut>
|
||||
|
||||
#include "disassembler.h"
|
||||
#include "citra_qt/bootmanager.h"
|
||||
#include "citra_qt/hotkeys.h"
|
||||
#include "citra_qt/debugger/disassembler.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
#include "../bootmanager.h"
|
||||
#include "../hotkeys.h"
|
||||
|
||||
#include "../util/util.h"
|
||||
|
||||
#include "core/memory.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "common/break_points.h"
|
||||
#include "common/symbols.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/memory.h"
|
||||
#include "core/arm/arm_interface.h"
|
||||
#include "core/arm/disassembler/arm_disasm.h"
|
||||
|
||||
|
@ -2,11 +2,9 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "graphics.h"
|
||||
#include <QListView>
|
||||
#include <QVBoxLayout>
|
||||
#include <QDebug>
|
||||
|
||||
#include "citra_qt/debugger/graphics.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
extern GraphicsDebugger g_debugger;
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
#include <QMetaType>
|
||||
|
||||
#include "graphics_breakpoint_observer.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
|
||||
|
||||
BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
|
||||
const QString& title, QWidget* parent)
|
||||
|
@ -2,17 +2,17 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include <QLabel>
|
||||
#include <QMetaType>
|
||||
#include <QPushButton>
|
||||
#include <QTreeView>
|
||||
#include <QVBoxLayout>
|
||||
#include <QLabel>
|
||||
|
||||
#include "citra_qt/debugger/graphics_breakpoints.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoints_p.h"
|
||||
|
||||
#include "common/assert.h"
|
||||
|
||||
#include "graphics_breakpoints.h"
|
||||
#include "graphics_breakpoints_p.h"
|
||||
|
||||
BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
|
||||
: QAbstractListModel(parent), context_weak(debug_context),
|
||||
at_breakpoint(debug_context->at_breakpoint),
|
||||
|
@ -6,7 +6,6 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <QAbstractListModel>
|
||||
#include <QDockWidget>
|
||||
|
||||
#include "video_core/debug_utils/debug_utils.h"
|
||||
|
@ -4,26 +4,24 @@
|
||||
|
||||
#include <QApplication>
|
||||
#include <QClipboard>
|
||||
#include <QComboBox>
|
||||
#include <QHeaderView>
|
||||
#include <QLabel>
|
||||
#include <QListView>
|
||||
#include <QMainWindow>
|
||||
#include <QPushButton>
|
||||
#include <QVBoxLayout>
|
||||
#include <QTreeView>
|
||||
#include <QHeaderView>
|
||||
#include <QSpinBox>
|
||||
#include <QComboBox>
|
||||
#include <QTreeView>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
#include "citra_qt/debugger/graphics_cmdlists.h"
|
||||
#include "citra_qt/util/spinbox.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
#include "common/vector_math.h"
|
||||
|
||||
#include "video_core/debug_utils/debug_utils.h"
|
||||
#include "video_core/pica.h"
|
||||
|
||||
#include "graphics_cmdlists.h"
|
||||
|
||||
#include "util/spinbox.h"
|
||||
#include "video_core/debug_utils/debug_utils.h"
|
||||
|
||||
QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) {
|
||||
QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
|
||||
|
@ -9,18 +9,17 @@
|
||||
#include <QPushButton>
|
||||
#include <QSpinBox>
|
||||
|
||||
#include "citra_qt/debugger/graphics_framebuffer.h"
|
||||
#include "citra_qt/util/spinbox.h"
|
||||
|
||||
#include "common/color.h"
|
||||
|
||||
#include "core/hw/gpu.h"
|
||||
#include "core/memory.h"
|
||||
#include "core/hw/gpu.h"
|
||||
|
||||
#include "video_core/pica.h"
|
||||
#include "video_core/utils.h"
|
||||
|
||||
#include "graphics_framebuffer.h"
|
||||
|
||||
#include "util/spinbox.h"
|
||||
|
||||
GraphicsFramebufferWidget::GraphicsFramebufferWidget(std::shared_ptr<Pica::DebugContext> debug_context,
|
||||
QWidget* parent)
|
||||
: BreakPointObserverDock(debug_context, tr("Pica Framebuffer"), parent),
|
||||
|
@ -4,9 +4,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QDockWidget>
|
||||
|
||||
#include "graphics_breakpoint_observer.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
|
||||
|
||||
class QComboBox;
|
||||
class QLabel;
|
||||
|
@ -4,26 +4,25 @@
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <boost/range/algorithm/copy.hpp>
|
||||
|
||||
#include <QBoxLayout>
|
||||
#include <QComboBox>
|
||||
#include <QFileDialog>
|
||||
#include <QLabel>
|
||||
#include <QMessageBox>
|
||||
#include <QPushButton>
|
||||
#include <QSpinBox>
|
||||
|
||||
#include <boost/range/algorithm/copy.hpp>
|
||||
#include "citra_qt/debugger/graphics_tracing.h"
|
||||
|
||||
#include "common/common_types.h"
|
||||
|
||||
#include "core/hw/gpu.h"
|
||||
#include "core/hw/lcd.h"
|
||||
|
||||
#include "video_core/pica.h"
|
||||
|
||||
#include "nihstro/float24.h"
|
||||
|
||||
#include "graphics_tracing.h"
|
||||
#include "video_core/pica.h"
|
||||
|
||||
|
||||
GraphicsTracingWidget::GraphicsTracingWidget(std::shared_ptr<Pica::DebugContext> debug_context,
|
||||
QWidget* parent)
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "graphics_breakpoint_observer.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
|
||||
|
||||
class EmuThread;
|
||||
|
||||
|
@ -16,12 +16,11 @@
|
||||
#include <QSpinBox>
|
||||
#include <QTreeView>
|
||||
|
||||
#include "citra_qt/debugger/graphics_vertex_shader.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
#include "video_core/shader/shader.h"
|
||||
|
||||
#include "graphics_vertex_shader.h"
|
||||
|
||||
using nihstro::OpCode;
|
||||
using nihstro::Instruction;
|
||||
using nihstro::SourceRegister;
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
#include <QAbstractTableModel>
|
||||
|
||||
#include "graphics_breakpoint_observer.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoint_observer.h"
|
||||
|
||||
#include "nihstro/parser_shbin.h"
|
||||
|
||||
|
@ -6,12 +6,11 @@
|
||||
#include <QPainter>
|
||||
#include <QString>
|
||||
|
||||
#include "profiler.h"
|
||||
|
||||
#include "citra_qt/debugger/profiler.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
#include "common/profiler_reporting.h"
|
||||
#include "common/microprofile.h"
|
||||
#include "common/profiler_reporting.h"
|
||||
|
||||
// Include the implementation of the UI in this file. This isn't in microprofile.cpp because the
|
||||
// non-Qt frontends don't need it (and don't implement the UI drawing hooks either).
|
||||
|
@ -2,8 +2,7 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "ramview.h"
|
||||
|
||||
#include "citra_qt/debugger/ramview.h"
|
||||
|
||||
GRamView::GRamView(QWidget* parent) : QHexEdit(parent)
|
||||
{
|
||||
|
@ -2,9 +2,10 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "registers.h"
|
||||
#include <QTreeWidgetItem>
|
||||
|
||||
#include "../util/util.h"
|
||||
#include "citra_qt/debugger/registers.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/arm/arm_interface.h"
|
||||
|
@ -5,9 +5,9 @@
|
||||
#include "ui_registers.h"
|
||||
|
||||
#include <QDockWidget>
|
||||
#include <QTreeWidgetItem>
|
||||
|
||||
class QTreeWidget;
|
||||
class QTreeWidgetItem;
|
||||
class EmuThread;
|
||||
|
||||
class RegistersWidget : public QDockWidget
|
||||
|
@ -8,7 +8,7 @@
|
||||
#include <QSettings>
|
||||
#include <QShortcut>
|
||||
|
||||
#include "hotkeys.h"
|
||||
#include "citra_qt/hotkeys.h"
|
||||
|
||||
struct Hotkey
|
||||
{
|
||||
|
@ -4,51 +4,49 @@
|
||||
|
||||
#include <thread>
|
||||
|
||||
#include <QtGui>
|
||||
#include <QDesktopWidget>
|
||||
#include <QtGui>
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
#include "qhexedit.h"
|
||||
#include "main.h"
|
||||
|
||||
#include "common/string_util.h"
|
||||
#include "common/logging/text_formatter.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "common/logging/backend.h"
|
||||
#include "common/logging/filter.h"
|
||||
#include "citra_qt/bootmanager.h"
|
||||
#include "citra_qt/config.h"
|
||||
#include "citra_qt/hotkeys.h"
|
||||
#include "citra_qt/main.h"
|
||||
|
||||
// Debugger
|
||||
#include "citra_qt/debugger/callstack.h"
|
||||
#include "citra_qt/debugger/disassembler.h"
|
||||
#include "citra_qt/debugger/graphics.h"
|
||||
#include "citra_qt/debugger/graphics_breakpoints.h"
|
||||
#include "citra_qt/debugger/graphics_cmdlists.h"
|
||||
#include "citra_qt/debugger/graphics_framebuffer.h"
|
||||
#include "citra_qt/debugger/graphics_tracing.h"
|
||||
#include "citra_qt/debugger/graphics_vertex_shader.h"
|
||||
#include "citra_qt/debugger/profiler.h"
|
||||
#include "citra_qt/debugger/ramview.h"
|
||||
#include "citra_qt/debugger/registers.h"
|
||||
|
||||
#include "common/make_unique.h"
|
||||
#include "common/microprofile.h"
|
||||
#include "common/platform.h"
|
||||
#include "common/scm_rev.h"
|
||||
#include "common/scope_exit.h"
|
||||
#include "common/string_util.h"
|
||||
#include "common/logging/backend.h"
|
||||
#include "common/logging/filter.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "common/logging/text_formatter.h"
|
||||
|
||||
#include "bootmanager.h"
|
||||
#include "hotkeys.h"
|
||||
|
||||
//debugger
|
||||
#include "debugger/disassembler.h"
|
||||
#include "debugger/registers.h"
|
||||
#include "debugger/callstack.h"
|
||||
#include "debugger/ramview.h"
|
||||
#include "debugger/graphics.h"
|
||||
#include "debugger/graphics_breakpoints.h"
|
||||
#include "debugger/graphics_cmdlists.h"
|
||||
#include "debugger/graphics_framebuffer.h"
|
||||
#include "debugger/graphics_tracing.h"
|
||||
#include "debugger/graphics_vertex_shader.h"
|
||||
#include "debugger/profiler.h"
|
||||
|
||||
#include "core/core.h"
|
||||
#include "core/settings.h"
|
||||
#include "core/system.h"
|
||||
#include "core/core.h"
|
||||
#include "core/loader/loader.h"
|
||||
#include "core/arm/disassembler/load_symbol_map.h"
|
||||
#include "citra_qt/config.h"
|
||||
#include "core/loader/loader.h"
|
||||
|
||||
#include "video_core/video_core.h"
|
||||
|
||||
#include "version.h"
|
||||
|
||||
GMainWindow::GMainWindow() : emu_thread(nullptr)
|
||||
{
|
||||
Pica::g_debug_context = Pica::DebugContext::Construct();
|
||||
|
@ -33,8 +33,8 @@
|
||||
#include <QLineEdit>
|
||||
#include <QRegExpValidator>
|
||||
|
||||
#include "citra_qt/util/spinbox.h"
|
||||
#include "common/assert.h"
|
||||
#include "spinbox.h"
|
||||
|
||||
CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0)
|
||||
{
|
||||
|
@ -2,7 +2,7 @@
|
||||
// Licensed under GPLv2 or any later version
|
||||
// Refer to the license.txt file included.
|
||||
|
||||
#include "util.h"
|
||||
#include "citra_qt/util/util.h"
|
||||
|
||||
QFont GetMonospaceFont() {
|
||||
QFont font("monospace");
|
||||
|
Loading…
Reference in New Issue
Block a user