Fix inconsistency between removing places and categories

removing places used to take a place object while removing categories
used a category id.  Change removing places to use a place id.

Change-Id: I2d603564df362b327fb2fdd27e1f2f00bf2ae833
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index 297282a8..809879ca 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -189,16 +189,16 @@ public:
         return reply;
     }
 
-    QPlaceIdReply *removePlace(const QPlace &place)
+    QPlaceIdReply *removePlace(const QString &placeId)
     {
         IdReply *reply = new IdReply(QPlaceIdReply::RemovePlace, this);
-        reply->setId(place.placeId());
+        reply->setId(placeId);
 
-        if (!m_places.contains(place.placeId())) {
+        if (!m_places.contains(placeId)) {
             reply->setError(QPlaceReply::PlaceDoesNotExistError, tr("Place does not exist"));
             QMetaObject::invokeMethod(reply, "emitError", Qt::QueuedConnection);
         } else {
-            m_places.remove(place.placeId());
+            m_places.remove(placeId);
         }
 
         QMetaObject::invokeMethod(reply, "emitFinished", Qt::QueuedConnection);
diff --git a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
index a3db9c26..3b85f3a2 100644
--- a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
+++ b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
@@ -1112,7 +1112,7 @@ void tst_QPlaceManagerJsonDb::doSavePlaces(const QList<QPlace *> &places)
 bool tst_QPlaceManagerJsonDb::doRemovePlace(const QPlace &place,
                                             QPlaceReply::Error expectedError)
 {
-    QPlaceIdReply *removeReply = placeManager->removePlace(place);
+    QPlaceIdReply *removeReply = placeManager->removePlace(place.placeId());
     bool isSuccessful = false;
     isSuccessful = checkSignals(removeReply, expectedError)
                     && (removeReply->id() == place.placeId());