equal
deleted
inserted
replaced
134 { |
134 { |
135 CNT_ENTRY |
135 CNT_ENTRY |
136 connect(this, SIGNAL(returnValueDelivered()), qApp, SLOT(quit())); |
136 connect(this, SIGNAL(returnValueDelivered()), qApp, SLOT(quit())); |
137 if ( mCurrentRequestIndex != 0 ) |
137 if ( mCurrentRequestIndex != 0 ) |
138 { |
138 { |
139 CNT_LOG_ARGS("next, completing request.") |
139 bool success = false; |
140 const bool success = completeRequest(mCurrentRequestIndex, retValue); |
140 |
|
141 if (!mOverriddenReturnValue.isNull() && retValue.value<int>() != KCntServicesReturnValueContactDeleted) |
|
142 { |
|
143 CNT_LOG_ARGS(mOverriddenReturnValue.value<int>()); |
|
144 success = completeRequest(mCurrentRequestIndex, mOverriddenReturnValue); |
|
145 } |
|
146 else |
|
147 { |
|
148 CNT_LOG_ARGS(retValue.value<int>()); |
|
149 success = completeRequest(mCurrentRequestIndex, retValue); |
|
150 } |
|
151 |
141 if ( !success ) |
152 if ( !success ) |
142 { |
153 { |
143 CNT_LOG_ARGS("Failed to complete highway request."); |
154 CNT_LOG_ARGS("Failed to complete highway request."); |
144 } |
155 } |
145 mCurrentRequestIndex = 0; |
156 mCurrentRequestIndex = 0; |
146 } |
157 } |
147 CNT_EXIT |
158 CNT_EXIT |
148 } |
159 } |
149 |
160 |
|
161 void CntServiceProviderOld::overrideReturnValue(const QVariant& retValue) |
|
162 { |
|
163 CNT_ENTRY |
|
164 |
|
165 if (mOverriddenReturnValue.isNull() || mOverriddenReturnValue.value<int>() != KCntServicesReturnValueContactSaved) |
|
166 { |
|
167 mOverriddenReturnValue = retValue; |
|
168 } |
|
169 |
|
170 CNT_EXIT |
|
171 } |
|
172 |
150 // end of file |
173 // end of file |