summaryrefslogtreecommitdiffstats
path: root/src/citra_qt
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/citra_qt/CMakeLists.txt30
-rw-r--r--src/citra_qt/bootmanager.cpp2
-rw-r--r--src/citra_qt/bootmanager.h (renamed from src/citra_qt/bootmanager.hxx)0
-rw-r--r--src/citra_qt/config/controller_config.cpp4
-rw-r--r--src/citra_qt/config/controller_config.h (renamed from src/citra_qt/config/controller_config.hxx)0
-rw-r--r--src/citra_qt/config/controller_config_util.cpp2
-rw-r--r--src/citra_qt/config/controller_config_util.h (renamed from src/citra_qt/config/controller_config_util.hxx)0
-rw-r--r--src/citra_qt/debugger/callstack.cpp2
-rw-r--r--src/citra_qt/debugger/callstack.h (renamed from src/citra_qt/debugger/callstack.hxx)0
-rw-r--r--src/citra_qt/debugger/disassembler.cpp6
-rw-r--r--src/citra_qt/debugger/disassembler.h (renamed from src/citra_qt/debugger/disassembler.hxx)0
-rw-r--r--src/citra_qt/debugger/graphics.cpp2
-rw-r--r--src/citra_qt/debugger/graphics.h (renamed from src/citra_qt/debugger/graphics.hxx)0
-rw-r--r--src/citra_qt/debugger/graphics_breakpoints.cpp4
-rw-r--r--src/citra_qt/debugger/graphics_breakpoints.h (renamed from src/citra_qt/debugger/graphics_breakpoints.hxx)0
-rw-r--r--src/citra_qt/debugger/graphics_breakpoints_p.h (renamed from src/citra_qt/debugger/graphics_breakpoints_p.hxx)0
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp8
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.h (renamed from src/citra_qt/debugger/graphics_cmdlists.hxx)0
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.cpp20
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.h (renamed from src/citra_qt/debugger/graphics_framebuffer.hxx)4
-rw-r--r--src/citra_qt/debugger/ramview.cpp2
-rw-r--r--src/citra_qt/debugger/ramview.h (renamed from src/citra_qt/debugger/ramview.hxx)0
-rw-r--r--src/citra_qt/debugger/registers.cpp2
-rw-r--r--src/citra_qt/debugger/registers.h (renamed from src/citra_qt/debugger/registers.hxx)0
-rw-r--r--src/citra_qt/hotkeys.cpp2
-rw-r--r--src/citra_qt/hotkeys.h (renamed from src/citra_qt/hotkeys.hxx)0
-rw-r--r--src/citra_qt/main.cpp22
-rw-r--r--src/citra_qt/main.h (renamed from src/citra_qt/main.hxx)0
-rw-r--r--src/citra_qt/util/spinbox.cpp2
-rw-r--r--src/citra_qt/util/spinbox.h (renamed from src/citra_qt/util/spinbox.hxx)0
30 files changed, 57 insertions, 57 deletions
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 8a511e02f..a0ba252b3 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -21,22 +21,22 @@ set(SRCS
)
set(HEADERS
- config/controller_config.hxx
- config/controller_config_util.hxx
+ config/controller_config.h
+ config/controller_config_util.h
config.h
- debugger/callstack.hxx
- debugger/disassembler.hxx
- debugger/graphics.hxx
- debugger/graphics_breakpoints.hxx
- debugger/graphics_breakpoints_p.hxx
- debugger/graphics_cmdlists.hxx
- debugger/graphics_framebuffer.hxx
- debugger/ramview.hxx
- debugger/registers.hxx
- util/spinbox.hxx
- bootmanager.hxx
- hotkeys.hxx
- main.hxx
+ debugger/callstack.h
+ debugger/disassembler.h
+ debugger/graphics.h
+ debugger/graphics_breakpoints.h
+ debugger/graphics_breakpoints_p.h
+ debugger/graphics_cmdlists.h
+ debugger/graphics_framebuffer.h
+ debugger/ramview.h
+ debugger/registers.h
+ util/spinbox.h
+ bootmanager.h
+ hotkeys.h
+ main.h
version.h
)
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp
index e753ea108..3e24da596 100644
--- a/src/citra_qt/bootmanager.cpp
+++ b/src/citra_qt/bootmanager.cpp
@@ -9,7 +9,7 @@
#endif
#include "common/common.h"
-#include "bootmanager.hxx"
+#include "bootmanager.h"
#include "core/core.h"
#include "core/settings.h"
diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.h
index 1c893384c..1c893384c 100644
--- a/src/citra_qt/bootmanager.hxx
+++ b/src/citra_qt/bootmanager.h
diff --git a/src/citra_qt/config/controller_config.cpp b/src/citra_qt/config/controller_config.cpp
index 41000e29b..892995bb2 100644
--- a/src/citra_qt/config/controller_config.cpp
+++ b/src/citra_qt/config/controller_config.cpp
@@ -4,8 +4,8 @@
#include <QDialogButtonBox>
-#include "controller_config.hxx"
-#include "controller_config_util.hxx"
+#include "controller_config.h"
+#include "controller_config_util.h"
/* TODO(bunnei): ImplementMe
diff --git a/src/citra_qt/config/controller_config.hxx b/src/citra_qt/config/controller_config.h
index 451593de1..451593de1 100644
--- a/src/citra_qt/config/controller_config.hxx
+++ b/src/citra_qt/config/controller_config.h
diff --git a/src/citra_qt/config/controller_config_util.cpp b/src/citra_qt/config/controller_config_util.cpp
index 272e8d41e..d68b119df 100644
--- a/src/citra_qt/config/controller_config_util.cpp
+++ b/src/citra_qt/config/controller_config_util.cpp
@@ -9,7 +9,7 @@
#include <QHBoxLayout>
#include <QLabel>
-#include "controller_config_util.hxx"
+#include "controller_config_util.h"
/* TODO(bunnei): ImplementMe
GStickConfig::GStickConfig(common::Config::Control leftid, common::Config::Control rightid, common::Config::Control upid, common::Config::Control downid, QObject* change_receiver, QWidget* parent) : QWidget(parent)
diff --git a/src/citra_qt/config/controller_config_util.hxx b/src/citra_qt/config/controller_config_util.h
index 15e025b57..15e025b57 100644
--- a/src/citra_qt/config/controller_config_util.hxx
+++ b/src/citra_qt/config/controller_config_util.h
diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp
index 4a47ad468..bcc5d2143 100644
--- a/src/citra_qt/debugger/callstack.cpp
+++ b/src/citra_qt/debugger/callstack.cpp
@@ -4,7 +4,7 @@
#include <QStandardItemModel>
-#include "callstack.hxx"
+#include "callstack.h"
#include "core/core.h"
#include "core/arm/arm_interface.h"
diff --git a/src/citra_qt/debugger/callstack.hxx b/src/citra_qt/debugger/callstack.h
index 4f4f74823..4f4f74823 100644
--- a/src/citra_qt/debugger/callstack.hxx
+++ b/src/citra_qt/debugger/callstack.h
diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp
index 636a0f187..8db73752f 100644
--- a/src/citra_qt/debugger/disassembler.cpp
+++ b/src/citra_qt/debugger/disassembler.cpp
@@ -2,10 +2,10 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "disassembler.hxx"
+#include "disassembler.h"
-#include "../bootmanager.hxx"
-#include "../hotkeys.hxx"
+#include "../bootmanager.h"
+#include "../hotkeys.h"
#include "common/common.h"
#include "core/mem_map.h"
diff --git a/src/citra_qt/debugger/disassembler.hxx b/src/citra_qt/debugger/disassembler.h
index 6d3cef108..6d3cef108 100644
--- a/src/citra_qt/debugger/disassembler.hxx
+++ b/src/citra_qt/debugger/disassembler.h
diff --git a/src/citra_qt/debugger/graphics.cpp b/src/citra_qt/debugger/graphics.cpp
index 9633d367e..7424671f1 100644
--- a/src/citra_qt/debugger/graphics.cpp
+++ b/src/citra_qt/debugger/graphics.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "graphics.hxx"
+#include "graphics.h"
#include <QListView>
#include <QVBoxLayout>
#include <QDebug>
diff --git a/src/citra_qt/debugger/graphics.hxx b/src/citra_qt/debugger/graphics.h
index 8119b4c87..8119b4c87 100644
--- a/src/citra_qt/debugger/graphics.hxx
+++ b/src/citra_qt/debugger/graphics.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp
index 170aa736d..262e2e770 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.cpp
+++ b/src/citra_qt/debugger/graphics_breakpoints.cpp
@@ -8,8 +8,8 @@
#include <QVBoxLayout>
#include <QLabel>
-#include "graphics_breakpoints.hxx"
-#include "graphics_breakpoints_p.hxx"
+#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),
diff --git a/src/citra_qt/debugger/graphics_breakpoints.hxx b/src/citra_qt/debugger/graphics_breakpoints.h
index 5b9ba324e..5b9ba324e 100644
--- a/src/citra_qt/debugger/graphics_breakpoints.hxx
+++ b/src/citra_qt/debugger/graphics_breakpoints.h
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.hxx b/src/citra_qt/debugger/graphics_breakpoints_p.h
index 232bfc863..232bfc863 100644
--- a/src/citra_qt/debugger/graphics_breakpoints_p.hxx
+++ b/src/citra_qt/debugger/graphics_breakpoints_p.h
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index 753cc25da..4a6159fdf 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -16,9 +16,9 @@
#include "video_core/debug_utils/debug_utils.h"
-#include "graphics_cmdlists.hxx"
+#include "graphics_cmdlists.h"
-#include "util/spinbox.hxx"
+#include "util/spinbox.h"
QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) {
QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
@@ -229,7 +229,7 @@ void GPUCommandListModel::OnPicaTraceFinished(const Pica::DebugUtils::PicaTrace&
cmd_id < PICA_REG_INDEX(reg_name) + sizeof(decltype(Pica::registers.reg_name)) / 4)
void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) {
- const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt();
+ const unsigned int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toUInt();
if (COMMAND_IN_RANGE(command_id, texture0) ||
COMMAND_IN_RANGE(command_id, texture1) ||
COMMAND_IN_RANGE(command_id, texture2)) {
@@ -255,7 +255,7 @@ void GPUCommandListWidget::OnCommandDoubleClicked(const QModelIndex& index) {
void GPUCommandListWidget::SetCommandInfo(const QModelIndex& index) {
QWidget* new_info_widget;
- const int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toInt();
+ const unsigned int command_id = list_widget->model()->data(index, GPUCommandListModel::CommandIdRole).toUInt();
if (COMMAND_IN_RANGE(command_id, texture0) ||
COMMAND_IN_RANGE(command_id, texture1) ||
COMMAND_IN_RANGE(command_id, texture2)) {
diff --git a/src/citra_qt/debugger/graphics_cmdlists.hxx b/src/citra_qt/debugger/graphics_cmdlists.h
index a465d044c..a465d044c 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.hxx
+++ b/src/citra_qt/debugger/graphics_cmdlists.h
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index a9e9de652..caa6896f9 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -13,9 +13,9 @@
#include "video_core/color.h"
#include "video_core/pica.h"
-#include "graphics_framebuffer.hxx"
+#include "graphics_framebuffer.h"
-#include "util/spinbox.hxx"
+#include "util/spinbox.h"
BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
const QString& title, QWidget* parent)
@@ -158,7 +158,7 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value)
}
}
-void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
+void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value)
{
if (framebuffer_width != new_value) {
framebuffer_width = new_value;
@@ -168,7 +168,7 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
}
}
-void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
+void GraphicsFramebufferWidget::OnFramebufferHeightChanged(unsigned int new_value)
{
if (framebuffer_height != new_value) {
framebuffer_height = new_value;
@@ -227,8 +227,8 @@ void GraphicsFramebufferWidget::OnUpdate()
{
QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32);
u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address));
- for (unsigned y = 0; y < framebuffer_height; ++y) {
- for (unsigned x = 0; x < framebuffer_width; ++x) {
+ for (unsigned int y = 0; y < framebuffer_height; ++y) {
+ for (unsigned int x = 0; x < framebuffer_width; ++x) {
u32 value = *(color_buffer + x + y * framebuffer_width);
decoded_image.setPixel(x, y, qRgba((value >> 16) & 0xFF, (value >> 8) & 0xFF, value & 0xFF, 255/*value >> 24*/));
@@ -242,8 +242,8 @@ void GraphicsFramebufferWidget::OnUpdate()
{
QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32);
u8* color_buffer = Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address));
- for (unsigned y = 0; y < framebuffer_height; ++y) {
- for (unsigned x = 0; x < framebuffer_width; ++x) {
+ for (unsigned int y = 0; y < framebuffer_height; ++y) {
+ for (unsigned int x = 0; x < framebuffer_width; ++x) {
u8* pixel_pointer = color_buffer + x * 3 + y * 3 * framebuffer_width;
decoded_image.setPixel(x, y, qRgba(pixel_pointer[0], pixel_pointer[1], pixel_pointer[2], 255/*value >> 24*/));
@@ -257,8 +257,8 @@ void GraphicsFramebufferWidget::OnUpdate()
{
QImage decoded_image(framebuffer_width, framebuffer_height, QImage::Format_ARGB32);
u32* color_buffer = (u32*)Memory::GetPointer(Pica::PAddrToVAddr(framebuffer_address));
- for (unsigned y = 0; y < framebuffer_height; ++y) {
- for (unsigned x = 0; x < framebuffer_width; ++x) {
+ for (unsigned int y = 0; y < framebuffer_height; ++y) {
+ for (unsigned int x = 0; x < framebuffer_width; ++x) {
u16 value = *(u16*)(((u8*)color_buffer) + x * 2 + y * framebuffer_width * 2);
u8 r = Color::Convert5To8((value >> 11) & 0x1F);
u8 g = Color::Convert5To8((value >> 6) & 0x1F);
diff --git a/src/citra_qt/debugger/graphics_framebuffer.hxx b/src/citra_qt/debugger/graphics_framebuffer.h
index 56215761e..02813525c 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.hxx
+++ b/src/citra_qt/debugger/graphics_framebuffer.h
@@ -62,8 +62,8 @@ public:
public slots:
void OnFramebufferSourceChanged(int new_value);
void OnFramebufferAddressChanged(qint64 new_value);
- void OnFramebufferWidthChanged(int new_value);
- void OnFramebufferHeightChanged(int new_value);
+ void OnFramebufferWidthChanged(unsigned int new_value);
+ void OnFramebufferHeightChanged(unsigned int new_value);
void OnFramebufferFormatChanged(int new_value);
void OnUpdate();
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp
index d3ff69a61..2b199bad1 100644
--- a/src/citra_qt/debugger/ramview.cpp
+++ b/src/citra_qt/debugger/ramview.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "ramview.hxx"
+#include "ramview.h"
#include "common/common.h"
#include "core/mem_map.h"
diff --git a/src/citra_qt/debugger/ramview.hxx b/src/citra_qt/debugger/ramview.h
index 18423036f..18423036f 100644
--- a/src/citra_qt/debugger/ramview.hxx
+++ b/src/citra_qt/debugger/ramview.h
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp
index f798495b2..e982dfb3f 100644
--- a/src/citra_qt/debugger/registers.cpp
+++ b/src/citra_qt/debugger/registers.cpp
@@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "registers.hxx"
+#include "registers.h"
#include "core/core.h"
#include "core/arm/arm_interface.h"
diff --git a/src/citra_qt/debugger/registers.hxx b/src/citra_qt/debugger/registers.h
index ac8429f2b..ac8429f2b 100644
--- a/src/citra_qt/debugger/registers.hxx
+++ b/src/citra_qt/debugger/registers.h
diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp
index 08be7ff74..322c25c9e 100644
--- a/src/citra_qt/hotkeys.cpp
+++ b/src/citra_qt/hotkeys.cpp
@@ -4,7 +4,7 @@
#include <QKeySequence>
#include <QSettings>
-#include "hotkeys.hxx"
+#include "hotkeys.h"
#include <map>
struct Hotkey
diff --git a/src/citra_qt/hotkeys.hxx b/src/citra_qt/hotkeys.h
index 75c7cc625..75c7cc625 100644
--- a/src/citra_qt/hotkeys.hxx
+++ b/src/citra_qt/hotkeys.h
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp
index 64e389f25..c6671bef1 100644
--- a/src/citra_qt/main.cpp
+++ b/src/citra_qt/main.cpp
@@ -8,7 +8,7 @@
#include <QDesktopWidget>
#include <QFileDialog>
#include "qhexedit.h"
-#include "main.hxx"
+#include "main.h"
#include "common/common.h"
#include "common/logging/text_formatter.h"
@@ -22,18 +22,18 @@
#include <unistd.h>
#endif
-#include "bootmanager.hxx"
-#include "hotkeys.hxx"
+#include "bootmanager.h"
+#include "hotkeys.h"
//debugger
-#include "debugger/disassembler.hxx"
-#include "debugger/registers.hxx"
-#include "debugger/callstack.hxx"
-#include "debugger/ramview.hxx"
-#include "debugger/graphics.hxx"
-#include "debugger/graphics_breakpoints.hxx"
-#include "debugger/graphics_cmdlists.hxx"
-#include "debugger/graphics_framebuffer.hxx"
+#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 "core/settings.h"
#include "core/system.h"
diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.h
index 72df17c50..72df17c50 100644
--- a/src/citra_qt/main.hxx
+++ b/src/citra_qt/main.h
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp
index f9988409f..54f628e4c 100644
--- a/src/citra_qt/util/spinbox.cpp
+++ b/src/citra_qt/util/spinbox.cpp
@@ -34,7 +34,7 @@
#include "common/log.h"
-#include "spinbox.hxx"
+#include "spinbox.h"
CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0)
{
diff --git a/src/citra_qt/util/spinbox.hxx b/src/citra_qt/util/spinbox.h
index ee7f08ec2..ee7f08ec2 100644
--- a/src/citra_qt/util/spinbox.hxx
+++ b/src/citra_qt/util/spinbox.h
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:39:33 +0100