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/configure_general.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/citra_qt/configure_general.cpp')

diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index e6832341a..7bfba6dd0 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -9,10 +9,8 @@
 #include "core/settings.h"
 #include "core/system.h"
 
-ConfigureGeneral::ConfigureGeneral(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ConfigureGeneral)
-{
+ConfigureGeneral::ConfigureGeneral(QWidget* parent)
+    : QWidget(parent), ui(new Ui::ConfigureGeneral) {
     ui->setupUi(this);
     this->setConfiguration();
 
-- 
cgit v1.2.3


From 396a8d91a4423d9c793eeff0798d544613647511 Mon Sep 17 00:00:00 2001
From: Yuri Kunde Schlesner <yuriks@yuriks.net>
Date: Sun, 18 Sep 2016 18:01:46 -0700
Subject: Manually tweak source formatting and then re-run clang-format

---
 src/citra_qt/configure_general.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/citra_qt/configure_general.cpp')

diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index 7bfba6dd0..3e6f76bfe 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -11,14 +11,14 @@
 
 ConfigureGeneral::ConfigureGeneral(QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGeneral) {
+
     ui->setupUi(this);
     this->setConfiguration();
 
     ui->toggle_cpu_jit->setEnabled(!System::IsPoweredOn());
 }
 
-ConfigureGeneral::~ConfigureGeneral() {
-}
+ConfigureGeneral::~ConfigureGeneral() {}
 
 void ConfigureGeneral::setConfiguration() {
     ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);
-- 
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/configure_general.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/citra_qt/configure_general.cpp')

diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index 3e6f76bfe..27139fb30 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -4,10 +4,9 @@
 
 #include "citra_qt/configure_general.h"
 #include "citra_qt/ui_settings.h"
-#include "ui_configure_general.h"
-
 #include "core/settings.h"
 #include "core/system.h"
+#include "ui_configure_general.h"
 
 ConfigureGeneral::ConfigureGeneral(QWidget* parent)
     : QWidget(parent), ui(new Ui::ConfigureGeneral) {
-- 
cgit v1.2.3