summaryrefslogtreecommitdiff
path: root/src/citra/config.cpp
diff options
context:
space:
mode:
authorGravatar Emmanuel Gil Peyrot2016-09-21 00:21:23 +0900
committerGravatar Emmanuel Gil Peyrot2016-09-21 11:15:47 +0900
commitebdae19fd226104baec712b9da9939ff82ef3c3a (patch)
treee046c0f562fc4400480b2e3257f140e973a9ce6a /src/citra/config.cpp
parentManually tweak source formatting and then re-run clang-format (diff)
downloadyuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip
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.
Diffstat (limited to 'src/citra/config.cpp')
-rw-r--r--src/citra/config.cpp10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 77679bd88..58aef7a9a 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -2,21 +2,15 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "config.h"
5#include <memory> 6#include <memory>
6
7#include <inih/cpp/INIReader.h>
8
9#include <SDL.h> 7#include <SDL.h>
10 8#include <inih/cpp/INIReader.h>
11#include "citra/default_ini.h" 9#include "citra/default_ini.h"
12
13#include "common/file_util.h" 10#include "common/file_util.h"
14#include "common/logging/log.h" 11#include "common/logging/log.h"
15
16#include "core/settings.h" 12#include "core/settings.h"
17 13
18#include "config.h"
19
20Config::Config() { 14Config::Config() {
21 // TODO: Don't hardcode the path; let the frontend decide where to put the config files. 15 // TODO: Don't hardcode the path; let the frontend decide where to put the config files.
22 sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini"; 16 sdl2_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "sdl2-config.ini";