diff options
| author | Chris Adams <chris.adams@qinetic.com.au> | 2020-10-28 16:59:41 +1000 |
|---|---|---|
| committer | Chris Adams <chris.adams@qinetic.com.au> | 2020-11-02 13:19:49 +1000 |
| commit | e7607c33998b7c89603e6299d9affcd32e68049a (patch) | |
| tree | 68a954107455003f333395b419d16cb027d918d5 /src/versit/qversitcontactimporter_p.cpp | |
| parent | a43cc24e57db8d3c3939fa540d67da3294dcfc5c (diff) | |
Use QMetaType::Type instead of the deprecated QVariant::Type
Change-Id: I8b4ee32e36ea024392f85d5cf1b7b03a84a56e7b
Reviewed-by: Bea Lam <bea.lam@jollamobile.com>
Diffstat (limited to 'src/versit/qversitcontactimporter_p.cpp')
| -rw-r--r-- | src/versit/qversitcontactimporter_p.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/versit/qversitcontactimporter_p.cpp b/src/versit/qversitcontactimporter_p.cpp index e9a9ed8b9..c03c645bd 100644 --- a/src/versit/qversitcontactimporter_p.cpp +++ b/src/versit/qversitcontactimporter_p.cpp @@ -279,7 +279,7 @@ bool QVersitContactImporterPrivate::createName( QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); QString value(takeFirst(values)); @@ -351,7 +351,7 @@ bool QVersitContactImporterPrivate::createAddress( QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList addressParts = variant.toStringList(); QString value(takeFirst(addressParts)); @@ -439,7 +439,7 @@ void QVersitContactImporterPrivate::setOrganizationNames( { QVariant variant = property.variantValue(); if (property.valueType() == QVersitProperty::CompoundType - && variant.type() == QVariant::StringList) { + && variant.metaType().id() == QMetaType::QStringList) { QStringList values = variant.toStringList(); QString name(takeFirst(values)); if (!name.isEmpty()) @@ -496,7 +496,7 @@ bool QVersitContactImporterPrivate::createVersion( QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); bool ok; @@ -589,7 +589,7 @@ bool QVersitContactImporterPrivate::createNicknames( Q_UNUSED(contact); QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::ListType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); QList<int> contexts = extractContexts(property); @@ -621,7 +621,7 @@ bool QVersitContactImporterPrivate::createTags( Q_UNUSED(contact); QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::ListType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); QList<int> contexts = extractContexts(property); @@ -764,7 +764,7 @@ bool QVersitContactImporterPrivate::createGeoLocation( QContactGeoLocation geo; QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); bool ok1; @@ -797,7 +797,7 @@ bool QVersitContactImporterPrivate::createFamily( } else if (property.name() == QStringLiteral("X-CHILDREN")) { QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::ListType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); if (values.isEmpty()) @@ -829,7 +829,7 @@ bool QVersitContactImporterPrivate::createFavorite( QContactFavorite favorite; QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); @@ -907,7 +907,7 @@ bool QVersitContactImporterPrivate::createExtendedDetail( QContactExtendedDetail extendedDetail; const QVariant variant = property.variantValue(); if (property.valueType() != QVersitProperty::CompoundType - || variant.type() != QVariant::StringList) + || variant.metaType().id() != QMetaType::QStringList) return false; QStringList values = variant.toStringList(); @@ -1034,12 +1034,12 @@ bool QVersitContactImporterPrivate::saveDataFromProperty(const QVersitProperty & bool found = false; const QString valueParam = property.parameters().value(QStringLiteral("VALUE")).toUpper(); QVariant variant(property.variantValue()); - if (variant.type() == QVariant::String + if (variant.metaType().id() == QMetaType::QString || valueParam == QStringLiteral("URL") || valueParam == QStringLiteral("URI")) { *location = property.value(); found |= !location->isEmpty(); - } else if (variant.type() == QVariant::ByteArray) { + } else if (variant.metaType().id() == QMetaType::QByteArray) { *data = variant.toByteArray(); if (!data->isEmpty()) { found = true; |