Symbian & symbian SIM backends: Removed deprecated updateXXXRequestStatus function usage.

6 files changed, 31 insertions, 98 deletions

diff --git a/plugins/contacts/symbian/src/cntsymbianengine.cpp b/plugins/contacts/symbian/src/cntsymbianengine.cpp
index 7c4f4bf148..09a02c45d0 100644
--- a/plugins/contacts/symbian/src/cntsymbianengine.cpp
+++ b/plugins/contacts/symbian/src/cntsymbianengine.cpp
@@ -967,9 +967,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             QList<QContact> requestedContacts = QContactManagerEngine::contacts(filter, sorting, defs, operationError);
 
             // update the request with the results.
-            if (!requestedContacts.isEmpty() || operationError != QContactManager::NoError)
-                updateContactFetchRequest(r, requestedContacts, operationError); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateContactFetchRequest(r, requestedContacts, operationError, QContactAbstractRequest::FinishedState); // emit resultsAvailable()
         }
         break;
 
@@ -982,9 +980,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             QContactManager::Error operationError = QContactManager::NoError;
             QList<QContactLocalId> requestedContactIds = QContactManagerEngine::contactIds(filter, sorting, operationError);
 
-            if (!requestedContactIds.isEmpty() || operationError != QContactManager::NoError)
-                updateContactLocalIdFetchRequest(r, requestedContactIds, operationError); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateContactLocalIdFetchRequest(r, requestedContactIds, operationError, QContactAbstractRequest::FinishedState);
         }
         break;
 
@@ -997,8 +993,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             QMap<int, QContactManager::Error> errorMap;
             saveContacts(&contacts, &errorMap, operationError);
 
-            updateContactSaveRequest(r, contacts, operationError, errorMap); // there will always be results of some form.  emit resultsAvailable().
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateContactSaveRequest(r, contacts, operationError, errorMap, QContactAbstractRequest::FinishedState); // there will always be results of some form.  emit resultsAvailable().
         }
         break;
 
@@ -1024,9 +1019,7 @@ void CntSymbianEngine::performAsynchronousOperation()
                 }
             }
 
-            if (!errorMap.isEmpty() || operationError != QContactManager::NoError)
-                updateContactRemoveRequest(r, operationError, errorMap); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateContactRemoveRequest(r, operationError, errorMap, QContactAbstractRequest::FinishedState);
         }
         break;
 
@@ -1051,64 +1044,21 @@ void CntSymbianEngine::performAsynchronousOperation()
                 }
             }
 
-            if (!errorMap.isEmpty() || !requestedDefinitions.isEmpty() || operationError != QContactManager::NoError)
-                updateDefinitionFetchRequest(r, requestedDefinitions, operationError, errorMap); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateDefinitionFetchRequest(r, requestedDefinitions, operationError, errorMap, QContactAbstractRequest::FinishedState);
         }
         break;
 
-// symbian engine currently does not support mutable definitions.
-//
-//        case QContactAbstractRequest::DetailDefinitionSaveRequest:
-//        {
-//            QContactDetailDefinitionSaveRequest* r = static_cast<QContactDetailDefinitionSaveRequest*>(currentRequest);
-//            QContactManager::Error operationError = QContactManager::NoError;
-//            QMap<int, QContactManager::Error> errorMap;
-//            QList<QContactDetailDefinition> definitions = r->definitions();
-//            QList<QContactDetailDefinition> savedDefinitions;
-//
-//            QContactManager::Error tempError;
-//            for (int i = 0; i < definitions.size(); i++) {
-//                QContactDetailDefinition current = definitions.at(i);
-//                saveDetailDefinition(current, r->contactType(), changeSet, tempError);
-//                savedDefinitions.append(current);
-//
-//                if (tempError != QContactManager::NoError) {
-//                    errorMap.insert(i, tempError);
-//                    operationError = tempError;
-//                }
-//            }
-//
-//            // update the request with the results.
-//            updateDefinitionSaveRequest(r, savedDefinitions, operationError, errorMap); // there will always be results of some form.  emit resultsAvailable().
-//            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
-//        }
-//        break;
-//
-//        case QContactAbstractRequest::DetailDefinitionRemoveRequest:
-//        {
-//            QContactDetailDefinitionRemoveRequest* r = static_cast<QContactDetailDefinitionRemoveRequest*>(currentRequest);
-//            QStringList names = r->definitionNames();
-//
-//            QContactManager::Error operationError = QContactManager::NoError;
-//            QMap<int, QContactManager::Error> errorMap;
-//
-//            for (int i = 0; i < names.size(); i++) {
-//                QContactManager::Error tempError;
-//                removeDetailDefinition(names.at(i), r->contactType(), changeSet, tempError);
-//
-//                if (tempError != QContactManager::NoError) {
-//                    errorMap.insert(i, tempError);
-//                    operationError = tempError;
-//                }
-//            }
-//
-//            // there are no results, so just update the status with the error.
-//            if (!errorMap.isEmpty() || operationError != QContactManager::NoError)
-//                updateDefinitionRemoveRequest(r, operationError, errorMap); // emit resultsAvailable()
-//            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
-//        }
-//        break;
+        case QContactAbstractRequest::DetailDefinitionSaveRequest:
+        {
+            // symbian engine currently does not support mutable definitions.
+        }
+        break;
+
+        case QContactAbstractRequest::DetailDefinitionRemoveRequest:
+        {
+            // symbian engine currently does not support mutable definitions.
+        }
+        break;
 
         case QContactAbstractRequest::RelationshipFetchRequest:
         {
@@ -1131,9 +1081,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             }
 
             // update the request with the results.
-            if (!requestedRelationships.isEmpty() || operationError != QContactManager::NoError)
-                updateRelationshipFetchRequest(r, requestedRelationships, operationError); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateRelationshipFetchRequest(r, requestedRelationships, operationError, QContactAbstractRequest::FinishedState);
         }
         break;
 
@@ -1158,9 +1106,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             if (foundMatch == false && operationError == QContactManager::NoError)
                 operationError = QContactManager::DoesNotExistError;
 
-            if (!errorMap.isEmpty() || operationError != QContactManager::NoError)
-                updateRelationshipRemoveRequest(r, operationError, errorMap); // emit resultsAvailable()
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateRelationshipRemoveRequest(r, operationError, errorMap, QContactAbstractRequest::FinishedState);
         }
         break;
 
@@ -1185,8 +1131,7 @@ void CntSymbianEngine::performAsynchronousOperation()
             }
 
             // update the request with the results.
-            updateRelationshipSaveRequest(r, savedRelationships, operationError, errorMap); // there will always be results of some form.  emit resultsAvailable().
-            updateRequestState(currentRequest, QContactAbstractRequest::FinishedState);
+            updateRelationshipSaveRequest(r, savedRelationships, operationError, errorMap, QContactAbstractRequest::FinishedState);
         }
         break;
 
diff --git a/plugins/contacts/symbiansim/src/cntsimcontactfetchrequest.cpp b/plugins/contacts/symbiansim/src/cntsimcontactfetchrequest.cpp
index c890dea10f..7a5da93b3b 100644
--- a/plugins/contacts/symbiansim/src/cntsimcontactfetchrequest.cpp
+++ b/plugins/contacts/symbiansim/src/cntsimcontactfetchrequest.cpp
@@ -85,8 +85,7 @@ void CntSimContactFetchRequest::run()
 

     QContactManager::Error error = QContactManager::NoError;    

     if (!simStore()->read(index, numSlots, error)) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactFetchRequest(r, QList<QContact>(), error);

+        QContactManagerEngine::updateContactFetchRequest(r, QList<QContact>(), error, QContactAbstractRequest::FinishedState);

     }

 }

 

@@ -114,6 +113,5 @@ void CntSimContactFetchRequest::readComplete(QList<QContact> contacts, QContactM
     }

 

     // Complete the request

-    QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);    

-    QContactManagerEngine::updateContactFetchRequest(r, filteredAndSorted, error);

+    QContactManagerEngine::updateContactFetchRequest(r, filteredAndSorted, error, QContactAbstractRequest::FinishedState);

 }

diff --git a/plugins/contacts/symbiansim/src/cntsimcontactlocalidfetchrequest.cpp b/plugins/contacts/symbiansim/src/cntsimcontactlocalidfetchrequest.cpp
index 2be14ea2dc..1376f67826 100644
--- a/plugins/contacts/symbiansim/src/cntsimcontactlocalidfetchrequest.cpp
+++ b/plugins/contacts/symbiansim/src/cntsimcontactlocalidfetchrequest.cpp
@@ -70,8 +70,7 @@ void CntSimContactLocalIdFetchRequest::run()
     

     QContactManager::Error error = QContactManager::NoError;

     if (!simStore()->read(index, numSlots, error)) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactLocalIdFetchRequest(r, QList<QContactLocalId>(), error);

+        QContactManagerEngine::updateContactLocalIdFetchRequest(r, QList<QContactLocalId>(), error, QContactAbstractRequest::FinishedState);

     }

 }

 

@@ -107,6 +106,5 @@ void CntSimContactLocalIdFetchRequest::readComplete(QList<QContact> contacts, QC
     }

         

     // Complete the request

-    QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);    

-    QContactManagerEngine::updateContactLocalIdFetchRequest(r, filteredAndSortedIds, error);

+    QContactManagerEngine::updateContactLocalIdFetchRequest(r, filteredAndSortedIds, error, QContactAbstractRequest::FinishedState);

 }

diff --git a/plugins/contacts/symbiansim/src/cntsimcontactremoverequest.cpp b/plugins/contacts/symbiansim/src/cntsimcontactremoverequest.cpp
index 63dfcb405f..60279c1e11 100644
--- a/plugins/contacts/symbiansim/src/cntsimcontactremoverequest.cpp
+++ b/plugins/contacts/symbiansim/src/cntsimcontactremoverequest.cpp
@@ -98,8 +98,7 @@ void CntSimContactRemoveRequest::removeNext()
         return;

     

     if (r->contactIds().count() == 0) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactRemoveRequest(r, QContactManager::BadArgumentError, m_errorMap);

+        QContactManagerEngine::updateContactRemoveRequest(r, QContactManager::BadArgumentError, m_errorMap, QContactAbstractRequest::FinishedState);

         return;

     }        

     

@@ -111,8 +110,7 @@ void CntSimContactRemoveRequest::removeNext()
         if (m_errorMap.count())

             error = m_errorMap.begin().value();

 

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap);

+        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap, QContactAbstractRequest::FinishedState);

         return;

     }

 

@@ -144,8 +142,7 @@ void CntSimContactRemoveRequest::getReservedSlotsComplete(QList<int> reservedSlo
         return;

     

     if (error != QContactManager::NoError && error != QContactManager::DoesNotExistError) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap);

+        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap, QContactAbstractRequest::FinishedState);

         return;

     }

 

@@ -162,7 +159,6 @@ void CntSimContactRemoveRequest::getReservedSlots()
     

     QContactManager::Error error = QContactManager::NoError;

     if (!simStore()->getReservedSlots(error)) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap);

+        QContactManagerEngine::updateContactRemoveRequest(r, error, m_errorMap, QContactAbstractRequest::FinishedState);

     }

 }

diff --git a/plugins/contacts/symbiansim/src/cntsimcontactsaverequest.cpp b/plugins/contacts/symbiansim/src/cntsimcontactsaverequest.cpp
index a24977cce8..b3e59ac52b 100644
--- a/plugins/contacts/symbiansim/src/cntsimcontactsaverequest.cpp
+++ b/plugins/contacts/symbiansim/src/cntsimcontactsaverequest.cpp
@@ -91,8 +91,7 @@ void CntSimContactSaveRequest::writeNext()
         return;

     

     if (r->contacts().count() == 0) {

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactSaveRequest(r, QList<QContact>(), QContactManager::BadArgumentError, m_errorMap);

+        QContactManagerEngine::updateContactSaveRequest(r, QList<QContact>(), QContactManager::BadArgumentError, m_errorMap, QContactAbstractRequest::FinishedState);

         return;

     }    

     

@@ -104,8 +103,7 @@ void CntSimContactSaveRequest::writeNext()
         if (m_errorMap.count())

             error = m_errorMap.begin().value();

         

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateContactSaveRequest(r, m_contacts, error, m_errorMap);

+        QContactManagerEngine::updateContactSaveRequest(r, m_contacts, error, m_errorMap, QContactAbstractRequest::FinishedState);

         return;

     }

 

diff --git a/plugins/contacts/symbiansim/src/cntsimdetaildefinitionfetchrequest.cpp b/plugins/contacts/symbiansim/src/cntsimdetaildefinitionfetchrequest.cpp
index 020049a8c0..4ded390bf0 100644
--- a/plugins/contacts/symbiansim/src/cntsimdetaildefinitionfetchrequest.cpp
+++ b/plugins/contacts/symbiansim/src/cntsimdetaildefinitionfetchrequest.cpp
@@ -77,8 +77,7 @@ void CntSimDetailDefinitionFetchRequest::run()
             errorMap.insert(i, error);

     

         // Complete the request

-        QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-        QContactManagerEngine::updateDefinitionFetchRequest(r, result, error, errorMap);

+        QContactManagerEngine::updateDefinitionFetchRequest(r, result, error, errorMap, QContactAbstractRequest::FinishedState);

         return;

     }

 

@@ -104,6 +103,5 @@ void CntSimDetailDefinitionFetchRequest::run()
     }

     

     // Complete the request

-    QContactManagerEngine::updateRequestState(r, QContactAbstractRequest::FinishedState);

-    QContactManagerEngine::updateDefinitionFetchRequest(r, result, error, errorMap);

+    QContactManagerEngine::updateDefinitionFetchRequest(r, result, error, errorMap, QContactAbstractRequest::FinishedState);

 }