summaryrefslogtreecommitdiff
path: root/src/citra_qt/configure_general.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-09-21 11:29:48 -0700
committerGravatar GitHub2016-09-21 11:29:48 -0700
commitd5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a (patch)
tree8a22ca73ff838f3f0090b29a548ae81087fc90ed /src/citra_qt/configure_general.cpp
parentREADME: Specify master branch for Travis CI badge (diff)
parentFix Travis clang-format check (diff)
downloadyuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.gz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.tar.xz
yuzu-d5d2ca8058a0f1c00ab7ca9fe2c058ba47546c0a.zip
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_general.cpp')
-rw-r--r--src/citra_qt/configure_general.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp
index e6832341a..27139fb30 100644
--- a/src/citra_qt/configure_general.cpp
+++ b/src/citra_qt/configure_general.cpp
@@ -4,23 +4,20 @@
4 4
5#include "citra_qt/configure_general.h" 5#include "citra_qt/configure_general.h"
6#include "citra_qt/ui_settings.h" 6#include "citra_qt/ui_settings.h"
7#include "ui_configure_general.h"
8
9#include "core/settings.h" 7#include "core/settings.h"
10#include "core/system.h" 8#include "core/system.h"
9#include "ui_configure_general.h"
10
11ConfigureGeneral::ConfigureGeneral(QWidget* parent)
12 : QWidget(parent), ui(new Ui::ConfigureGeneral) {
11 13
12ConfigureGeneral::ConfigureGeneral(QWidget *parent) :
13 QWidget(parent),
14 ui(new Ui::ConfigureGeneral)
15{
16 ui->setupUi(this); 14 ui->setupUi(this);
17 this->setConfiguration(); 15 this->setConfiguration();
18 16
19 ui->toggle_cpu_jit->setEnabled(!System::IsPoweredOn()); 17 ui->toggle_cpu_jit->setEnabled(!System::IsPoweredOn());
20} 18}
21 19
22ConfigureGeneral::~ConfigureGeneral() { 20ConfigureGeneral::~ConfigureGeneral() {}
23}
24 21
25void ConfigureGeneral::setConfiguration() { 22void ConfigureGeneral::setConfiguration() {
26 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); 23 ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan);