From dc8479928c5aee4c6ad6fe4f59006fb604cee701 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 18 Sep 2016 09:38:01 +0900
Subject: Sources: Run clang-format on everything.

---
 src/citra_qt/ui_settings.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/citra_qt/ui_settings.h')

diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h
index 62db4a73e..30f031831 100644
--- a/src/citra_qt/ui_settings.h
+++ b/src/citra_qt/ui_settings.h
@@ -5,14 +5,14 @@
 #pragma once
 
 #include <QByteArray>
-#include <QStringList>
 #include <QString>
+#include <QStringList>
 
 #include <vector>
 
 namespace UISettings {
 
-using ContextualShortcut = std::pair<QString, int> ;
+using ContextualShortcut = std::pair<QString, int>;
 using Shortcut = std::pair<QString, ContextualShortcut>;
 
 struct Values {
@@ -43,5 +43,4 @@ struct Values {
 };
 
 extern Values values;
-
 }
-- 
cgit v1.2.3


From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Wed, 21 Sep 2016 00:21:23 +0900
Subject: Remove empty newlines in #include blocks.

This makes clang-format useful on those.

Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
---
 src/citra_qt/ui_settings.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/citra_qt/ui_settings.h')

diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h
index 30f031831..ed7fdff7e 100644
--- a/src/citra_qt/ui_settings.h
+++ b/src/citra_qt/ui_settings.h
@@ -4,12 +4,11 @@
 
 #pragma once
 
+#include <vector>
 #include <QByteArray>
 #include <QString>
 #include <QStringList>
 
-#include <vector>
-
 namespace UISettings {
 
 using ContextualShortcut = std::pair<QString, int>;
-- 
cgit v1.2.3