diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-10 17:05:10 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-10-23 09:58:57 +0200 |
commit | 11bad6109606794091adc3b8a14070ac09707f45 (patch) | |
tree | 603d07bada752a534a8549c6d008b9b8a4aa832a /src/corelib/io | |
parent | a618c260ed0d1de711a5bc20337f9b8c3835c407 (diff) |
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 <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 6 | ||||
-rw-r--r-- | src/corelib/io/qsettings_mac.cpp | 30 | ||||
-rw-r--r-- | src/corelib/io/qsettings_win.cpp | 16 |
3 files changed, 26 insertions, 26 deletions
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); diff --git a/src/corelib/io/qsettings_mac.cpp b/src/corelib/io/qsettings_mac.cpp index 60ef7cdb26..53715a124f 100644 --- a/src/corelib/io/qsettings_mac.cpp +++ b/src/corelib/io/qsettings_mac.cpp @@ -106,8 +106,8 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) { CFPropertyListRef result = 0; - switch (value.type()) { - case QVariant::ByteArray: + switch (value.metaType().id()) { + case QMetaType::QByteArray: { QByteArray ba = value.toByteArray(); result = CFDataCreate(kCFAllocatorDefault, reinterpret_cast<const UInt8 *>(ba.data()), @@ -115,12 +115,12 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) } break; // should be same as below (look for LIST) - case QVariant::List: - case QVariant::StringList: - case QVariant::Polygon: + case QMetaType::QVariantList: + case QMetaType::QStringList: + case QMetaType::QPolygon: result = macList(value.toList()); break; - case QVariant::Map: + case QMetaType::QVariantMap: { const QVariantMap &map = value.toMap(); const int mapSize = map.size(); @@ -145,7 +145,7 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) &kCFTypeDictionaryValueCallBacks); } break; - case QVariant::DateTime: + case QMetaType::QDateTime: { QDateTime dateTime = value.toDateTime(); // CFDate, unlike QDateTime, doesn't store timezone information @@ -155,30 +155,30 @@ static QCFType<CFPropertyListRef> macValue(const QVariant &value) goto string_case; } break; - case QVariant::Bool: + case QMetaType::Bool: result = value.toBool() ? kCFBooleanTrue : kCFBooleanFalse; break; - case QVariant::Int: - case QVariant::UInt: + case QMetaType::Int: + case QMetaType::UInt: { int n = value.toInt(); result = CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &n); } break; - case QVariant::Double: + case QMetaType::Double: { double n = value.toDouble(); result = CFNumberCreate(kCFAllocatorDefault, kCFNumberDoubleType, &n); } break; - case QVariant::LongLong: - case QVariant::ULongLong: + case QMetaType::LongLong: + case QMetaType::ULongLong: { qint64 n = value.toLongLong(); result = CFNumberCreate(0, kCFNumberLongLongType, &n); } break; - case QVariant::String: + case QMetaType::QString: string_case: default: QString string = QSettingsPrivate::variantToString(value); @@ -226,7 +226,7 @@ static QVariant qtValue(CFPropertyListRef cfvalue) bool metNonString = false; for (CFIndex i = 0; i < size; ++i) { QVariant value = qtValue(CFArrayGetValueAtIndex(cfarray, i)); - if (value.type() != QVariant::String) + if (value.typeId() != QMetaType::QString) metNonString = true; list << value; } diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index 43593ea25a..979b37a0be 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -670,9 +670,9 @@ void QWinSettingsPrivate::set(const QString &uKey, const QVariant &value) QByteArray regValueBuff; // Determine the type - switch (value.type()) { - case QVariant::List: - case QVariant::StringList: { + switch (value.typeId()) { + case QMetaType::QVariantList: + case QMetaType::QStringList: { // If none of the elements contains '\0', we can use REG_MULTI_SZ, the // native registry string list type. Otherwise we use REG_BINARY. type = REG_MULTI_SZ; @@ -700,23 +700,23 @@ void QWinSettingsPrivate::set(const QString &uKey, const QVariant &value) break; } - case QVariant::Int: - case QVariant::UInt: { + case QMetaType::Int: + case QMetaType::UInt: { type = REG_DWORD; qint32 i = value.toInt(); regValueBuff = QByteArray(reinterpret_cast<const char*>(&i), sizeof(qint32)); break; } - case QVariant::LongLong: - case QVariant::ULongLong: { + case QMetaType::LongLong: + case QMetaType::ULongLong: { type = REG_QWORD; qint64 i = value.toLongLong(); regValueBuff = QByteArray(reinterpret_cast<const char*>(&i), sizeof(qint64)); break; } - case QVariant::ByteArray: + case QMetaType::QByteArray: Q_FALLTHROUGH(); default: { |