Fix some symbian rename issues in tsrc

11 files changed, 80 insertions, 80 deletions

diff --git a/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp b/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
index fadc8a7d04..078089534f 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemlocation/tst_itemlocation.cpp
@@ -273,7 +273,7 @@ void TestItemLocation::addLocationDetail()
     }
     
     // Fetch the item again
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     
     // Check if the location has been set properly
     QOrganizerItemLocation itemLocation;
diff --git a/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp b/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
index b635f8260b..67463f06b8 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
@@ -71,8 +71,8 @@ private slots:
     void editOccurrence();
     void editOccurrenceNegative_data();
     void editOccurrenceNegative();
-    void updateOccurrenceLocalId_data(){addManagers();};
-    void updateOccurrenceLocalId();
+    void updateOccurrenceId_data(){addManagers();};
+    void updateOccurrenceId();
     void fetchNegative_data();
     void fetchNegative();
     void daylightSavingTime_data() { addManagers(); }
@@ -178,7 +178,7 @@ void tst_ItemOccurrence::addOccurrenceDetail()
     QVERIFY(m_om->saveItem(&item));
         
     // Fetch the saved item
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     
     // Fetch the item again
     QList<QOrganizerItem> instanceList = m_om->itemOccurrences(item,startTime,endTime);
@@ -188,8 +188,8 @@ void tst_ItemOccurrence::addOccurrenceDetail()
     QCOMPARE(lastItem.type(), QLatin1String(QOrganizerItemType::TypeEventOccurrence));
     QOrganizerEventOccurrence thirdEvent = static_cast<QOrganizerEventOccurrence>(lastItem);
     QCOMPARE(thirdEvent.startDateTime(), QDateTime(QDate(QDate::currentDate().year() , 9, 15)));
-    QCOMPARE(thirdEvent.localId(), QOrganizerItemLocalId());
-    QCOMPARE(thirdEvent.parentLocalId(), item.localId());
+    QCOMPARE(thirdEvent.id(), QOrganizerItemId());
+    QCOMPARE(thirdEvent.parentId(), item.id());
     
     //Fetch instances using maxcount only.
     instanceList.clear();
@@ -199,8 +199,8 @@ void tst_ItemOccurrence::addOccurrenceDetail()
     QCOMPARE(secondItem.type(), QLatin1String(QOrganizerItemType::TypeEventOccurrence));
     QOrganizerEventOccurrence secondEvent = static_cast<QOrganizerEventOccurrence>(secondItem);
     QCOMPARE(secondEvent.startDateTime(), QDateTime(QDate(QDate::currentDate().year() , 9, 8)));
-    QCOMPARE(secondEvent.localId(), QOrganizerItemLocalId());
-    QCOMPARE(secondEvent.parentLocalId(), item.localId());    
+    QCOMPARE(secondEvent.id(), QOrganizerItemId());
+    QCOMPARE(secondEvent.parentId(), item.id());    
 }
 
 void tst_ItemOccurrence::fetchOccurrenceByFilterSort_data() 
@@ -452,7 +452,7 @@ void tst_ItemOccurrence::addOccurrenceWithException()
     
     // Save item with recurrence rule.
     QVERIFY(m_om->saveItem(&item));    
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
             
     //Fetch instance on the exception date.An empty list should be returned
     QList<QOrganizerItem> instanceList = m_om->itemOccurrences(item,QDateTime(exceptionDate),QDateTime(exceptionDate));
@@ -529,7 +529,7 @@ void tst_ItemOccurrence::editOccurrence()
     
     // Save item with recurrence rule.
     QVERIFY(m_om->saveItem(&item));    
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
 
     //Fetch first and third instance of the saved entry to modify
     QList<QOrganizerItem> instanceList = m_om->itemOccurrences(item,startTime,QDateTime(),3);
@@ -629,7 +629,7 @@ void tst_ItemOccurrence::editOccurrenceNegative()
      
     // Save item with recurrence rule.
     QVERIFY(m_om->saveItem(&item));    
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
 
     //Fetch first instance of the saved entry to modify
     QList<QOrganizerItem> instanceList = m_om->itemOccurrences(item,startTime,startTime);
@@ -639,10 +639,10 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     QOrganizerEventOccurrence firstInstance = static_cast<QOrganizerEventOccurrence>(firstItem);
     QString instanceGuid (firstInstance.guid());
 
-    //Try to save instance with invalid guid and parentlocalId fails
+    //Try to save instance with invalid guid and parentid fails
     // TODO: Disabled because of API change. REFACTOR!
     //firstInstance.setGuid(QString(""));
-    //firstInstance.setParentLocalId(QOrganizerItemLocalId(-1));
+    //firstInstance.setParentId(QOrganizerItemId(-1));
     //QVERIFY(!m_om->saveItem(&firstInstance));
     //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 
@@ -661,13 +661,13 @@ void tst_ItemOccurrence::editOccurrenceNegative()
     //Save the instance with invalid localid
     // TODO: Disabled because of API change. REFACTOR!
     //QOrganizerItemId itemId;
-    //itemId.setLocalId(1);
+    //itemId.setId(1);
     //firstInstance.setId(itemId);
     //QVERIFY(!m_om->saveItem(&firstInstance));
     //QCOMPARE(m_om->error(), QOrganizerManager::InvalidOccurrenceError);
 }
 
-void tst_ItemOccurrence::updateOccurrenceLocalId()
+void tst_ItemOccurrence::updateOccurrenceId()
 {
     // Create recurring event
     QOrganizerEvent christmas;
@@ -686,13 +686,13 @@ void tst_ItemOccurrence::updateOccurrenceLocalId()
     exception.setStartDateTime(QDateTime(QDate(2010, 12, 25), QTime(0, 0, 0)));
     exception.setEndDateTime(QDateTime(QDate(2010, 12, 26), QTime(0, 0, 0)));
     exception.setDisplayLabel(QLatin1String("Xmass"));
-    exception.setParentLocalId(christmas.localId());
+    exception.setParentId(christmas.id());
     QVERIFY(m_om->saveItem(&exception));
-    QVERIFY(exception.localId() != QOrganizerItemLocalId(0));
+    QVERIFY(exception.id() != QOrganizerItemId(0));
 
     // Modify the exception
     exception.setDisplayLabel(QLatin1String("Christmas"));
-    exception.setParentLocalId(QOrganizerItemLocalId(0));
+    exception.setParentId(QOrganizerItemId(0));
     QVERIFY(m_om->saveItem(&exception));
 }
 
@@ -734,7 +734,7 @@ void tst_ItemOccurrence::fetchNegative()
     QVERIFY(m_om->saveItem(&item));
     
     // Fetch the saved item
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
         
     // Fetch the item instances for a non repeating entry
     instanceList = m_om->itemOccurrences(item,startTime,endTime);
diff --git a/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp b/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
index 3899a8b0b6..e57ead6422 100644
--- a/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itempriority/tst_itempriority.cpp
@@ -207,7 +207,7 @@ void TestItemPriority::addPriorityDetail()
     QVERIFY(m_om->saveItem(&item));
     
     // Fetch the item again
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     
     // Check if the priority has been set properly
     QOrganizerItemPriority itemPriority;
diff --git a/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp b/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
index 1281ac882b..e9e45e785b 100644
--- a/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_itemsortfilter/tst_itemsortfilter.cpp
@@ -85,7 +85,7 @@ public:
 
 typedef QList<QTstDetailField> QTstDetailFieldList;
 typedef QList<QTstSortOrder> QTstSortOrderList;
-typedef QList<QOrganizerItemLocalId> QOrganizerItemLocalIdList;
+typedef QList<QOrganizerItemId> QOrganizerItemIdList;
 typedef QList<QOrganizerItemSortOrder> QOrganizerItemSortOrderList;
 Q_DECLARE_METATYPE(QOrganizerItemFilter)
 Q_DECLARE_METATYPE(QOrganizerItemSortOrderList)
@@ -113,17 +113,17 @@ private: // util functions
     void addEvent_data(int mgrIndex);
     void addTodo_data(int mgrIndex);
     bool parseDetails(QTstDetailFieldList detailsString, QList<QOrganizerItemDetail> &details);
-    QOrganizerItemLocalId addTestDataItem(int mgrIndex, QString displayLabel, QTstDetailFieldList detailsList);
+    QOrganizerItemId addTestDataItem(int mgrIndex, QString displayLabel, QTstDetailFieldList detailsList);
     void addNewFilterRow(int mgrIndex, QOrganizerItemFilter filter, QString matchingItems);
     void addNewSortRow(int mgrIndex, QTstSortOrderList sortDetailList, QString matchingItemsStr);
-    QString convertIds(int mgrIndex, QOrganizerItemLocalIdList ids);
+    QString convertIds(int mgrIndex, QOrganizerItemIdList ids);
     QOrganizerItemFilter invalidFilter();
     QOrganizerItemFilter defaultFilter();
     QOrganizerItemFilter detailFilter(QString defNam, QString fieldNam, int flags, QVariant filterCriterion);
     QOrganizerItemFilter detailRangeFilter(QString defNam, QString fieldNam, int flags, QVariant min, QVariant max);
 private:
     QList<QOrganizerManager *> m_managers;
-    QList<QOrganizerItemLocalIdList> m_itemIds;
+    QList<QOrganizerItemIdList> m_itemIds;
 
 };
 
@@ -150,7 +150,7 @@ tst_itemSortFilter::~tst_itemSortFilter()
     }
 }
 
-QOrganizerItemLocalId tst_itemSortFilter::addTestDataItem(int mgrIndex, QString displayLabel, QTstDetailFieldList detailsList)
+QOrganizerItemId tst_itemSortFilter::addTestDataItem(int mgrIndex, QString displayLabel, QTstDetailFieldList detailsList)
 {
     QOrganizerItem item;
     item.setDisplayLabel(displayLabel);
@@ -166,7 +166,7 @@ QOrganizerItemLocalId tst_itemSortFilter::addTestDataItem(int mgrIndex, QString
     if (m_managers.at(mgrIndex)->error() != QOrganizerManager::NoError) {
         QWARN("[tst_itemSortFilter::addTestDataItem] Test item creation failed");
     }
-    return item.localId();
+    return item.id();
 }
 
 void tst_itemSortFilter::addNewFilterRow(int mgrIndex, QOrganizerItemFilter filter, QString matchingItemsStr)
@@ -253,11 +253,11 @@ void tst_itemSortFilter::filterItems()
     QFETCH(QString, matchingItemsStr);
 
     QList<QOrganizerItem>actualItems = m_managers.at(mgrIndex)->items(filter);
-    QList<QOrganizerItemLocalId> actualIds;
+    QList<QOrganizerItemId> actualIds;
     QString actualItemsStr;
 
     foreach(QOrganizerItem item, actualItems) {
-        actualIds << item.localId();
+        actualIds << item.id();
     }
     actualItemsStr = convertIds(mgrIndex, actualIds);
 
@@ -320,11 +320,11 @@ void tst_itemSortFilter::sortItems()
     QFETCH(QString, matchingItemsStr);
 
     QList<QOrganizerItem> actualItems = m_managers.at(mgrIndex)->items(QOrganizerItemFilter(), sortOrderList);
-    QList<QOrganizerItemLocalId> actualIds;
+    QList<QOrganizerItemId> actualIds;
     QString actualItemsStr;
 
     foreach(QOrganizerItem item, actualItems) {
-        actualIds << item.localId();
+        actualIds << item.id();
     }
     actualItemsStr = convertIds(mgrIndex, actualIds);
 
@@ -346,7 +346,7 @@ void tst_itemSortFilter::addEvent_data(int mgrIndex)
 void tst_itemSortFilter::addTodo_data(int mgrIndex)
 {
     QTstDetailField itemTypeTodo(QOrganizerItemType::DefinitionName, QOrganizerItemType::FieldType, QOrganizerItemType::TypeTodo);
-    QOrganizerItemLocalIdList itemIdList;
+    QOrganizerItemIdList itemIdList;
     bool fieldPercentageSupported = (m_managers.at(mgrIndex)->detailDefinitions(QOrganizerItemType::TypeTodo)
         .value(QOrganizerTodoProgress::DefinitionName).fields().contains(QOrganizerTodoProgress::FieldPercentageComplete));
 
@@ -444,7 +444,7 @@ bool tst_itemSortFilter::parseDetails(QTstDetailFieldList detailsList, QList<QOr
     return true;
 }
 
-QString tst_itemSortFilter::convertIds(int mgrIndex, QOrganizerItemLocalIdList ids)
+QString tst_itemSortFilter::convertIds(int mgrIndex, QOrganizerItemIdList ids)
 {
    QString ret;
    /* Expected is of the form "abcd".. it's possible that there are some extra contacts */
diff --git a/plugins/organizer/symbian/tsrc/tst_recurringitems/tst_recurringitems.cpp b/plugins/organizer/symbian/tsrc/tst_recurringitems/tst_recurringitems.cpp
index 5a0894d578..a43ceb1ea7 100644
--- a/plugins/organizer/symbian/tsrc/tst_recurringitems/tst_recurringitems.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_recurringitems/tst_recurringitems.cpp
@@ -171,7 +171,7 @@ void tst_recurringItems::addRecurrenceRule()
     QVERIFY(m_om->saveItem(&item));
 
     // Fetch and Verify
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
 
     QOrganizerItemRecurrence resultRecurrence = item.detail(QOrganizerItemRecurrence::DefinitionName);
 
@@ -374,20 +374,20 @@ void tst_recurringItems::removeRecurrenceRule()
     QVERIFY(m_om->saveItem(&item));
 
     // Fetch the saved item & check that recurrence rule was saved
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     QVERIFY(item.details(QOrganizerItemRecurrence::DefinitionName).count() == 1);
 
     // Remove a recurrence rule detail & save & verify it does not exist
     recurrence = item.detail<QOrganizerItemRecurrence>();
     item.removeDetail(&recurrence);
     QVERIFY(m_om->saveItem(&item));
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     QVERIFY(item.details(QOrganizerItemRecurrence::DefinitionName).count() == 0);
     
     // Save the recurrence again & fetch & verify
     QVERIFY(item.saveDetail(&recurrence));
     QVERIFY(m_om->saveItem(&item));
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     QVERIFY(item.details(QOrganizerItemRecurrence::DefinitionName).count() == 1);
     
     // Set empty recurrence rule detail & save & verify it does not exist
@@ -395,7 +395,7 @@ void tst_recurringItems::removeRecurrenceRule()
     recurrence.setRecurrenceRules(QSet<QOrganizerRecurrenceRule>());
     QVERIFY(item.saveDetail(&recurrence));
     QVERIFY(m_om->saveItem(&item));
-    item = m_om->item(item.localId());
+    item = m_om->item(item.id());
     QVERIFY(item.details(QOrganizerItemRecurrence::DefinitionName).count() == 0);
 }
 
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
index c6d312ea6f..5a4f7c91c8 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchcollections/tst_symbianasynchcollections.cpp
@@ -75,8 +75,8 @@ const int KNumberOfEntries = 2;
     QTRY_COMPARE(removedSpy1.count(), removedCount); \
     QTRY_COMPARE(removedSpy2.count(), removedCount);
     
-Q_DECLARE_METATYPE(QList<QOrganizerItemLocalId>)
-Q_DECLARE_METATYPE(QList<QOrganizerCollectionLocalId>)
+Q_DECLARE_METATYPE(QList<QOrganizerItemId>)
+Q_DECLARE_METATYPE(QList<QOrganizerCollectionId>)
 
 class tst_symbianasynchcollections : public QObject
 {
@@ -385,8 +385,8 @@ void tst_symbianasynchcollections::requestResultsAvailable()
 //Signal emission testcases
 void tst_symbianasynchcollections::addCollectionSignals()
 {        
-    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionLocalId");
-    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionLocalId>");
+    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionId");
+    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionId>");
     qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
     
     // Create a second manager
@@ -426,17 +426,17 @@ void tst_symbianasynchcollections::addCollectionSignals()
     QCOMPARE(addedSpy1.last().count(), 1);
     QCOMPARE(addedSpy2.last().count(), 1);
     // Verify the arguments contain the id of the new collection
-    QCOMPARE(addedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(addedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(addedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), req->collections().at(0).id());
-    QCOMPARE(addedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), req->collections().at(0).id());
+    QCOMPARE(addedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(addedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(addedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), req->collections().at(0).id());
+    QCOMPARE(addedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), req->collections().at(0).id());
     delete req;
 }
 
 void tst_symbianasynchcollections::modifyCollectionSignals()
 {
-    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionLocalId");
-    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionLocalId>");
+    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionId");
+    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionId>");
     qRegisterMetaType<QList<QOrganizerAbstractRequest::State> >("QOrganizerAbstractRequest::State>");
     
     // Create a second manager
@@ -474,10 +474,10 @@ void tst_symbianasynchcollections::modifyCollectionSignals()
     QCOMPARE(changedSpy1.last().count(), 1);
     QCOMPARE(changedSpy2.last().count(), 1);
     // Verify the arguments contain the id of the modified collection
-    QCOMPARE(changedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(changedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(changedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), req->collections().at(0).id());
-    QCOMPARE(changedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), req->collections().at(0).id());
+    QCOMPARE(changedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(changedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(changedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), req->collections().at(0).id());
+    QCOMPARE(changedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), req->collections().at(0).id());
     //QCOMPARE(req.collections().at(0).metaData().value("Name"),savedCollection.metaData().value("Name"));
     
     delete req;
@@ -488,8 +488,8 @@ void tst_symbianasynchcollections::deleteCollectionSignals()
     // Make sure to delete the old request, if any
     delete m_itemRequest;
     m_itemRequest =0;
-    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionLocalId");
-    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionLocalId>");
+    qRegisterMetaType<QOrganizerCollectionId>("QOrganizerCollectionId");
+    qRegisterMetaType<QList<QOrganizerCollectionId> >("QList<QOrganizerCollectionId>");
     qRegisterMetaType<QOrganizerAbstractRequest::State>("QOrganizerAbstractRequest::State");
     
     // Create a second manager
@@ -506,11 +506,11 @@ void tst_symbianasynchcollections::deleteCollectionSignals()
     QSignalSpy removedSpy2(om2.data(), SIGNAL(collectionsRemoved(QList<QOrganizerCollectionId>)));
      
      //Fetch the saved collection
-     QOrganizerCollectionId savedCollectionLocalId = m_om->collections().at(1).id();
+     QOrganizerCollectionId savedCollectionId = m_om->collections().at(1).id();
      int countBeforeDeletion = m_om->collections().count();
      qWarning() << countBeforeDeletion << "calendar/s are present currently for deletion";
     
-    deleteReq->setCollectionId(savedCollectionLocalId);
+    deleteReq->setCollectionId(savedCollectionId);
 
     // Start the request
     QVERIFY(deleteReq->start());
@@ -525,10 +525,10 @@ void tst_symbianasynchcollections::deleteCollectionSignals()
     QCOMPARE(removedSpy1.last().count(), 1);
     QCOMPARE(removedSpy2.last().count(), 1);
     // Verify the arguments contain the id of the removed collection
-    QCOMPARE(removedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(removedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().count(), 1);
-    QCOMPARE(removedSpy1.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), savedCollectionLocalId);
-    QCOMPARE(removedSpy2.last().at(0).value<QList<QOrganizerCollectionLocalId> >().at(0), savedCollectionLocalId);
+    QCOMPARE(removedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(removedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().count(), 1);
+    QCOMPARE(removedSpy1.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), savedCollectionId);
+    QCOMPARE(removedSpy2.last().at(0).value<QList<QOrganizerCollectionId> >().at(0), savedCollectionId);
     QCOMPARE(m_om->collections().count(), 1);
     delete deleteReq;
 }
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
index 827e01eb98..fb0b49fdcc 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchfetchitems/tst_symbianasynchfetchitems.cpp
@@ -221,13 +221,13 @@ void TestFetchItems::saveRequestResultsAvailable()
 
 void TestFetchItems::fetchItems()
 {
-    QOrganizerItemIdFilter localIdFilter;
+    QOrganizerItemIdFilter idFilter;
     QList<QOrganizerItemId> lUids;
     // TODO: Disabled because of API change. REFACTOR!
     //lUids.append(3);
     //lUids.append(4);
-    localIdFilter.setIds(lUids);
-    //m_fetchItemRequest->setFilter(localIdFilter);
+    idFilter.setIds(lUids);
+    //m_fetchItemRequest->setFilter(idFilter);
     // Set ItemDetailsFilter
     QOrganizerItemDetailFilter detailsFilter;
     detailsFilter.setDetailDefinitionName(
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
index 296f458fbd..2e62b3476f 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianasynchapis/tst_symbianasynchnotes/tst_symbianasynchnotes.cpp
@@ -190,9 +190,9 @@ void TestNoteItems::fetchItem()
     QOrganizerItemFetchRequest * itemFetchRequest(
         (QOrganizerItemFetchRequest*)m_itemRequest);
 
-    QOrganizerItemIdFilter localIdFilter;
-    localIdFilter.setIds(m_itemIds);
-    //itemFetchRequest->setFilter(localIdFilter);
+    QOrganizerItemIdFilter idFilter;
+    idFilter.setIds(m_itemIds);
+    //itemFetchRequest->setFilter(idFilter);
         
     // Set ItemDetailsFilter
     QOrganizerItemDetailFilter detailsFilter;
@@ -625,7 +625,7 @@ QList<QOrganizerItem> TestNoteItems::createItems_Negative(int noOfItems)
         // TODO: Disabled because of API change. REFACTOR!
         //QOrganizerItemId id;
         //QOrganizerItemId id(1234);
-        //id.setId(localId);
+        //id.setId(id);
         //id.setManagerUri("qtorganizer:symbian:");
         //organizerItem.setId(id);
 
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp b/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
index 77bdfa4733..ae3e916b64 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianom/tst_symbianom.cpp
@@ -399,11 +399,11 @@ void tst_SymbianOm::uniqueIds()
     QVERIFY(todo.guid() == "1234567890");
     
     // Save an existing todo item with guid only. Should pass.
-    QOrganizerItemId localId = todo.id();
+    QOrganizerItemId id = todo.id();
     todo.setDescription("foobar");
     todo.setId(QOrganizerItemId());
     QVERIFY(m_om->saveItem(&todo));
-    QVERIFY(todo.id() == localId); // local id should remain the same
+    QVERIFY(todo.id() == id); // local id should remain the same
     
     // Change manager uri and save again. Should fail.
     todo.setId(QOrganizerItemId());
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp b/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
index d3cfee08b4..c6e8fd1adb 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianomasync/tst_symbianomasync.cpp
@@ -361,9 +361,9 @@ void tst_SymbianOmAsync::fetchItemsIdFilter()
     QSignalSpy resultSpy(&req, SIGNAL(resultsAvailable()));
 
     // Fetch with local id filter
-    QOrganizerItemIdFilter localIdFilter;
-    localIdFilter.setIds(m_om->itemIds().mid(pos, length));
-    req.setFilter(localIdFilter);
+    QOrganizerItemIdFilter idFilter;
+    idFilter.setIds(m_om->itemIds().mid(pos, length));
+    req.setFilter(idFilter);
     QVERIFY(req.start());
     QCOMPARE(req.state(), QOrganizerAbstractRequest::ActiveState);
     QTRY_COMPARE(stateSpy.count(), 2);  // inactive > active > finished
@@ -389,13 +389,13 @@ void tst_SymbianOmAsync::fetchItemsNonExistingIds()
     // Create fetch request with id filter
     QOrganizerItemFetchRequest req;
     req.setManager(m_om);
-    QOrganizerItemIdFilter localIdFilter;
+    QOrganizerItemIdFilter idFilter;
     QList<QOrganizerItemId> ids;
     foreach (QOrganizerItem item, items) {
         ids.append(item.id());
     }
-    localIdFilter.setIds(ids);
-    req.setFilter(localIdFilter);
+    idFilter.setIds(ids);
+    req.setFilter(idFilter);
 
     // Create signal spys for verification purposes
     QSignalSpy stateSpy(&req, SIGNAL(stateChanged(QOrganizerAbstractRequest::State)));
diff --git a/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp b/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
index 46836aefbc..70e663221e 100644
--- a/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
+++ b/plugins/organizer/symbian/tsrc/tst_symbianomcollections/tst_symbianomcollections.cpp
@@ -687,11 +687,11 @@ void tst_symbianomcollections::removeItem()
     QVERIFY(m_om->saveItem(&item));
 
     // Remove item
-    QOrganizerItemId localId = item.id();
-    QVERIFY(m_om->removeItem(localId));
+    QOrganizerItemId id = item.id();
+    QVERIFY(m_om->removeItem(id));
 
     // Verify
-    QVERIFY(m_om->item(localId).isEmpty());
+    QVERIFY(m_om->item(id).isEmpty());
 }
 
 void tst_symbianomcollections::fetchItems()
@@ -726,9 +726,9 @@ void tst_symbianomcollections::fetchItems()
 
     // Verify there are no duplicates in the list
     bool noduplicates(true);
-    foreach(QOrganizerItemId localid, m_om->itemIds()) {
-        if (m_om->itemIds().count(localid) > 1) {
-            qWarning() << "duplicate local id: " << localid;
+    foreach(QOrganizerItemId id, m_om->itemIds()) {
+        if (m_om->itemIds().count(id) > 1) {
+            qWarning() << "duplicate id: " << id;
             noduplicates = false;
         }
     }