diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-09-21 11:29:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-21 11:29:48 -0700 |
| commit | d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch) | |
| tree | 8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/citra_qt/ui_settings.h | |
| parent | 2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff) | |
| parent | 0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (diff) | |
Merge pull request #2086 from linkmauve/clang-format
Add clang-format as part of our {commit,travis}-time checks
Diffstat (limited to 'src/citra_qt/ui_settings.h')
| -rw-r--r-- | src/citra_qt/ui_settings.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h index 62db4a73e..ed7fdff7e 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/citra_qt/ui_settings.h @@ -4,15 +4,14 @@ #pragma once +#include <vector> #include <QByteArray> -#include <QStringList> #include <QString> - -#include <vector> +#include <QStringList> namespace UISettings { -using ContextualShortcut = std::pair<QString, int> ; +using ContextualShortcut = std::pair<QString, int>; using Shortcut = std::pair<QString, ContextualShortcut>; struct Values { @@ -43,5 +42,4 @@ struct Values { }; extern Values values; - } |