mkCal: small update based on review comments

3 files changed, 19 insertions, 18 deletions

diff --git a/plugins/organizer/mkcal/mkcalengine.cpp b/plugins/organizer/mkcal/mkcalengine.cpp
index 5089e1d85a..d51c6a2170 100644
--- a/plugins/organizer/mkcal/mkcalengine.cpp
+++ b/plugins/organizer/mkcal/mkcalengine.cpp
@@ -705,7 +705,7 @@ bool MKCalEngine::removeCollection(const QOrganizerCollectionId& collectionId, Q
 
 bool MKCalEngine::startRequest(QOrganizerAbstractRequest* req)
 {
-    d->m_asynchProcess->addRequest(req);
+    d->m_asynchProcess->startRequest(req);
     return true;
 }
 
diff --git a/plugins/organizer/mkcal/qorganizerasynchmanager.cpp b/plugins/organizer/mkcal/qorganizerasynchmanager.cpp
index 51e92e2ce5..fb693c6800 100644
--- a/plugins/organizer/mkcal/qorganizerasynchmanager.cpp
+++ b/plugins/organizer/mkcal/qorganizerasynchmanager.cpp
@@ -241,25 +241,27 @@ void AsyncWorker::handleDefinitionFetchRequest(QOrganizerItemDetailDefinitionFet
     QMap<int, QOrganizerManager::Error> errorMap;
     QStringList keys = req->definitionNames();
     if (keys.isEmpty())
-        keys = definitions.keys();
-    int definitionsCount = keys.count();
-    for (int i = 0; i < definitionsCount; ++i) {
-        if (definitions.contains(keys.at(i)))
-            retn.insert(keys.at(i), definitions[keys.at(i)]);
-        else
-            errorMap.insert(i, QOrganizerManager::DoesNotExistError);
+        retn = definitions;
+    else {
+        int definitionsCount = keys.count();
+        for (int i = 0; i < definitionsCount; ++i) {
+            if (definitions.contains(keys.at(i)))
+                retn.insert(keys.at(i), definitions[keys.at(i)]);
+            else
+                errorMap.insert(i, QOrganizerManager::DoesNotExistError);
+        }
     }
     QOrganizerManagerEngine::updateDefinitionFetchRequest(req, retn, err, errorMap, QOrganizerAbstractRequest::FinishedState);
 }
 
 void AsyncWorker::handleDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRemoveRequest *req)
 {
-    QOrganizerManager::Error tempError = QOrganizerManager::NoError;
     QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     QMap<int, QOrganizerManager::Error> errorMap;
     QStringList definitionNames = req->definitionNames();
     int nameCount = definitionNames.count();
     for(int i = 0; i < nameCount; ++i) {
+        QOrganizerManager::Error tempError = QOrganizerManager::NoError;
         m_manager->m_engine->removeDetailDefinition(definitionNames.at(i), req->itemType(), &tempError);
         if (tempError != QOrganizerManager::NoError) {
             errorMap.insert(i, tempError);
@@ -271,12 +273,12 @@ void AsyncWorker::handleDefinitionRemoveRequest(QOrganizerItemDetailDefinitionRe
 
 void AsyncWorker::handleDefinitionSaveRequest(QOrganizerItemDetailDefinitionSaveRequest *req)
 {
-    QOrganizerManager::Error tempError = QOrganizerManager::NoError;
     QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     QMap<int, QOrganizerManager::Error> errorMap;
     QList<QOrganizerItemDetailDefinition> definitions = req->definitions();
     int definitionCount = definitions.count();
     for (int i = 0; i < definitionCount; ++i) {
+        QOrganizerManager::Error tempError = QOrganizerManager::NoError;
         m_manager->m_engine->saveDetailDefinition(definitions.at(i), req->itemType(), &tempError);
         if (tempError != QOrganizerManager::NoError) {
             errorMap.insert(i, tempError);
@@ -298,11 +300,10 @@ void AsyncWorker::handleCollectionRemoveRequest(QOrganizerCollectionRemoveReques
     QOrganizerManager::Error tempError = QOrganizerManager::NoError;
     QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     QMap<int, QOrganizerManager::Error> errorMap;
-    QOrganizerCollectionId currentId;
-    QList<QOrganizerCollectionId> colsToRemove = req->collectionIds();
+    const QList<QOrganizerCollectionId>& colsToRemove(req->collectionIds());
     int collectionsCount = colsToRemove.count();
     for (int i = 0; i < collectionsCount; ++i) {
-        currentId = colsToRemove.at(i);
+        const QOrganizerCollectionId& currentId(colsToRemove.at(i));
         m_manager->m_engine->removeCollection(currentId, &tempError);
         if (tempError != QOrganizerManager::NoError) {
             errorMap.insert(i, tempError);
@@ -317,11 +318,11 @@ void AsyncWorker::handleCollectionSaveRequest(QOrganizerCollectionSaveRequest *r
     QOrganizerManager::Error tempError = QOrganizerManager::NoError;
     QOrganizerManager::Error operationError = QOrganizerManager::NoError;
     QMap<int, QOrganizerManager::Error> errorMap;
-    QList<QOrganizerCollection> collections = req->collections();
+    QList<QOrganizerCollection> collections(req->collections());
     QList<QOrganizerCollection> retn;
     int collectionsCount = collections.count();
     for (int i = 0; i < collectionsCount; ++i) {
-        QOrganizerCollection collection = collections.at(i);
+        QOrganizerCollection collection(collections.at(i));
         m_manager->m_engine->saveCollection(&collection, &tempError);
         retn << collection;
         if (tempError != QOrganizerManager::NoError) {
@@ -367,7 +368,7 @@ void OrganizerAsynchManager::requestDestroyed(QOrganizerAbstractRequest *req)
     }
 }
 
-bool OrganizerAsynchManager::addRequest(QOrganizerAbstractRequest *req)
+bool OrganizerAsynchManager::startRequest(QOrganizerAbstractRequest *req)
 {
     QMutexLocker locker(&m_mutex);
 
diff --git a/plugins/organizer/mkcal/qorganizerasynchmanager.h b/plugins/organizer/mkcal/qorganizerasynchmanager.h
index 8f85db9527..e9458d8121 100644
--- a/plugins/organizer/mkcal/qorganizerasynchmanager.h
+++ b/plugins/organizer/mkcal/qorganizerasynchmanager.h
@@ -73,7 +73,7 @@ public:
     ~OrganizerAsynchManager();
 
     void requestDestroyed(QOrganizerAbstractRequest *req);
-    bool addRequest(QOrganizerAbstractRequest *req);
+    bool startRequest(QOrganizerAbstractRequest *req);
     bool cancelRequest(QOrganizerAbstractRequest *req);
     bool waitForRequestFinished(QOrganizerAbstractRequest *req, int msecs = -1);
 
@@ -92,7 +92,7 @@ private:
 
     QMutex m_mutex;
 
-    bool m_destroying;
+    volatile bool m_destroying;
     QWaitCondition m_destroyWait;
 
     void workerDone(AsyncWorker *worker, QOrganizerAbstractRequest *req);