diff options
| author | bunnei <bunneidev@gmail.com> | 2019-05-24 18:23:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 18:23:58 -0400 |
| commit | 59f110ef31ffa64033090c34357829a402857a9c (patch) | |
| tree | d79b351051ec4c461441b2aaabbc55edaf027add /src/yuzu/configuration/config.h | |
| parent | d4f8fe24d943c8ef54eb24d2d7e3c1488a7f10bd (diff) | |
| parent | f49a04ba39363ad3b406233085f33afe8776707b (diff) | |
Merge pull request #2504 from lioncash/config
yuzu/configuration/config: Specify string conversions explicitly
Diffstat (limited to 'src/yuzu/configuration/config.h')
| -rw-r--r-- | src/yuzu/configuration/config.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index b62a480ee..6b523ecdd 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -9,7 +9,6 @@ #include <string> #include <QVariant> #include "core/settings.h" -#include "yuzu/ui_settings.h" class QSettings; @@ -82,8 +81,6 @@ private: void WriteSetting(const QString& name, const QVariant& value); void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value); - static const std::array<UISettings::Shortcut, 15> default_hotkeys; - std::unique_ptr<QSettings> qt_config; std::string qt_config_loc; }; |