--- a/phonebookui/phonebookservices/src/cntserviceproviderold2.cpp Wed Aug 18 09:39:00 2010 +0300
+++ b/phonebookui/phonebookservices/src/cntserviceproviderold2.cpp Thu Sep 02 20:16:15 2010 +0300
@@ -135,8 +135,19 @@
connect(this, SIGNAL(returnValueDelivered()), qApp, SLOT(quit()));
if ( mCurrentRequestIndex != 0 )
{
- CNT_LOG_ARGS("next, completing request.")
- const bool success = completeRequest(mCurrentRequestIndex, retValue);
+ bool success = false;
+
+ if (!mOverriddenReturnValue.isNull() && retValue.value<int>() != KCntServicesReturnValueContactDeleted)
+ {
+ CNT_LOG_ARGS(mOverriddenReturnValue.value<int>());
+ success = completeRequest(mCurrentRequestIndex, mOverriddenReturnValue);
+ }
+ else
+ {
+ CNT_LOG_ARGS(retValue.value<int>());
+ success = completeRequest(mCurrentRequestIndex, retValue);
+ }
+
if ( !success )
{
CNT_LOG_ARGS("Failed to complete highway request.");
@@ -146,5 +157,17 @@
CNT_EXIT
}
+void CntServiceProviderOld2::overrideReturnValue(const QVariant& retValue)
+{
+ CNT_ENTRY
+
+ if (mOverriddenReturnValue.isNull() || mOverriddenReturnValue.value<int>() != KCntServicesReturnValueContactSaved)
+ {
+ mOverriddenReturnValue = retValue;
+ }
+
+ CNT_EXIT
+}
+
// end of file