Skip to content

Commit 6f9aedd

Browse files
committed
Fix compile for Qt5
1 parent 746445a commit 6f9aedd

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

QUsb2snes.qbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Project {
55

66
QtApplication {
77
name : "QUsb2Snes"
8-
cpp.cxxLanguageVersion: "c++11"
8+
cpp.cxxLanguageVersion: "c++17"
99
cpp.includePaths: ["devices/EmuNWAccess-qt", "./", "core/"]
1010
consoleApplication: false
1111
files: [

settings.hpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
#pragma once
22

33
#include <QSettings>
4+
#include <QStringView>
45
#include <qmetaobject.h>
6+
#include <QDebug>
57

68
class Settings : private QSettings
79
{
@@ -41,18 +43,18 @@ class Settings : private QSettings
4143
}();
4244
qDebug() << "Value() StringKey" << settingString;
4345
if constexpr (type == QMetaType::Bool) {
44-
return QSettings::value(settingString).toBool();
46+
return QSettings::value(settingString.toString()).toBool();
4547
} else if constexpr (type == QMetaType::Int) {
46-
return QSettings::value(settingString).toInt();
48+
return QSettings::value(settingString.toString()).toInt();
4749
} else if constexpr (type == QMetaType::Double) {
48-
return QSettings::value(settingString).toDouble();
50+
return QSettings::value(settingString.toString()).toDouble();
4951
} else if constexpr (type == QMetaType::QString) {
50-
return QSettings::value(settingString).toString();
52+
return QSettings::value(settingString.toString()).toString();
5153
} else {
52-
return QSettings::value(settingString);
54+
return QSettings::value(QString(settingString));
5355
}
5456
}
55-
void setValue(SettingsV key, const QVariant& value)
57+
/*void setValue(SettingsV key, const QVariant& value)
5658
{
5759
QStringView keyString;
5860
for (const SettingEntry& mapping : settingsEntries)
@@ -65,8 +67,8 @@ class Settings : private QSettings
6567
keyString = text;
6668
}
6769
qDebug() << "SetValue() StringKey " << keyString;
68-
QSettings::setValue(keyString, value);
69-
}
70+
QSettings::setValue(QString(keyString), value);
71+
}*/
7072
template<SettingsV key, typename T> void setValue(T value)
7173
{
7274
constexpr QMetaType::Type type = [&]() {
@@ -95,7 +97,7 @@ class Settings : private QSettings
9597
#else
9698
static_assert(canConvert, "Settings: Unexpected type used for the key");
9799
#endif
98-
QSettings::setValue(settingString, value);
100+
QSettings::setValue(settingString.toString(), value);
99101
return ;
100102
}
101103

0 commit comments

Comments
 (0)