summaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
authorJames Rowe <jroweboy@gmail.com>2018-01-20 00:48:02 -0700
committerJames Rowe <jroweboy@gmail.com>2018-01-20 16:45:11 -0700
commit096be1663682f38d572e9816e3350e0dc9f13168 (patch)
treea2f695170d9a3e0e98cebf823087cdb65d5af00f /src/yuzu
parent1e662e6e9a8d004aea1495a98af1118c87405223 (diff)
Format: Run the new clang format on everything
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/configuration/config.cpp12
-rw-r--r--src/yuzu/configuration/configure_input.cpp19
-rw-r--r--src/yuzu/configuration/configure_system.cpp13
-rw-r--r--src/yuzu/debugger/wait_tree.h2
-rw-r--r--src/yuzu/ui_settings.h2
5 files changed, 39 insertions, 9 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 6a40f035c..f9ddb9edc 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -26,10 +26,18 @@ const std::array<int, Settings::NativeButton::NumButtons> Config::default_button
const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
{
- Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E,
+ Qt::Key_Up,
+ Qt::Key_Down,
+ Qt::Key_Left,
+ Qt::Key_Right,
+ Qt::Key_E,
},
{
- Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R,
+ Qt::Key_I,
+ Qt::Key_K,
+ Qt::Key_J,
+ Qt::Key_L,
+ Qt::Key_R,
},
}};
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 10043e6e8..78559e2bb 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -14,7 +14,11 @@
const std::array<std::string, ConfigureInput::ANALOG_SUB_BUTTONS_NUM>
ConfigureInput::analog_sub_buttons{{
- "up", "down", "left", "right", "modifier",
+ "up",
+ "down",
+ "left",
+ "right",
+ "modifier",
}};
static QString getKeyName(int key_code) {
@@ -36,7 +40,8 @@ static void SetAnalogButton(const Common::ParamPackage& input_param,
Common::ParamPackage& analog_param, const std::string& button_name) {
if (analog_param.Get("engine", "") != "analog_from_button") {
analog_param = {
- {"engine", "analog_from_button"}, {"modifier_scale", "0.5"},
+ {"engine", "analog_from_button"},
+ {"modifier_scale", "0.5"},
};
}
analog_param.Set(button_name, input_param.Serialize());
@@ -107,11 +112,17 @@ ConfigureInput::ConfigureInput(QWidget* parent)
analog_map_buttons = {{
{
- ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight,
+ ui->buttonLStickUp,
+ ui->buttonLStickDown,
+ ui->buttonLStickLeft,
+ ui->buttonLStickRight,
ui->buttonLStickMod,
},
{
- ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight,
+ ui->buttonRStickUp,
+ ui->buttonRStickDown,
+ ui->buttonRStickLeft,
+ ui->buttonRStickRight,
ui->buttonRStickMod,
},
}};
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index 89e783687..d09505a0f 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -9,7 +9,18 @@
#include "yuzu/ui_settings.h"
static const std::array<int, 12> days_in_month = {{
- 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31,
+ 31,
+ 29,
+ 31,
+ 30,
+ 31,
+ 30,
+ 31,
+ 31,
+ 30,
+ 31,
+ 30,
+ 31,
}};
ConfigureSystem::ConfigureSystem(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureSystem) {
diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h
index 4034e909b..e538174eb 100644
--- a/src/yuzu/debugger/wait_tree.h
+++ b/src/yuzu/debugger/wait_tree.h
@@ -20,7 +20,7 @@ class Mutex;
class ConditionVariable;
class Thread;
class Timer;
-}
+} // namespace Kernel
class WaitTreeThread;
diff --git a/src/yuzu/ui_settings.h b/src/yuzu/ui_settings.h
index d093da641..9036ce2c1 100644
--- a/src/yuzu/ui_settings.h
+++ b/src/yuzu/ui_settings.h
@@ -50,4 +50,4 @@ struct Values {
};
extern Values values;
-}
+} // namespace UISettings