Use QString instead of QByteArray
Signed-off-by: Yihe Li <winmikedows@hotmail.com>
This commit is contained in:
parent
caff4b884f
commit
0a1001ee84
1 changed files with 3 additions and 3 deletions
|
@ -69,7 +69,7 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s
|
||||||
m_settings->registerSetting("lastTimePlayed", 0);
|
m_settings->registerSetting("lastTimePlayed", 0);
|
||||||
|
|
||||||
m_settings->registerSetting("linkedInstances", "[]");
|
m_settings->registerSetting("linkedInstances", "[]");
|
||||||
m_settings->registerSetting("shortcuts", QVariant::fromValue(QByteArray{}));
|
m_settings->registerSetting("shortcuts", QString());
|
||||||
|
|
||||||
// Game time override
|
// Game time override
|
||||||
auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
|
auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
|
||||||
|
@ -417,12 +417,12 @@ void BaseInstance::setShortcuts(const QList<ShortcutData>& shortcuts)
|
||||||
|
|
||||||
QJsonDocument document;
|
QJsonDocument document;
|
||||||
document.setArray(array);
|
document.setArray(array);
|
||||||
m_settings->set("shortcuts", QVariant::fromValue(document.toJson(QJsonDocument::Compact)));
|
m_settings->set("shortcuts", QString::fromUtf8(document.toJson(QJsonDocument::Compact)));
|
||||||
}
|
}
|
||||||
|
|
||||||
QList<ShortcutData> BaseInstance::shortcuts() const
|
QList<ShortcutData> BaseInstance::shortcuts() const
|
||||||
{
|
{
|
||||||
auto data = m_settings->get("shortcuts").value<QByteArray>();
|
auto data = m_settings->get("shortcuts").toString().toUtf8();
|
||||||
auto document = QJsonDocument::fromJson(data);
|
auto document = QJsonDocument::fromJson(data);
|
||||||
QList<ShortcutData> results;
|
QList<ShortcutData> results;
|
||||||
for (const auto& elem : document.array()) {
|
for (const auto& elem : document.array()) {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue