diff options
| author | 2017-05-27 18:14:00 -0700 | |
|---|---|---|
| committer | 2017-05-27 18:41:24 -0700 | |
| commit | 62f34c8e5ce94adeb24d985f8d2c32b1ece37a3c (patch) | |
| tree | 1bf8109f6705b84fe6df01e6bf0f97f17f4f8452 /src | |
| parent | Remove some unnecessary inclusions of video_core.h (diff) | |
| download | yuzu-62f34c8e5ce94adeb24d985f8d2c32b1ece37a3c.tar.gz yuzu-62f34c8e5ce94adeb24d985f8d2c32b1ece37a3c.tar.xz yuzu-62f34c8e5ce94adeb24d985f8d2c32b1ece37a3c.zip | |
Citra: Convert include into forward declaration
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/config.cpp | 4 | ||||
| -rw-r--r-- | src/citra/config.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index a4162e9ad..f08b4069c 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -5,11 +5,11 @@ | |||
| 5 | #include <memory> | 5 | #include <memory> |
| 6 | #include <SDL.h> | 6 | #include <SDL.h> |
| 7 | #include <inih/cpp/INIReader.h> | 7 | #include <inih/cpp/INIReader.h> |
| 8 | #include "citra/config.h" | ||
| 8 | #include "citra/default_ini.h" | 9 | #include "citra/default_ini.h" |
| 9 | #include "common/file_util.h" | 10 | #include "common/file_util.h" |
| 10 | #include "common/logging/log.h" | 11 | #include "common/logging/log.h" |
| 11 | #include "common/param_package.h" | 12 | #include "common/param_package.h" |
| 12 | #include "config.h" | ||
| 13 | #include "core/settings.h" | 13 | #include "core/settings.h" |
| 14 | #include "input_common/main.h" | 14 | #include "input_common/main.h" |
| 15 | 15 | ||
| @@ -21,6 +21,8 @@ Config::Config() { | |||
| 21 | Reload(); | 21 | Reload(); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | Config::~Config() = default; | ||
| 25 | |||
| 24 | bool Config::LoadINI(const std::string& default_contents, bool retry) { | 26 | bool Config::LoadINI(const std::string& default_contents, bool retry) { |
| 25 | const char* location = this->sdl2_config_loc.c_str(); | 27 | const char* location = this->sdl2_config_loc.c_str(); |
| 26 | if (sdl2_config->ParseError() < 0) { | 28 | if (sdl2_config->ParseError() < 0) { |
diff --git a/src/citra/config.h b/src/citra/config.h index b1c31f59c..abc90f642 100644 --- a/src/citra/config.h +++ b/src/citra/config.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | 6 | ||
| 7 | #include <memory> | 7 | #include <memory> |
| 8 | #include <string> | 8 | #include <string> |
| 9 | #include <inih/cpp/INIReader.h> | 9 | |
| 10 | class INIReader; | ||
| 10 | 11 | ||
| 11 | class Config { | 12 | class Config { |
| 12 | std::unique_ptr<INIReader> sdl2_config; | 13 | std::unique_ptr<INIReader> sdl2_config; |
| @@ -17,6 +18,7 @@ class Config { | |||
| 17 | 18 | ||
| 18 | public: | 19 | public: |
| 19 | Config(); | 20 | Config(); |
| 21 | ~Config(); | ||
| 20 | 22 | ||
| 21 | void Reload(); | 23 | void Reload(); |
| 22 | }; | 24 | }; |