aboutsummaryrefslogtreecommitdiff
path: root/src/citra_qt/config
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-06 12:43:08 -0500
committerbunnei <bunneidev@gmail.com>2015-01-06 12:43:08 -0500
commit0bf5a0bfc47cebb64dc2740c475a631d6fb13a2f (patch)
tree3a173741994c239c4cd41727868ef7676acb26e3 /src/citra_qt/config
parent89bb0ecbd534527898a836e8565702364906cdb9 (diff)
parentb0a14cfe7f0075d0758371276b7f6384856aa6ff (diff)
Merge pull request #402 from chrisvj/master
Renamed all .hxx headers to .h
Diffstat (limited to 'src/citra_qt/config')
-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
4 files changed, 3 insertions, 3 deletions
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