summaryrefslogtreecommitdiff
path: root/src/citra_qt/configure_input.h
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-09-21 11:29:48 -0700
committerGitHub <noreply@github.com>2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/citra_qt/configure_input.h
parent2a910a6d883f2227edc74aacf5b93a58a3dea07c (diff)
parent0e3f0120a8ec2996e73bb6b7b6c9d7531f7a7eb1 (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/configure_input.h')
-rw-r--r--src/citra_qt/configure_input.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/citra_qt/configure_input.h b/src/citra_qt/configure_input.h
index fe8ea5580..5183b904d 100644
--- a/src/citra_qt/configure_input.h
+++ b/src/citra_qt/configure_input.h
@@ -4,9 +4,9 @@
#pragma once
-#include <QWidget>
+#include <memory>
#include <QKeyEvent>
-
+#include <QWidget>
#include "citra_qt/config.h"
#include "core/settings.h"
#include "ui_configure_input.h"
@@ -16,7 +16,7 @@ class QString;
class QTimer;
namespace Ui {
- class ConfigureInput;
+class ConfigureInput;
}
class ConfigureInput : public QWidget {
@@ -39,7 +39,8 @@ private:
/// Load configuration settings into button text
void setConfiguration();
- /// Check all inputs for duplicate keys. Clears out any other button with the same value as this button's new value.
+ /// Check all inputs for duplicate keys. Clears out any other button with the same value as this
+ /// button's new value.
void removeDuplicates(const QString& newValue);
/// Handle key press event for input tab when a button is 'waiting'.