diff options
Diffstat (limited to 'src/citra_qt')
-rw-r--r-- | src/citra_qt/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 5 | ||||
-rw-r--r-- | src/citra_qt/bootmanager.h (renamed from src/citra_qt/bootmanager.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/config/controller_config.cpp | 8 | ||||
-rw-r--r-- | src/citra_qt/config/controller_config.h (renamed from src/citra_qt/config/controller_config.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/config/controller_config_util.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/config/controller_config_util.h (renamed from src/citra_qt/config/controller_config_util.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/callstack.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/debugger/callstack.h (renamed from src/citra_qt/debugger/callstack.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/disassembler.cpp | 10 | ||||
-rw-r--r-- | src/citra_qt/debugger/disassembler.h (renamed from src/citra_qt/debugger/disassembler.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/graphics.cpp | 2 | ||||
-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.cpp | 4 | ||||
-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.cpp | 8 | ||||
-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.cpp | 20 | ||||
-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.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/debugger/ramview.h (renamed from src/citra_qt/debugger/ramview.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/debugger/registers.h (renamed from src/citra_qt/debugger/registers.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/hotkeys.cpp | 6 | ||||
-rw-r--r-- | src/citra_qt/hotkeys.h (renamed from src/citra_qt/hotkeys.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/main.cpp | 28 | ||||
-rw-r--r-- | src/citra_qt/main.h (renamed from src/citra_qt/main.hxx) | 4 | ||||
-rw-r--r-- | src/citra_qt/util/spinbox.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/util/spinbox.h (renamed from src/citra_qt/util/spinbox.hxx) | 0 | ||||
-rw-r--r-- | src/citra_qt/version.h | 4 |
31 files changed, 133 insertions, 58 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 6d08d6afc..3e24da596 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -9,10 +9,11 @@ #endif #include "common/common.h" -#include "bootmanager.hxx" +#include "bootmanager.h" #include "core/core.h" #include "core/settings.h" +#include "core/system.h" #include "video_core/debug_utils/debug_utils.h" @@ -89,6 +90,8 @@ void EmuThread::Stop() } } LOG_INFO(Frontend, "EmuThread stopped"); + + System::Shutdown(); } diff --git a/src/citra_qt/bootmanager.hxx b/src/citra_qt/bootmanager.h index 5f69f15ea..1c893384c 100644 --- a/src/citra_qt/bootmanager.hxx +++ b/src/citra_qt/bootmanager.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <atomic> #include <QThread> diff --git a/src/citra_qt/config/controller_config.cpp b/src/citra_qt/config/controller_config.cpp index 52dfb627c..892995bb2 100644 --- a/src/citra_qt/config/controller_config.cpp +++ b/src/citra_qt/config/controller_config.cpp @@ -1,7 +1,11 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #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 0e423ee50..451593de1 100644 --- a/src/citra_qt/config/controller_config.hxx +++ b/src/citra_qt/config/controller_config.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #ifndef _CONTROLLER_CONFIG_HXX_ #define _CONTROLLER_CONFIG_HXX_ diff --git a/src/citra_qt/config/controller_config_util.cpp b/src/citra_qt/config/controller_config_util.cpp index aee3f8616..d68b119df 100644 --- a/src/citra_qt/config/controller_config_util.cpp +++ b/src/citra_qt/config/controller_config_util.cpp @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <QPushButton> #include <QStyle> #include <QGridLayout> @@ -5,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 af38f126c..15e025b57 100644 --- a/src/citra_qt/config/controller_config_util.hxx +++ b/src/citra_qt/config/controller_config_util.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #ifndef _CONTROLLER_CONFIG_UTIL_HXX_ #define _CONTROLLER_CONFIG_UTIL_HXX_ diff --git a/src/citra_qt/debugger/callstack.cpp b/src/citra_qt/debugger/callstack.cpp index 16c6113be..bcc5d2143 100644 --- a/src/citra_qt/debugger/callstack.cpp +++ b/src/citra_qt/debugger/callstack.cpp @@ -1,6 +1,10 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #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 680a73b6d..4f4f74823 100644 --- a/src/citra_qt/debugger/callstack.hxx +++ b/src/citra_qt/debugger/callstack.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <QDockWidget> #include "ui_callstack.h" diff --git a/src/citra_qt/debugger/disassembler.cpp b/src/citra_qt/debugger/disassembler.cpp index 14745f3bb..8db73752f 100644 --- a/src/citra_qt/debugger/disassembler.cpp +++ b/src/citra_qt/debugger/disassembler.cpp @@ -1,7 +1,11 @@ -#include "disassembler.hxx" +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. -#include "../bootmanager.hxx" -#include "../hotkeys.hxx" +#include "disassembler.h" + +#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 a842da956..6d3cef108 100644 --- a/src/citra_qt/debugger/disassembler.hxx +++ b/src/citra_qt/debugger/disassembler.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <QAbstractItemModel> #include <QDockWidget> #include "ui_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 3f899b95e..2b199bad1 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp @@ -1,4 +1,8 @@ -#include "ramview.hxx" +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#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 1db1546aa..18423036f 100644 --- a/src/citra_qt/debugger/ramview.hxx +++ b/src/citra_qt/debugger/ramview.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include "qhexedit.h" class GRamView : public QHexEdit diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index ed17ee4b4..e982dfb3f 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp @@ -1,4 +1,8 @@ -#include "registers.hxx" +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + +#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 4cca957ce..ac8429f2b 100644 --- a/src/citra_qt/debugger/registers.hxx +++ b/src/citra_qt/debugger/registers.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include "ui_registers.h" #include <QDockWidget> diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 5d0b52e4f..322c25c9e 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -1,6 +1,10 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #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 66ef7bb4e..75c7cc625 100644 --- a/src/citra_qt/hotkeys.hxx +++ b/src/citra_qt/hotkeys.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <QShortcut> #include <QDialog> #include "ui_hotkeys.h" diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 5864f1f9d..c6671bef1 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -1,10 +1,14 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #include <thread> #include <QtGui> #include <QDesktopWidget> #include <QFileDialog> #include "qhexedit.h" -#include "main.hxx" +#include "main.h" #include "common/common.h" #include "common/logging/text_formatter.h" @@ -18,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" @@ -175,7 +179,7 @@ void GMainWindow::BootGame(std::string filename) void GMainWindow::OnMenuLoadFile() { - QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3dsx *.elf *.axf *.bin *.cci *.cxi)")); + QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), QString(), tr("3DS executable (*.3ds *.3dsx *.elf *.axf *.bin *.cci *.cxi)")); if (filename.size()) BootGame(filename.toLatin1().data()); } diff --git a/src/citra_qt/main.hxx b/src/citra_qt/main.h index b1b40df46..72df17c50 100644 --- a/src/citra_qt/main.hxx +++ b/src/citra_qt/main.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + #ifndef _CITRA_QT_MAIN_HXX_ #define _CITRA_QT_MAIN_HXX_ 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 diff --git a/src/citra_qt/version.h b/src/citra_qt/version.h index 07022de5c..9d5a2b1a2 100644 --- a/src/citra_qt/version.h +++ b/src/citra_qt/version.h @@ -1,3 +1,7 @@ +// Copyright 2014 Citra Emulator Project +// Licensed under GPLv2 or any later version +// Refer to the license.txt file included. + // TODO: Supposed to be generated... // GENERATED - Do not edit! #ifndef VERSION_H_ |