diff --git a/src/lib/bookmarks/bookmarks.cpp b/src/lib/bookmarks/bookmarks.cpp index b31fe1b59..3d38c2db1 100644 --- a/src/lib/bookmarks/bookmarks.cpp +++ b/src/lib/bookmarks/bookmarks.cpp @@ -26,6 +26,7 @@ #include #include +#include static const int bookmarksVersion = 1; @@ -237,7 +238,7 @@ void Bookmarks::loadBookmarks() QJsonDocument json = QJsonDocument::fromJson(QzTools::readAllFileByteContents(bookmarksFile), &err); const QVariant res = json.toVariant(); - if (err.error != QJsonParseError::NoError || res.type() != QVariant::Map) { + if (err.error != QJsonParseError::NoError || res.typeId() != QMetaType::QVariantMap) { if (QFile(bookmarksFile).exists()) { qWarning() << "Bookmarks::init() Error parsing bookmarks! Using default bookmarks!"; qWarning() << "Bookmarks::init() Your bookmarks have been backed up in" << backupFile; @@ -252,7 +253,7 @@ void Bookmarks::loadBookmarks() const QVariant data = json.toVariant(); Q_ASSERT(err.error == QJsonParseError::NoError); - Q_ASSERT(data.type() == QVariant::Map); + Q_ASSERT(data.typeId() == QMetaType::QVariantMap); loadBookmarksFromMap(data.toMap().value(QSL("roots")).toMap()); diff --git a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp index 6c6542820..c6d6f834c 100644 --- a/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp +++ b/src/lib/bookmarks/bookmarksimport/chromeimporter.cpp @@ -21,6 +21,7 @@ #include #include #include +#include ChromeImporter::ChromeImporter(QObject* parent) : BookmarksImporter(parent) @@ -71,7 +72,7 @@ BookmarkItem* ChromeImporter::importBookmarks() QJsonDocument json = QJsonDocument::fromJson(data, &err); const QVariant res = json.toVariant(); - if (err.error != QJsonParseError::NoError || res.type() != QVariant::Map) { + if (err.error != QJsonParseError::NoError || res.typeId() != QMetaType::QVariantMap) { setError(BookmarksImporter::tr("Cannot parse JSON file!")); return nullptr; } diff --git a/src/lib/network/schemehandlers/falkonschemehandler.cpp b/src/lib/network/schemehandlers/falkonschemehandler.cpp index 287d7735b..b26140ad5 100644 --- a/src/lib/network/schemehandlers/falkonschemehandler.cpp +++ b/src/lib/network/schemehandlers/falkonschemehandler.cpp @@ -35,6 +35,7 @@ #include #include #include +#include static QString authorString(const char* name, const QString &mail) { @@ -387,18 +388,18 @@ QString FalkonSchemeReply::configPage() const QVariant keyValue = settings->value(key); QString keyString; - switch (keyValue.type()) { - case QVariant::ByteArray: + switch (keyValue.typeId()) { + case QMetaType::QByteArray: keyString = QLatin1String("QByteArray"); break; - case QVariant::Point: { + case QMetaType::QPoint: { const QPoint point = keyValue.toPoint(); keyString = QSL("QPoint(%1, %2)").arg(point.x()).arg(point.y()); break; } - case QVariant::StringList: + case QMetaType::QStringList: keyString = keyValue.toStringList().join(QSL(",")); break; diff --git a/src/lib/opensearch/opensearchengine.cpp b/src/lib/opensearch/opensearchengine.cpp index d0a12549f..2b4c45db4 100644 --- a/src/lib/opensearch/opensearchengine.cpp +++ b/src/lib/opensearch/opensearchengine.cpp @@ -633,7 +633,7 @@ void OpenSearchEngine::suggestionsObtained() QJsonDocument json = QJsonDocument::fromJson(response, &err); const QVariant res = json.toVariant(); - if (err.error != QJsonParseError::NoError || res.type() != QVariant::List) + if (err.error != QJsonParseError::NoError || res.typeId() != QMetaType::QVariantList) return; const QVariantList list = res.toList();