Cleanup: QPlaceContent and subclasses (1/3)

QPlaceContent and subclasses are value types, and subclassing value
is a bad idea, for many reasons. Great care had been taken to work
around the slicing problem, resulting in lot of code and complexity.

Instead of the slicing problem, we now have the problem that we can
assign a QPlaceContent item to a QPlaceImage and back, but that same
QPlaceContent object can also be assigned to a QPlaceReview and a
QPlaceEditorial item. Those then end up as empty items. So while it
seems convenient to have C++ types, we replaced compile errors or
explicitly dynamic APIs, like QVariant, with implicit conversions that
require explicit type checks before, with the risk of silently losing
data.

Ironcially, applications access those different values then through
various QAbstractItemModel implementations - which return QVariants
anyway, requiring explicit type checking and coertion. And the C++
convenience is exclusively interesting for backend implementors, who
anyway need to parse data and identify types dynamically.

What we really need is a map of QVariants, and some information about
what kind of data we can get out of the map.

So as a first step in cleaning, replace the data storage with such a map
and remove all the subclass specific privates, together with all the
complexity (virtual functions, QSharedDataPointer::clone template
specializations, macros).

The subclasses themselves become very thin API wrappers. Their only
special feature is that they all can still be constructed from a
QPlaceContent instance. We need this for compatibility. With all the
convenience C++ APIs marked as deprecated, people can still use
those when using Qt 6.2-compatible Qt Location, and use the warnings
to prepare for Qt 6.5 where we can then remove those APIs entirely.

Change-Id: Id75f55d784fbe214a0db93d3c1f786209ef0a690
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

6 files changed, 153 insertions, 275 deletions

diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 04ef0735..d09b3aa6 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -43,16 +43,13 @@
 #include <QtLocation/QPlaceManagerEngine>
 #include <QtLocation/QPlaceReply>
 #include <QtLocation/QPlaceDetailsReply>
-#include <QtLocation/QPlaceEditorial>
 #include <QtLocation/QPlaceIdReply>
-#include <QtLocation/QPlaceImage>
 #include <QtLocation/QPlaceSearchSuggestionReply>
 #include <QtLocation/QPlaceSearchReply>
 #include <QtLocation/QPlaceSearchRequest>
 #include <QtLocation/QPlaceResult>
 #include <QtLocation/QPlaceCategory>
 #include <QtLocation/QPlace>
-#include <QtLocation/QPlaceReview>
 #include <QtLocation/private/qplace_p.h>
 #include <QtTest/QTest>
 
@@ -306,45 +303,64 @@ public:
                             m_placeRecommendations.insert(place.placeId(), recommendations);
 
                             QJsonArray revArray = p.value(QStringLiteral("reviews")).toArray();
-                            QList<QPlaceReview> reviews;
+                            QList<QPlaceContent> reviews;
                             for (int j = 0; j < revArray.count(); ++j) {
                                 QJsonObject ro = revArray.at(j).toObject();
-                                QPlaceReview review;
-                                if (ro.contains(QStringLiteral("title")))
-                                    review.setTitle(ro.value(QStringLiteral("title")).toString());
-                                if (ro.contains(QStringLiteral("text")))
-                                    review.setText(ro.value(QStringLiteral("text")).toString());
-
-                                if (ro.contains(QStringLiteral("language")))
-                                    review.setLanguage(ro.value("language").toString());
-
-                                if (ro.contains(QStringLiteral("rating")))
-                                    review.setRating(ro.value("rating").toDouble());
-
-                                if (ro.contains(QStringLiteral("dateTime")))
-                                    review.setDateTime(QDateTime::fromString(
-                                                           ro.value(QStringLiteral("dateTime")).toString(),
-                                                           QStringLiteral("hh:mm dd-MM-yyyy")));
-                                if (ro.contains(QStringLiteral("reviewId")))
-                                    review.setReviewId(ro.value("reviewId").toString());
+                                QPlaceContent review(QPlaceContent::ReviewType);
+                                if (ro.contains(QStringLiteral("title"))) {
+                                    review.setValue(QPlaceContent::ReviewTitle,
+                                                    ro.value(QStringLiteral("title")).toString());
+                                }
+                                if (ro.contains(QStringLiteral("text"))) {
+                                    review.setValue(QPlaceContent::ReviewText,
+                                                    ro.value(QStringLiteral("text")).toString());
+                                }
+
+                                if (ro.contains(QStringLiteral("language"))) {
+                                    review.setValue(QPlaceContent::ReviewLanguage,
+                                                    ro.value("language").toString());
+                                }
+
+                                if (ro.contains(QStringLiteral("rating"))) {
+                                    review.setValue(QPlaceContent::ReviewRating,
+                                                    ro.value("rating").toDouble());
+                                }
+
+                                if (ro.contains(QStringLiteral("dateTime"))) {
+                                    const QString dtString =
+                                        ro.value(QStringLiteral("dateTime")).toString();
+                                    review.setValue(QPlaceContent::ReviewDateTime,
+                                                    QDateTime::fromString(dtString,
+                                                        QStringLiteral("hh:mm dd-MM-yyyy")));
+                                }
+                                if (ro.contains(QStringLiteral("reviewId"))) {
+                                    review.setValue(QPlaceContent::ReviewId,
+                                                    ro.value("reviewId").toString());
+                                }
 
                                 reviews << review;
                             }
                             m_placeReviews.insert(place.placeId(), reviews);
 
                             QJsonArray imgArray = p.value(QStringLiteral("images")).toArray();
-                            QList<QPlaceImage> images;
+                            QList<QPlaceContent> images;
                             for (int j = 0; j < imgArray.count(); ++j) {
                                 QJsonObject imgo = imgArray.at(j).toObject();
-                                QPlaceImage image;
-                                if (imgo.contains(QStringLiteral("url")))
-                                    image.setUrl(imgo.value(QStringLiteral("url")).toString());
-
-                                if (imgo.contains("imageId"))
-                                    image.setImageId(imgo.value(QStringLiteral("imageId")).toString());
-
-                                if (imgo.contains("mimeType"))
-                                    image.setMimeType(imgo.value(QStringLiteral("mimeType")).toString());
+                                QPlaceContent image(QPlaceContent::ImageType);
+                                if (imgo.contains(QStringLiteral("url"))) {
+                                    image.setValue(QPlaceContent::ImageUrl,
+                                                  imgo.value(QStringLiteral("url")).toString());
+                                }
+
+                                if (imgo.contains("imageId")) {
+                                    image.setValue(QPlaceContent::ImageId,
+                                                imgo.value(QStringLiteral("imageId")).toString());
+                                }
+
+                                if (imgo.contains("mimeType")) {
+                                    image.setValue(QPlaceContent::ImageMimeType,
+                                                imgo.value(QStringLiteral("mimeType")).toString());
+                                }
 
                                 images << image;
                             }
@@ -352,18 +368,24 @@ public:
                             m_placeImages.insert(place.placeId(), images);
 
                             QJsonArray edArray = p.value(QStringLiteral("editorials")).toArray();
-                            QList<QPlaceEditorial> editorials;
+                            QList<QPlaceContent> editorials;
                             for (int j = 0; j < edArray.count(); ++j) {
                                 QJsonObject edo = edArray.at(j).toObject();
-                                QPlaceEditorial editorial;
-                                if (edo.contains(QStringLiteral("title")))
-                                    editorial.setTitle(edo.value(QStringLiteral("title")).toString());
-
-                                if (edo.contains(QStringLiteral("text")))
-                                    editorial.setText(edo.value(QStringLiteral("text")).toString());
-
-                                if (edo.contains(QStringLiteral("language")))
-                                    editorial.setLanguage(edo.value(QStringLiteral("language")).toString());
+                                QPlaceContent editorial(QPlaceContent::EditorialType);
+                                if (edo.contains(QStringLiteral("title"))) {
+                                    editorial.setValue(QPlaceContent::EditorialTitle,
+                                                    edo.value(QStringLiteral("title")).toString());
+                                }
+
+                                if (edo.contains(QStringLiteral("text"))) {
+                                    editorial.setValue(QPlaceContent::EditorialText,
+                                                    edo.value(QStringLiteral("text")).toString());
+                                }
+
+                                if (edo.contains(QStringLiteral("language"))) {
+                                    editorial.setValue(QPlaceContent::EditorialLanguage,
+                                                edo.value(QStringLiteral("language")).toString());
+                                }
 
                                 editorials << editorial;
                             }
@@ -718,9 +740,9 @@ private:
     QHash<QString, QPlaceCategory> m_categories;
     QHash<QString, QStringList> m_childCategories;
     QHash<QString, QStringList> m_placeRecommendations;
-    QHash<QString, QList<QPlaceReview> > m_placeReviews;
-    QHash<QString, QList<QPlaceImage> > m_placeImages;
-    QHash<QString, QList<QPlaceEditorial> > m_placeEditorials;
+    QHash<QString, QList<QPlaceContent>> m_placeReviews;
+    QHash<QString, QList<QPlaceContent>> m_placeImages;
+    QHash<QString, QList<QPlaceContent>> m_placeEditorials;
 };
 
 #endif
diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
index 7b9fd160..0cf879bd 100644
--- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp
+++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp
@@ -43,13 +43,10 @@
 #include <QtLocation/QPlaceContactDetail>
 #include <QtLocation/QPlaceContentReply>
 #include <QtLocation/QPlaceContentRequest>
-#include <QtLocation/QPlaceEditorial>
 #include <QtLocation/QPlaceIcon>
-#include <QtLocation/QPlaceImage>
 #include <QtLocation/QPlaceManager>
 #include <QtLocation/QPlaceRatings>
 #include <QtLocation/QPlaceResult>
-#include <QtLocation/QPlaceReview>
 #include <QtLocation/QPlaceSearchReply>
 #include <QtLocation/QPlaceSearchRequest>
 #include "../../placemanager_utils/placemanager_utils.h"
@@ -621,30 +618,27 @@ void tst_QPlaceManagerNokia::content()
 
     QVERIFY(results.count() > 0);
 
-    for (auto iter = results.cbegin(), end = results.cend(); iter != end; ++iter) {
+    for (const auto &content : qAsConst(results)) {
         switch (type) {
-        case (QPlaceContent::ImageType): {
-            QPlaceImage image = iter.value();
-            QVERIFY(!image.url().isEmpty());
+        case QPlaceContent::ImageType:
+            QVERIFY(!content.value(QPlaceContent::ImageUrl).value<QUrl>().isEmpty());
             break;
-        } case (QPlaceContent::ReviewType) : {
-            QPlaceReview review = iter.value();
-            QVERIFY(!review.dateTime().isValid());
-            QVERIFY(!review.text().isEmpty());
-            QVERIFY(review.rating() >= 1 && review.rating() <= 5);
-
-            //title and language fields are optional and thus have not been
+        case QPlaceContent::ReviewType:
+            //review title and language fields are optional and thus have not been
             //explicitly tested
+            QVERIFY(!content.value(QPlaceContent::ReviewDateTime).value<QDateTime>().isValid());
+            QVERIFY(!content.value(QPlaceContent::ReviewText).value<QString>().isEmpty());
+            QVERIFY(content.value(QPlaceContent::ReviewRating).toReal() >= 1 &&
+                    content.value(QPlaceContent::ReviewRating).toReal() <= 5);
             break;
-        } case (QPlaceContent::EditorialType): {
-            QPlaceEditorial editorial = iter.value();
-            QVERIFY(!editorial.text().isEmpty());
-
-            //The language field is optional and thus has not been
+        case QPlaceContent::EditorialType:
+            //The editorial language field is optional and thus has not been
             //explicitly tested.
+            QVERIFY(!content.value(QPlaceContent::EditorialText).value<QString>().isEmpty());
+            break;
+        default:
+            QVERIFY2(false, "Unexpected content type");
             break;
-        } default:
-            QFAIL("Unknown content type");
         }
     }
 
diff --git a/tests/auto/qplace/tst_qplace.cpp b/tests/auto/qplace/tst_qplace.cpp
index 8ef1e55c..a6b6bd03 100644
--- a/tests/auto/qplace/tst_qplace.cpp
+++ b/tests/auto/qplace/tst_qplace.cpp
@@ -33,15 +33,13 @@
 #include <QtPositioning/QGeoCoordinate>
 
 #include <qplace.h>
-#include <qplaceimage.h>
+#include <qplacecontent.h>
 #include <qplaceattribute.h>
 #include <qplacecategory.h>
 #include <qplacecontactdetail.h>
 #include <qplaceicon.h>
 #include <qplaceratings.h>
-#include <qplacereview.h>
 #include <qplacesupplier.h>
-#include <qplaceeditorial.h>
 
 QT_USE_NAMESPACE
 
@@ -172,14 +170,14 @@ void tst_Place::imageContentTest()
     QPlace place;
     QVERIFY2(place.content(QPlaceContent::ImageType).count() ==0,"Wrong default value");
 
-    QPlaceImage dummyImage;
-    dummyImage.setUrl(QUrl("www.dummy.one"));
+    QPlaceContent dummyImage(QPlaceContent::ImageType);
+    dummyImage.setValue(QPlaceContent::ImageUrl, QUrl("www.dummy.one"));
 
-    QPlaceImage dummyImage2;
-    dummyImage2.setUrl(QUrl("www.dummy.two"));
+    QPlaceContent dummyImage2(QPlaceContent::ImageType);
+    dummyImage2.setValue(QPlaceContent::ImageUrl, QUrl("www.dummy.two"));
 
-    QPlaceImage dummyImage3;
-    dummyImage3.setUrl(QUrl("www.dummy.three"));
+    QPlaceContent dummyImage3(QPlaceContent::ImageType);
+    dummyImage3.setValue(QPlaceContent::ImageUrl, QUrl("www.dummy.three"));
 
     QPlaceContent::Collection imageCollection;
     imageCollection.insert(0,dummyImage);
@@ -190,17 +188,17 @@ void tst_Place::imageContentTest()
     QPlaceContent::Collection retrievedCollection = place.content(QPlaceContent::ImageType);
 
     QCOMPARE(retrievedCollection.count(), 3);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(0)), dummyImage);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(1)), dummyImage2);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(2)), dummyImage3);
+    QCOMPARE(retrievedCollection.value(0), dummyImage);
+    QCOMPARE(retrievedCollection.value(1), dummyImage2);
+    QCOMPARE(retrievedCollection.value(2), dummyImage3);
 
     //replace the second and insert a sixth image
     //indexes 4 and 5 are "missing"
-    QPlaceImage dummyImage2New;
-    dummyImage2.setUrl(QUrl("www.dummy.two.new"));
+    QPlaceContent dummyImage2New(QPlaceContent::ImageType);
+    dummyImage2.setValue(QPlaceContent::ImageUrl, QUrl("www.dummy.two.new"));
 
-    QPlaceImage dummyImage6;
-    dummyImage6.setUrl(QUrl("www.dummy.six"));
+    QPlaceContent dummyImage6(QPlaceContent::ImageType);
+    dummyImage6.setValue(QPlaceContent::ImageUrl, QUrl("www.dummy.six"));
 
     imageCollection.clear();
     imageCollection.insert(1, dummyImage2New);
@@ -209,12 +207,12 @@ void tst_Place::imageContentTest()
 
     retrievedCollection = place.content(QPlaceContent::ImageType);
     QCOMPARE(retrievedCollection.count(), 4);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(0)), dummyImage);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(1)), dummyImage2New);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(2)), dummyImage3);
-    QCOMPARE(QPlaceImage(retrievedCollection.value(3)), QPlaceImage());
-    QCOMPARE(QPlaceImage(retrievedCollection.value(4)), QPlaceImage());
-    QCOMPARE(QPlaceImage(retrievedCollection.value(5)), dummyImage6);
+    QCOMPARE(retrievedCollection.value(0), dummyImage);
+    QCOMPARE(retrievedCollection.value(1), dummyImage2New);
+    QCOMPARE(retrievedCollection.value(2), dummyImage3);
+    QCOMPARE(retrievedCollection.value(3), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(4), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(5), dummyImage6);
 }
 
 void tst_Place::reviewContentTest()
@@ -222,14 +220,14 @@ void tst_Place::reviewContentTest()
     QPlace place;
     QVERIFY2(place.content(QPlaceContent::ReviewType).count() ==0,"Wrong default value");
 
-    QPlaceReview dummyReview;
-    dummyReview.setTitle(QStringLiteral("Review 1"));
+    QPlaceContent dummyReview(QPlaceContent::ReviewType);
+    dummyReview.setValue(QPlaceContent::ReviewTitle, QStringLiteral("Review 1"));
 
-    QPlaceReview dummyReview2;
-    dummyReview2.setTitle(QStringLiteral("Review 2"));
+    QPlaceContent dummyReview2(QPlaceContent::ReviewType);
+    dummyReview2.setValue(QPlaceContent::ReviewTitle, QStringLiteral("Review 2"));
 
-    QPlaceReview dummyReview3;
-    dummyReview3.setTitle(QStringLiteral("Review 3"));
+    QPlaceContent dummyReview3(QPlaceContent::ReviewType);
+    dummyReview3.setValue(QPlaceContent::ReviewTitle, QStringLiteral("Review 3"));
 
     QPlaceContent::Collection reviewCollection;
     reviewCollection.insert(0,dummyReview);
@@ -240,17 +238,17 @@ void tst_Place::reviewContentTest()
     QPlaceContent::Collection retrievedCollection = place.content(QPlaceContent::ReviewType);
 
     QCOMPARE(retrievedCollection.count(), 3);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(0)), dummyReview);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(1)), dummyReview2);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(2)), dummyReview3);
+    QCOMPARE(retrievedCollection.value(0), dummyReview);
+    QCOMPARE(retrievedCollection.value(1), dummyReview2);
+    QCOMPARE(retrievedCollection.value(2), dummyReview3);
 
     //replace the second and insert a sixth review
     //indexes 4 and 5 are "missing"
-    QPlaceReview dummyReview2New;
-    dummyReview2.setTitle(QStringLiteral("Review 2 new"));
+    QPlaceContent dummyReview2New(QPlaceContent::ReviewType);
+    dummyReview2.setValue(QPlaceContent::ReviewTitle, QStringLiteral("Review 2 new"));
 
-    QPlaceReview dummyReview6;
-    dummyReview6.setTitle(QStringLiteral("Review 6"));
+    QPlaceContent dummyReview6(QPlaceContent::ReviewType);
+    dummyReview6.setValue(QPlaceContent::ReviewTitle, QStringLiteral("Review 6"));
 
     reviewCollection.clear();
     reviewCollection.insert(1, dummyReview2New);
@@ -259,12 +257,12 @@ void tst_Place::reviewContentTest()
 
     retrievedCollection = place.content(QPlaceContent::ReviewType);
     QCOMPARE(retrievedCollection.count(), 4);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(0)), dummyReview);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(1)), dummyReview2New);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(2)), dummyReview3);
-    QCOMPARE(QPlaceReview(retrievedCollection.value(3)), QPlaceReview());
-    QCOMPARE(QPlaceReview(retrievedCollection.value(4)), QPlaceReview());
-    QCOMPARE(QPlaceReview(retrievedCollection.value(5)), dummyReview6);
+    QCOMPARE(retrievedCollection.value(0), dummyReview);
+    QCOMPARE(retrievedCollection.value(1), dummyReview2New);
+    QCOMPARE(retrievedCollection.value(2), dummyReview3);
+    QCOMPARE(retrievedCollection.value(3), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(4), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(5), dummyReview6);
 }
 
 void tst_Place::editorialContentTest()
@@ -272,14 +270,14 @@ void tst_Place::editorialContentTest()
     QPlace place;
     QVERIFY2(place.content(QPlaceContent::EditorialType).count() == 0, "Wrong default value");
 
-    QPlaceEditorial dummyEditorial;
-    dummyEditorial.setTitle(QStringLiteral("Editorial 1"));
+    QPlaceContent dummyEditorial(QPlaceContent::EditorialType);
+    dummyEditorial.setValue(QPlaceContent::EditorialTitle, QStringLiteral("Editorial 1"));
 
-    QPlaceEditorial dummyEditorial2;
-    dummyEditorial2.setTitle(QStringLiteral("Editorial 2"));
+    QPlaceContent dummyEditorial2(QPlaceContent::EditorialType);
+    dummyEditorial2.setValue(QPlaceContent::EditorialTitle, QStringLiteral("Editorial 2"));
 
-    QPlaceEditorial dummyEditorial3;
-    dummyEditorial3.setTitle(QStringLiteral("Editorial 3"));
+    QPlaceContent dummyEditorial3(QPlaceContent::EditorialType);
+    dummyEditorial3.setValue(QPlaceContent::EditorialTitle, QStringLiteral("Editorial 3"));
 
     QPlaceContent::Collection editorialCollection;
     editorialCollection.insert(0,dummyEditorial);
@@ -290,17 +288,17 @@ void tst_Place::editorialContentTest()
     QPlaceContent::Collection retrievedCollection = place.content(QPlaceContent::EditorialType);
 
     QCOMPARE(retrievedCollection.count(), 3);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(0)), dummyEditorial);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(1)), dummyEditorial2);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(2)), dummyEditorial3);
+    QCOMPARE(retrievedCollection.value(0), dummyEditorial);
+    QCOMPARE(retrievedCollection.value(1), dummyEditorial2);
+    QCOMPARE(retrievedCollection.value(2), dummyEditorial3);
 
     //replace the second and insert a sixth editorial
     //indexes 4 and 5 are "missing"
-    QPlaceEditorial dummyEditorial2New;
-    dummyEditorial2.setTitle(QStringLiteral("Editorial 2 new"));
+    QPlaceContent dummyEditorial2New(QPlaceContent::EditorialType);
+    dummyEditorial2.setValue(QPlaceContent::EditorialTitle, QStringLiteral("Editorial 2 new"));
 
-    QPlaceEditorial dummyEditorial6;
-    dummyEditorial6.setTitle(QStringLiteral("Editorial 6"));
+    QPlaceContent dummyEditorial6(QPlaceContent::EditorialType);
+    dummyEditorial6.setValue(QPlaceContent::EditorialTitle, QStringLiteral("Editorial 6"));
 
     editorialCollection.clear();
     editorialCollection.insert(1, dummyEditorial2New);
@@ -309,12 +307,12 @@ void tst_Place::editorialContentTest()
 
     retrievedCollection = place.content(QPlaceContent::EditorialType);
     QCOMPARE(retrievedCollection.count(), 4);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(0)), dummyEditorial);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(1)), dummyEditorial2New);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(2)), dummyEditorial3);
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(3)), QPlaceEditorial());
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(4)), QPlaceEditorial());
-    QCOMPARE(QPlaceEditorial(retrievedCollection.value(5)), dummyEditorial6);
+    QCOMPARE(retrievedCollection.value(0), dummyEditorial);
+    QCOMPARE(retrievedCollection.value(1), dummyEditorial2New);
+    QCOMPARE(retrievedCollection.value(2), dummyEditorial3);
+    QCOMPARE(retrievedCollection.value(3), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(4), QPlaceContent());
+    QCOMPARE(retrievedCollection.value(5), dummyEditorial6);
 }
 
 void tst_Place::categoriesTest()
diff --git a/tests/auto/qplaceeditorial/tst_qplaceeditorial.cpp b/tests/auto/qplaceeditorial/tst_qplaceeditorial.cpp
index 1c20bd29..934d94b0 100644
--- a/tests/auto/qplaceeditorial/tst_qplaceeditorial.cpp
+++ b/tests/auto/qplaceeditorial/tst_qplaceeditorial.cpp
@@ -37,6 +37,9 @@
 
 QT_USE_NAMESPACE
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 class tst_QPlaceEditorial : public QObject
 {
     Q_OBJECT
@@ -44,12 +47,6 @@ class tst_QPlaceEditorial : public QObject
 public:
     tst_QPlaceEditorial();
 
-    //needed for QLocationTestUtils::testConversion
-    QPlaceEditorial initialSubObject();
-    bool checkType(const QPlaceContent &);
-    void detach(QPlaceContent *);
-    void setSubClassProperty(QPlaceEditorial *);
-
 private Q_SLOTS:
     void constructorTest();
     void supplierTest();
@@ -57,48 +54,12 @@ private Q_SLOTS:
     void titleTest();
     void languageTest();
     void operatorsTest();
-    void conversionTest();
 };
 
 tst_QPlaceEditorial::tst_QPlaceEditorial()
 {
 }
 
-QPlaceEditorial tst_QPlaceEditorial::initialSubObject()
-{
-    QPlaceUser user;
-    user.setName("user 1");
-    user.setUserId("0001");
-
-    QPlaceSupplier supplier;
-    supplier.setName("supplier");
-    supplier.setSupplierId("1");
-
-    QPlaceEditorial editorial;
-    editorial.setTitle("title");
-    editorial.setText("text");
-    editorial.setLanguage("en");
-    editorial.setUser(user);
-    editorial.setSupplier(supplier);
-    editorial.setAttribution("attribution");
-
-    return editorial;
-}
-
-bool tst_QPlaceEditorial::checkType(const QPlaceContent &content)
-{
-    return content.type() == QPlaceContent::EditorialType;
-}
-
-void tst_QPlaceEditorial::detach(QPlaceContent *content)
-{
-    content->setAttribution("attribution");
-}
-
-void tst_QPlaceEditorial::setSubClassProperty(QPlaceEditorial * editorial)
-{
-    editorial->setTitle("new title");
-}
 void tst_QPlaceEditorial::constructorTest()
 {
     QPlaceEditorial testObj;
@@ -155,12 +116,8 @@ void tst_QPlaceEditorial::operatorsTest()
     QVERIFY2(testObj != testObj2, "Object should be different");
 }
 
-void tst_QPlaceEditorial::conversionTest()
-{
-    QLocationTestUtils::testConversion<tst_QPlaceEditorial,
-                                       QPlaceContent,
-                                       QPlaceEditorial>(this);
-}
+QT_WARNING_POP
+
 QTEST_APPLESS_MAIN(tst_QPlaceEditorial);
 
 #include "tst_qplaceeditorial.moc"
diff --git a/tests/auto/qplaceimage/tst_qplaceimage.cpp b/tests/auto/qplaceimage/tst_qplaceimage.cpp
index 1e5396fe..a67eedd8 100644
--- a/tests/auto/qplaceimage/tst_qplaceimage.cpp
+++ b/tests/auto/qplaceimage/tst_qplaceimage.cpp
@@ -36,6 +36,9 @@
 
 QT_USE_NAMESPACE
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 class tst_QPlaceImage : public QObject
 {
     Q_OBJECT
@@ -43,12 +46,6 @@ class tst_QPlaceImage : public QObject
 public:
     tst_QPlaceImage();
 
-    //needed for QLocationTestUtils::testConversion
-    QPlaceImage initialSubObject();
-    bool checkType(const QPlaceContent &);
-    void detach(QPlaceContent *);
-    void setSubClassProperty(QPlaceImage *);
-
 private Q_SLOTS:
     void constructorTest();
     void supplierTest();
@@ -56,49 +53,12 @@ private Q_SLOTS:
     void mimeTypeTest();
     void attributionTest();
     void operatorsTest();
-    void conversionTest();
 };
 
 tst_QPlaceImage::tst_QPlaceImage()
 {
 }
 
-QPlaceImage tst_QPlaceImage::initialSubObject()
-{
-    QPlaceUser user;
-    user.setName("user 1");
-    user.setUserId("0001");
-
-    QPlaceSupplier supplier;
-    supplier.setName("supplier");
-    supplier.setSupplierId("1");
-
-    QPlaceImage image;
-    image.setUrl(QUrl(QStringLiteral("file:///opt/icon/img.png")));
-    image.setImageId("0001");
-    image.setMimeType("image/png");
-    image.setUser(user);
-    image.setSupplier(supplier);
-    image.setAttribution("attribution");
-
-    return image;
-}
-
-bool tst_QPlaceImage::checkType(const QPlaceContent &content)
-{
-    return content.type() == QPlaceContent::ImageType;
-}
-
-void tst_QPlaceImage::detach(QPlaceContent *content)
-{
-    content->setAttribution("attribution");
-}
-
-void tst_QPlaceImage::setSubClassProperty(QPlaceImage *image)
-{
-    image->setImageId("0002");
-}
-
 void tst_QPlaceImage::constructorTest()
 {
     QPlaceImage testObj;
@@ -157,12 +117,7 @@ void tst_QPlaceImage::operatorsTest()
     QVERIFY2(testObj != testObj2, "Object should be different");
 }
 
-void tst_QPlaceImage::conversionTest()
-{
-    QLocationTestUtils::testConversion<tst_QPlaceImage,
-                                       QPlaceContent,
-                                       QPlaceImage>(this);
-}
+QT_WARNING_POP
 
 QTEST_APPLESS_MAIN(tst_QPlaceImage);
 
diff --git a/tests/auto/qplacereview/tst_qplacereview.cpp b/tests/auto/qplacereview/tst_qplacereview.cpp
index 7f7edfe0..b1607434 100644
--- a/tests/auto/qplacereview/tst_qplacereview.cpp
+++ b/tests/auto/qplacereview/tst_qplacereview.cpp
@@ -37,6 +37,9 @@
 
 QT_USE_NAMESPACE
 
+QT_WARNING_PUSH
+QT_WARNING_DISABLE_DEPRECATED
+
 class tst_QPlaceReview : public QObject
 {
     Q_OBJECT
@@ -44,12 +47,6 @@ class tst_QPlaceReview : public QObject
 public:
     tst_QPlaceReview();
 
-    //needed for QLocationTestUtils::testConversion
-    QPlaceReview initialSubObject();
-    bool checkType(const QPlaceContent &);
-    void detach(QPlaceContent *);
-    void setSubClassProperty(QPlaceReview *);
-
 private Q_SLOTS:
     void constructorTest();
     void supplierTest();
@@ -61,52 +58,12 @@ private Q_SLOTS:
     void titleTest();
     void userTest();
     void operatorsTest();
-    void conversionTest();
 };
 
 tst_QPlaceReview::tst_QPlaceReview()
 {
 }
 
-QPlaceReview tst_QPlaceReview::initialSubObject()
-{
-    QPlaceUser user;
-    user.setName("user 1");
-    user.setUserId("0001");
-
-    QPlaceSupplier supplier;
-    supplier.setName("supplier");
-    supplier.setSupplierId("1");
-
-    QPlaceReview review;
-    review.setTitle("title");
-    review.setText("text");
-    review.setRating(4.5);
-    review.setLanguage("en");
-    review.setDateTime(QDateTime::fromString("01:02 03/04/2000",
-                                             "hh:mm dd/MM/yyyy"));
-    review.setUser(user);
-    review.setSupplier(supplier);
-    review.setAttribution("attribution");
-
-    return review;
-}
-
-bool tst_QPlaceReview::checkType(const QPlaceContent &content)
-{
-    return content.type() == QPlaceContent::ReviewType;
-}
-
-void tst_QPlaceReview::detach(QPlaceContent *content)
-{
-    content->setAttribution("attribution");
-}
-
-void tst_QPlaceReview::setSubClassProperty(QPlaceReview *review)
-{
-    review->setTitle("new title");
-}
-
 void tst_QPlaceReview::constructorTest()
 {
     QPlaceReview testObj;
@@ -208,12 +165,7 @@ void tst_QPlaceReview::userTest()
     QVERIFY(review.user().name().isEmpty());
 }
 
-void tst_QPlaceReview::conversionTest()
-{
-    QLocationTestUtils::testConversion<tst_QPlaceReview,
-                                       QPlaceContent,
-                                       QPlaceReview>(this);
-}
+QT_WARNING_POP
 
 QTEST_APPLESS_MAIN(tst_QPlaceReview)