summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar unknown2018-01-15 17:55:16 +0100
committerGravatar unknown2018-01-15 17:55:16 +0100
commit8d968780c19bed7fb260787c26ee908541c5934c (patch)
tree518c4f2222b6d98587a640a04d5c0aef98655a17 /src
parentChange default log level to info (diff)
downloadyuzu-8d968780c19bed7fb260787c26ee908541c5934c.tar.gz
yuzu-8d968780c19bed7fb260787c26ee908541c5934c.tar.xz
yuzu-8d968780c19bed7fb260787c26ee908541c5934c.zip
Clang format
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/config.cpp13
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp1
2 files changed, 10 insertions, 4 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 047e347d1..314fc2779 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -8,7 +8,6 @@
8#include "yuzu/configuration/config.h" 8#include "yuzu/configuration/config.h"
9#include "yuzu/ui_settings.h" 9#include "yuzu/ui_settings.h"
10 10
11
12Config::Config() { 11Config::Config() {
13 // TODO: Don't hardcode the path; let the frontend decide where to put the config files. 12 // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
14 qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini"; 13 qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
@@ -25,10 +24,18 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button
25 24
26const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{ 25const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
27 { 26 {
28 Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D, 27 Qt::Key_Up,
28 Qt::Key_Down,
29 Qt::Key_Left,
30 Qt::Key_Right,
31 Qt::Key_D,
29 }, 32 },
30 { 33 {
31 Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D, 34 Qt::Key_I,
35 Qt::Key_K,
36 Qt::Key_J,
37 Qt::Key_L,
38 Qt::Key_D,
32 }, 39 },
33}}; 40}};
34 41
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 081819812..47b9b6e95 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -7,7 +7,6 @@
7#include "ui_configure_graphics.h" 7#include "ui_configure_graphics.h"
8#include "yuzu/configuration/configure_graphics.h" 8#include "yuzu/configuration/configure_graphics.h"
9 9
10
11ConfigureGraphics::ConfigureGraphics(QWidget* parent) 10ConfigureGraphics::ConfigureGraphics(QWidget* parent)
12 : QWidget(parent), ui(new Ui::ConfigureGraphics) { 11 : QWidget(parent), ui(new Ui::ConfigureGraphics) {
13 12