diff options
| author | 2018-10-23 21:49:50 -0400 | |
|---|---|---|
| committer | 2018-10-24 00:24:02 -0400 | |
| commit | 6949f73149644820c678c1ffb57d18f21259740d (patch) | |
| tree | e797473be95cfe31205e61f02160e6d28521733e /src | |
| parent | yuzu/configuration/config: Reorganize member variable and function layout (diff) | |
| download | yuzu-6949f73149644820c678c1ffb57d18f21259740d.tar.gz yuzu-6949f73149644820c678c1ffb57d18f21259740d.tar.xz yuzu-6949f73149644820c678c1ffb57d18f21259740d.zip | |
yuzu/configuration/config: Use a std::unique_ptr for qt_config instead of a raw pointer
Same behavior, less code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 13 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.h | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index d029590ff..a1e13ed8f 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp | |||
| @@ -12,11 +12,16 @@ Config::Config() { | |||
| 12 | // TODO: Don't hardcode the path; let the frontend decide where to put the config files. | 12 | // TODO: Don't hardcode the path; let the frontend decide where to put the config files. |
| 13 | qt_config_loc = FileUtil::GetUserPath(FileUtil::UserPath::ConfigDir) + "qt-config.ini"; | 13 | qt_config_loc = FileUtil::GetUserPath(FileUtil::UserPath::ConfigDir) + "qt-config.ini"; |
| 14 | FileUtil::CreateFullPath(qt_config_loc); | 14 | FileUtil::CreateFullPath(qt_config_loc); |
| 15 | qt_config = new QSettings(QString::fromStdString(qt_config_loc), QSettings::IniFormat); | 15 | qt_config = |
| 16 | std::make_unique<QSettings>(QString::fromStdString(qt_config_loc), QSettings::IniFormat); | ||
| 16 | 17 | ||
| 17 | Reload(); | 18 | Reload(); |
| 18 | } | 19 | } |
| 19 | 20 | ||
| 21 | Config::~Config() { | ||
| 22 | Save(); | ||
| 23 | } | ||
| 24 | |||
| 20 | const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = { | 25 | const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = { |
| 21 | Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q, | 26 | Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q, |
| 22 | Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T, | 27 | Qt::Key_W, Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T, |
| @@ -337,9 +342,3 @@ void Config::Reload() { | |||
| 337 | void Config::Save() { | 342 | void Config::Save() { |
| 338 | SaveValues(); | 343 | SaveValues(); |
| 339 | } | 344 | } |
| 340 | |||
| 341 | Config::~Config() { | ||
| 342 | Save(); | ||
| 343 | |||
| 344 | delete qt_config; | ||
| 345 | } | ||
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index a1d0fbe7e..9c99c1b75 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <array> | 7 | #include <array> |
| 8 | #include <memory> | ||
| 8 | #include <string> | 9 | #include <string> |
| 9 | #include <QVariant> | 10 | #include <QVariant> |
| 10 | #include "core/settings.h" | 11 | #include "core/settings.h" |
| @@ -26,6 +27,6 @@ private: | |||
| 26 | void ReadValues(); | 27 | void ReadValues(); |
| 27 | void SaveValues(); | 28 | void SaveValues(); |
| 28 | 29 | ||
| 29 | QSettings* qt_config; | 30 | std::unique_ptr<QSettings> qt_config; |
| 30 | std::string qt_config_loc; | 31 | std::string qt_config_loc; |
| 31 | }; | 32 | }; |