Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

yuzu/configuration/config: Specify string conversions explicitly

Browse source 
Allows the configuration code to build successfully with implicit string
conversions disabled.

Also makes default_hotkeys internally linked:
Given the array is a private static array, we can just make it
internally linked to hide it from external code. This also allows us to
remove an inclusion within the header.
This commit is contained in:
Lioncash 2019-07-25 23:34:05 +02:00 • committed by fearlessTobi
parent 45ff10c9a0
commit e58a805a22
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/citra_qt/configuration/config.h
View file

@ -8,7 +8,6 @@
#include <memory>
#include <string>
#include <QVariant>
#include "citra_qt/ui_settings.h"
#include "core/settings.h"
class QSettings;
@ -32,8 +31,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, 19> default_hotkeys;
std::unique_ptr<QSettings> qt_config;
std::string qt_config_loc;
};