Merge pull request #2086 from linkmauve/clang-format

Add clang-format as part of our {commit,travis}-time checks

1 files changed, 30 insertions, 22 deletions

diff --git a/src/core/settings.h b/src/core/settings.h
index fcd14c6f3..5a64f8018 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include <string>
 #include <array>
-
+#include <string>
 #include "common/common_types.h"
 
 namespace Settings {
@@ -14,14 +13,31 @@ namespace Settings {
 namespace NativeInput {
 enum Values {
     // directly mapped keys
-    A, B, X, Y,
-    L, R, ZL, ZR,
-    START, SELECT, HOME,
-    DUP, DDOWN, DLEFT, DRIGHT,
-    CUP, CDOWN, CLEFT, CRIGHT,
+    A,
+    B,
+    X,
+    Y,
+    L,
+    R,
+    ZL,
+    ZR,
+    START,
+    SELECT,
+    HOME,
+    DUP,
+    DDOWN,
+    DLEFT,
+    DRIGHT,
+    CUP,
+    CDOWN,
+    CLEFT,
+    CRIGHT,
 
     // indirectly mapped keys
-    CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
+    CIRCLE_UP,
+    CIRCLE_DOWN,
+    CIRCLE_LEFT,
+    CIRCLE_RIGHT,
     CIRCLE_MODIFIER,
 
     NUM_INPUTS
@@ -29,28 +45,21 @@ enum Values {
 
 static const std::array<const char*, NUM_INPUTS> Mapping = {{
     // directly mapped keys
-    "pad_a", "pad_b", "pad_x", "pad_y",
-    "pad_l", "pad_r", "pad_zl", "pad_zr",
-    "pad_start", "pad_select", "pad_home",
-    "pad_dup", "pad_ddown", "pad_dleft", "pad_dright",
-    "pad_cup", "pad_cdown", "pad_cleft", "pad_cright",
+    "pad_a", "pad_b", "pad_x", "pad_y", "pad_l", "pad_r", "pad_zl", "pad_zr", "pad_start",
+    "pad_select", "pad_home", "pad_dup", "pad_ddown", "pad_dleft", "pad_dright", "pad_cup",
+    "pad_cdown", "pad_cleft", "pad_cright",
 
     // indirectly mapped keys
     "pad_circle_up", "pad_circle_down", "pad_circle_left", "pad_circle_right",
     "pad_circle_modifier",
 }};
 static const std::array<Values, NUM_INPUTS> All = {{
-    A, B, X, Y,
-    L, R, ZL, ZR,
-    START, SELECT, HOME,
-    DUP, DDOWN, DLEFT, DRIGHT,
-    CUP, CDOWN, CLEFT, CRIGHT,
-    CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT,
-    CIRCLE_MODIFIER,
+    A,     B,      X,      Y,         L,           R,           ZL,           ZR,
+    START, SELECT, HOME,   DUP,       DDOWN,       DLEFT,       DRIGHT,       CUP,
+    CDOWN, CLEFT,  CRIGHT, CIRCLE_UP, CIRCLE_DOWN, CIRCLE_LEFT, CIRCLE_RIGHT, CIRCLE_MODIFIER,
 }};
 }
 
-
 struct Values {
     // CheckNew3DS
     bool is_new_3ds;
@@ -91,5 +100,4 @@ struct Values {
 } extern values;
 
 void Apply();
-
 }