summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-06 12:43:08 -0500
committerGravatar bunnei2015-01-06 12:43:08 -0500
commit0bf5a0bfc47cebb64dc2740c475a631d6fb13a2f (patch)
tree3a173741994c239c4cd41727868ef7676acb26e3
parentMerge pull request #417 from kevinhartman/exclusive-tag-fix (diff)
parentcitra-qt: Renamed all .hxx headers to .h (diff)
downloadyuzu-0bf5a0bfc47cebb64dc2740c475a631d6fb13a2f.tar.gz
yuzu-0bf5a0bfc47cebb64dc2740c475a631d6fb13a2f.tar.xz
yuzu-0bf5a0bfc47cebb64dc2740c475a631d6fb13a2f.zip
Merge pull request #402 from chrisvj/master
Renamed all .hxx headers to .h
-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.cpp4
-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.cpp4
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.h (renamed from src/citra_qt/debugger/graphics_framebuffer.hxx)0
-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, 45 insertions, 45 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
21 ) 21 )
22 22
23set(HEADERS 23set(HEADERS
24 config/controller_config.hxx 24 config/controller_config.h
25 config/controller_config_util.hxx 25 config/controller_config_util.h
26 config.h 26 config.h
27 debugger/callstack.hxx 27 debugger/callstack.h
28 debugger/disassembler.hxx 28 debugger/disassembler.h
29 debugger/graphics.hxx 29 debugger/graphics.h
30 debugger/graphics_breakpoints.hxx 30 debugger/graphics_breakpoints.h
31 debugger/graphics_breakpoints_p.hxx 31 debugger/graphics_breakpoints_p.h
32 debugger/graphics_cmdlists.hxx 32 debugger/graphics_cmdlists.h
33 debugger/graphics_framebuffer.hxx 33 debugger/graphics_framebuffer.h
34 debugger/ramview.hxx 34 debugger/ramview.h
35 debugger/registers.hxx 35 debugger/registers.h
36 util/spinbox.hxx 36 util/spinbox.h
37 bootmanager.hxx 37 bootmanager.h
38 hotkeys.hxx 38 hotkeys.h
39 main.hxx 39 main.h
40 version.h 40 version.h
41 ) 41 )
42 42
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 @@
9#endif 9#endif
10 10
11#include "common/common.h" 11#include "common/common.h"
12#include "bootmanager.hxx" 12#include "bootmanager.h"
13 13
14#include "core/core.h" 14#include "core/core.h"
15#include "core/settings.h" 15#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 @@
4 4
5#include <QDialogButtonBox> 5#include <QDialogButtonBox>
6 6
7#include "controller_config.hxx" 7#include "controller_config.h"
8#include "controller_config_util.hxx" 8#include "controller_config_util.h"
9 9
10/* TODO(bunnei): ImplementMe 10/* TODO(bunnei): ImplementMe
11 11
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 @@
9#include <QHBoxLayout> 9#include <QHBoxLayout>
10#include <QLabel> 10#include <QLabel>
11 11
12#include "controller_config_util.hxx" 12#include "controller_config_util.h"
13 13
14/* TODO(bunnei): ImplementMe 14/* TODO(bunnei): ImplementMe
15GStickConfig::GStickConfig(common::Config::Control leftid, common::Config::Control rightid, common::Config::Control upid, common::Config::Control downid, QObject* change_receiver, QWidget* parent) : QWidget(parent) 15GStickConfig::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 @@
4 4
5#include <QStandardItemModel> 5#include <QStandardItemModel>
6 6
7#include "callstack.hxx" 7#include "callstack.h"
8 8
9#include "core/core.h" 9#include "core/core.h"
10#include "core/arm/arm_interface.h" 10#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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "disassembler.hxx" 5#include "disassembler.h"
6 6
7#include "../bootmanager.hxx" 7#include "../bootmanager.h"
8#include "../hotkeys.hxx" 8#include "../hotkeys.h"
9 9
10#include "common/common.h" 10#include "common/common.h"
11#include "core/mem_map.h" 11#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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "graphics.hxx" 5#include "graphics.h"
6#include <QListView> 6#include <QListView>
7#include <QVBoxLayout> 7#include <QVBoxLayout>
8#include <QDebug> 8#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 @@
8#include <QVBoxLayout> 8#include <QVBoxLayout>
9#include <QLabel> 9#include <QLabel>
10 10
11#include "graphics_breakpoints.hxx" 11#include "graphics_breakpoints.h"
12#include "graphics_breakpoints_p.hxx" 12#include "graphics_breakpoints_p.h"
13 13
14BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent) 14BreakPointModel::BreakPointModel(std::shared_ptr<Pica::DebugContext> debug_context, QObject* parent)
15 : QAbstractListModel(parent), context_weak(debug_context), 15 : 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 708b805a7..4a6159fdf 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -16,9 +16,9 @@
16 16
17#include "video_core/debug_utils/debug_utils.h" 17#include "video_core/debug_utils/debug_utils.h"
18 18
19#include "graphics_cmdlists.hxx" 19#include "graphics_cmdlists.h"
20 20
21#include "util/spinbox.hxx" 21#include "util/spinbox.h"
22 22
23QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) { 23QImage LoadTexture(u8* src, const Pica::DebugUtils::TextureInfo& info) {
24 QImage decoded_image(info.width, info.height, QImage::Format_ARGB32); 24 QImage decoded_image(info.width, info.height, QImage::Format_ARGB32);
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 7ef699f37..caa6896f9 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -13,9 +13,9 @@
13#include "video_core/color.h" 13#include "video_core/color.h"
14#include "video_core/pica.h" 14#include "video_core/pica.h"
15 15
16#include "graphics_framebuffer.hxx" 16#include "graphics_framebuffer.h"
17 17
18#include "util/spinbox.hxx" 18#include "util/spinbox.h"
19 19
20BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context, 20BreakPointObserverDock::BreakPointObserverDock(std::shared_ptr<Pica::DebugContext> debug_context,
21 const QString& title, QWidget* parent) 21 const QString& title, QWidget* parent)
diff --git a/src/citra_qt/debugger/graphics_framebuffer.hxx b/src/citra_qt/debugger/graphics_framebuffer.h
index 02813525c..02813525c 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.hxx
+++ b/src/citra_qt/debugger/graphics_framebuffer.h
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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "ramview.hxx" 5#include "ramview.h"
6 6
7#include "common/common.h" 7#include "common/common.h"
8#include "core/mem_map.h" 8#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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "registers.hxx" 5#include "registers.h"
6 6
7#include "core/core.h" 7#include "core/core.h"
8#include "core/arm/arm_interface.h" 8#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 @@
4 4
5#include <QKeySequence> 5#include <QKeySequence>
6#include <QSettings> 6#include <QSettings>
7#include "hotkeys.hxx" 7#include "hotkeys.h"
8#include <map> 8#include <map>
9 9
10struct Hotkey 10struct 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 @@
8#include <QDesktopWidget> 8#include <QDesktopWidget>
9#include <QFileDialog> 9#include <QFileDialog>
10#include "qhexedit.h" 10#include "qhexedit.h"
11#include "main.hxx" 11#include "main.h"
12 12
13#include "common/common.h" 13#include "common/common.h"
14#include "common/logging/text_formatter.h" 14#include "common/logging/text_formatter.h"
@@ -22,18 +22,18 @@
22#include <unistd.h> 22#include <unistd.h>
23#endif 23#endif
24 24
25#include "bootmanager.hxx" 25#include "bootmanager.h"
26#include "hotkeys.hxx" 26#include "hotkeys.h"
27 27
28//debugger 28//debugger
29#include "debugger/disassembler.hxx" 29#include "debugger/disassembler.h"
30#include "debugger/registers.hxx" 30#include "debugger/registers.h"
31#include "debugger/callstack.hxx" 31#include "debugger/callstack.h"
32#include "debugger/ramview.hxx" 32#include "debugger/ramview.h"
33#include "debugger/graphics.hxx" 33#include "debugger/graphics.h"
34#include "debugger/graphics_breakpoints.hxx" 34#include "debugger/graphics_breakpoints.h"
35#include "debugger/graphics_cmdlists.hxx" 35#include "debugger/graphics_cmdlists.h"
36#include "debugger/graphics_framebuffer.hxx" 36#include "debugger/graphics_framebuffer.h"
37 37
38#include "core/settings.h" 38#include "core/settings.h"
39#include "core/system.h" 39#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 @@
34 34
35#include "common/log.h" 35#include "common/log.h"
36 36
37#include "spinbox.hxx" 37#include "spinbox.h"
38 38
39CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0) 39CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0)
40{ 40{
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