From 11bad6109606794091adc3b8a14070ac09707f45 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 10 Sep 2020 17:05:10 +0200 Subject: Deprecate QVariant::Type It's been obsolete for a long time already. Make sure the compiler now warns about it and remove all remaining uses in qtbase. Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7 Reviewed-by: Fabian Kosmale --- src/corelib/io/qsettings.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qsettings.cpp') diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 547f2759f5..a2888e0953 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -381,7 +381,7 @@ QString QSettingsPrivate::variantToString(const QVariant &v) { QString result; - switch (v.userType()) { + switch (v.metaType().id()) { case QMetaType::UnknownType: result = QLatin1String("@Invalid()"); break; @@ -1815,8 +1815,8 @@ bool QConfFileSettingsPrivate::writeIniFile(QIODevice &device, const ParsedSetti QVariant(QString("foo")).toList() returns an empty list, not a list containing "foo". */ - if (value.userType() == QMetaType::QStringList - || (value.userType() == QMetaType::QVariantList && value.toList().size() != 1)) { + if (value.metaType().id() == QMetaType::QStringList + || (value.metaType().id() == QMetaType::QVariantList && value.toList().size() != 1)) { iniEscapedStringList(variantListToStringList(value.toList()), block); } else { iniEscapedString(variantToString(value), block); -- cgit v1.2.3