# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1279211771 -10800 # Node ID 4af31167ea7790b3a6d7fc89ed94feefae7b7791 # Parent 490439ac0bd493e955c7060c38ab47715a1c36f4 Revision: 201024 Kit: 2010127 diff -r 490439ac0bd4 -r 4af31167ea77 devicediagnosticsfw/diagframework/src/diagpluginpoolimpl.cpp --- a/devicediagnosticsfw/diagframework/src/diagpluginpoolimpl.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/devicediagnosticsfw/diagframework/src/diagpluginpoolimpl.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -616,7 +616,10 @@ LOGSTRING2( "CDiagPluginPoolImpl::RunError %d", aError ) - return ResetAndNotify( aError ); + TInt err = ResetAndNotify( aError ); + LOGSTRING2( "CDiagPluginPoolImpl::RunError %d", err ) + + return KErrNone; } // End of File diff -r 490439ac0bd4 -r 4af31167ea77 devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp --- a/devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/devicediagnosticsfw/diagpluginbase/src/diagtestpluginbase.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -228,7 +228,7 @@ TRAP( aError, CompleteTestL( CDiagResultsDatabaseItem::EFailed ) ); } - return aError; + return KErrNone; } // --------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 devicediagnosticsfw/diagresultsdb/server/src/diagresultsdbstore.cpp --- a/devicediagnosticsfw/diagresultsdb/server/src/diagresultsdbstore.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/devicediagnosticsfw/diagresultsdb/server/src/diagresultsdbstore.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -146,7 +146,7 @@ } } - return err; + return KErrNone; } diff -r 490439ac0bd4 -r 4af31167ea77 fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp --- a/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -99,7 +99,7 @@ { FLOG(_L(" CFotaDownload::RunError err %d"), aError ); } - return aError; + return KErrNone; } diff -r 490439ac0bd4 -r 4af31167ea77 fotaapplication/fotaserver/fmserver/src/fmsinterruptaob.cpp --- a/fotaapplication/fotaserver/fmserver/src/fmsinterruptaob.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/fotaapplication/fotaserver/fmserver/src/fmsinterruptaob.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -582,7 +582,7 @@ TInt CFMSInterruptAob::RunError( TInt aError ) { FLOG( _L("CAOConnectionImpl::RunError: aError: %d"), aError ); - return aError; + return KErrNone; } diff -r 490439ac0bd4 -r 4af31167ea77 omaprovisioning/provisioning/ProvisioningEngine/Inc/CWPMultiContextManager.h --- a/omaprovisioning/provisioning/ProvisioningEngine/Inc/CWPMultiContextManager.h Mon Jun 21 16:37:58 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningEngine/Inc/CWPMultiContextManager.h Thu Jul 15 19:36:11 2010 +0300 @@ -66,6 +66,7 @@ protected: // From CActive void DoCancel(); void RunL(); + TInt RunError(TInt aError); public: // From MWPContextManager diff -r 490439ac0bd4 -r 4af31167ea77 omaprovisioning/provisioning/ProvisioningEngine/Src/CWPMultiContextManager.cpp --- a/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPMultiContextManager.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPMultiContextManager.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -788,6 +788,15 @@ IssueRequest(); } +// ---------------------------------------------------------------------------- +// CWPMultiContextManager::RunError +// ---------------------------------------------------------------------------- +TInt CWPMultiContextManager::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + + // ----------------------------------------------------------------------------- // CWPMultiContextManager::DoCancel // ----------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 omaprovisioning/provisioning/ProvisioningSC/Inc/CWPWimHandler.h --- a/omaprovisioning/provisioning/ProvisioningSC/Inc/CWPWimHandler.h Mon Jun 21 16:37:58 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningSC/Inc/CWPWimHandler.h Thu Jul 15 19:36:11 2010 +0300 @@ -76,6 +76,7 @@ protected: // from CActive void RunL(); + TInt RunError(TInt aError); void DoCancel(); diff -r 490439ac0bd4 -r 4af31167ea77 omaprovisioning/provisioning/ProvisioningSC/Src/CWPSimHandler.cpp --- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPSimHandler.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPSimHandler.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -173,6 +173,15 @@ } } +// ---------------------------------------------------------------------------- +// CWPWimHandler::RunError +// ---------------------------------------------------------------------------- +TInt CWPWimHandler::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + + // ----------------------------------------------------------------------------- // CWPWimHandler::DoCancel // Cancel active request diff -r 490439ac0bd4 -r 4af31167ea77 omaprovisioning/provisioning/ProvisioningSC/Src/CWPWimHandler.cpp --- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPWimHandler.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPWimHandler.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -230,6 +230,14 @@ } } +// ---------------------------------------------------------------------------- +// CWPWimHandler::RunError +// ---------------------------------------------------------------------------- +TInt CWPWimHandler::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + // ----------------------------------------------------------------------------- // CWPWimHandler::DoCancel // Cancel active request diff -r 490439ac0bd4 -r 4af31167ea77 policymanagement/dmutilserver/inc/DMUtilActiveObserver.h --- a/policymanagement/dmutilserver/inc/DMUtilActiveObserver.h Mon Jun 21 16:37:58 2010 +0300 +++ b/policymanagement/dmutilserver/inc/DMUtilActiveObserver.h Thu Jul 15 19:36:11 2010 +0300 @@ -43,6 +43,7 @@ virtual ~CActiveObserver(); protected: void RunL(); + TInt RunError(TInt aError); private: CActiveObserver( TPolicyManagementEventTypes aType); TUint32 SubscribeKey( TPolicyManagementEventTypes aType); diff -r 490439ac0bd4 -r 4af31167ea77 policymanagement/dmutilserver/src/DMUtilObserver.cpp --- a/policymanagement/dmutilserver/src/DMUtilObserver.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/policymanagement/dmutilserver/src/DMUtilObserver.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -291,6 +291,14 @@ iProperty.Subscribe( iStatus); } +// ---------------------------------------------------------------------------- +// CActiveObserver::RunError +// ---------------------------------------------------------------------------- +TInt CActiveObserver::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + // ----------------------------------------------------------------------------- // CActiveObserver::DoCancel // ----------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 policymanagement/policyengine/policyengineui/inc/PolicyEngineUi.h --- a/policymanagement/policyengine/policyengineui/inc/PolicyEngineUi.h Mon Jun 21 16:37:58 2010 +0300 +++ b/policymanagement/policyengine/policyengineui/inc/PolicyEngineUi.h Thu Jul 15 19:36:11 2010 +0300 @@ -104,6 +104,7 @@ void ActivateL( const TDesC8& aCorporate, const TDesC8& aRandomPart, CPolicyEngineNotifier* iNotifier); void RunL(); + TInt RunError(TInt aError); void DoCancel(); public: diff -r 490439ac0bd4 -r 4af31167ea77 policymanagement/policyengine/policyengineui/src/PolicyEngineUi.cpp --- a/policymanagement/policyengine/policyengineui/src/PolicyEngineUi.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/policymanagement/policyengine/policyengineui/src/PolicyEngineUi.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -337,7 +337,13 @@ User::RequestComplete( status, KErrNone); } - +// ---------------------------------------------------------------------------- +// CPolicyEngineUi::RunError +// ---------------------------------------------------------------------------- +TInt CPolicyEngineUi::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } void CPolicyEngineUi::DoCancel() { diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/http/inc/nsmldialiap.h --- a/syncmlfw/common/http/inc/nsmldialiap.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/http/inc/nsmldialiap.h Thu Jul 15 19:36:11 2010 +0300 @@ -47,6 +47,7 @@ private: void DoCancel(); void RunL(); + TInt RunError(TInt aError); private: TBool IsConnectedL() const; diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/http/src/nsmldialiap.cpp --- a/syncmlfw/common/http/src/nsmldialiap.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/http/src/nsmldialiap.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -182,6 +182,16 @@ User::RequestComplete( status, iStatus.Int() ); } } + +// ---------------------------------------------------------------------------- +// CNSmlDialUpAgent::RunError +// ---------------------------------------------------------------------------- +TInt CNSmlDialUpAgent::RunError ( TInt aError ) + { + DBG_FILE_CODE(aError, _S8("CNSmlDialUpAgent::RunError() The Error occurred is ")); + return KErrNone; + } + // --------------------------------------------------------- // CNSmlDialUpAgent::ConnectL( TUint aIAPid, TRequestStatus &aStatus ) // Opens data call handle diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h --- a/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/inc/Btobexsearcher.h Thu Jul 15 19:36:11 2010 +0300 @@ -68,6 +68,8 @@ CObexClient* CreateObexClientL(); void RunL(); + + TInt RunError(TInt aError); void DoCancel(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/inc/Irdaobexsearcher.h --- a/syncmlfw/common/obex/obexclient/inc/Irdaobexsearcher.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/inc/Irdaobexsearcher.h Thu Jul 15 19:36:11 2010 +0300 @@ -62,6 +62,8 @@ protected: // Functions from base classes void RunL(); + + TInt RunError(TInt aError); void DoCancel(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/inc/NSmlObexClient.h --- a/syncmlfw/common/obex/obexclient/inc/NSmlObexClient.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/inc/NSmlObexClient.h Thu Jul 15 19:36:11 2010 +0300 @@ -96,6 +96,7 @@ protected: // from CActive void DoCancel(); void RunL(); + TInt RunError(TInt aError); protected: //from MObexSearcherObserver void HandleDeviceFoundL(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp --- a/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/src/Btobexsearcher.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -179,6 +179,14 @@ } } +// ---------------------------------------------------------------------------- +// CBTObexSearcher::RunError +// ---------------------------------------------------------------------------- +TInt CBTObexSearcher::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + //---------------------------------------------------------------------------- // CBTObexSearcher::DoCancel() //---------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/src/Irdaobexsearcher.cpp --- a/syncmlfw/common/obex/obexclient/src/Irdaobexsearcher.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/src/Irdaobexsearcher.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -189,6 +189,15 @@ } } +// ---------------------------------------------------------------------------- +// CIrDAObexSearcher::RunError +// ---------------------------------------------------------------------------- +TInt CIrDAObexSearcher::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + + //---------------------------------------------------------------------------- // CIrDAObexSearcher::DoCancel() //---------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/obex/obexclient/src/NSmlObexClient.cpp --- a/syncmlfw/common/obex/obexclient/src/NSmlObexClient.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/obex/obexclient/src/NSmlObexClient.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -180,6 +180,15 @@ } } +// ---------------------------------------------------------------------------- +// CNsmlObexClient::RunError +// ---------------------------------------------------------------------------- +TInt CNsmlObexClient::RunError ( TInt aError ) + { + DBG_FILE_CODE(aError, _S8("CNsmlObexClient::RunError() The Error occurred is ")); + return KErrNone; + } + //------------------------------------------------------------ // CNsmlObexClient::ConnectL( TNSmlObexTransport aTransport, TBool /*aServerAlerted*/, TDesC8& aMimeType, TRequestStatus &aStatus ) //------------------------------------------------------------ diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver/inc/nsmlsosserver.h --- a/syncmlfw/common/sosserver/inc/nsmlsosserver.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver/inc/nsmlsosserver.h Thu Jul 15 19:36:11 2010 +0300 @@ -495,6 +495,7 @@ void ConstructL(); void RunL(); + TInt RunError(TInt aError); void DoCancel(); void BackUpModeL(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver/src/NSmlSOSBackup.cpp --- a/syncmlfw/common/sosserver/src/NSmlSOSBackup.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver/src/NSmlSOSBackup.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -126,6 +126,15 @@ _DBG_FILE("CNSmlSOSBackup::RunL() : End"); } +// ---------------------------------------------------------------------------- +// CNSmlSOSBackup::RunError +// ---------------------------------------------------------------------------- +TInt CNSmlSOSBackup::RunError ( TInt aError ) + { + DBG_FILE_CODE(aError, _S8("CNSmlSOSBackup::RunError() The Error occurred is ")); + return KErrNone; + } + // -------------------------------------------------------------------------- // void CNSmlSOSBackup::DoCancel() // -------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver_clientapi/inc/NSmlClientAPIActiveCallback.h --- a/syncmlfw/common/sosserver_clientapi/inc/NSmlClientAPIActiveCallback.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver_clientapi/inc/NSmlClientAPIActiveCallback.h Thu Jul 15 19:36:11 2010 +0300 @@ -67,6 +67,7 @@ // from CActive virtual void DoCancel(); virtual void RunL(); + virtual TInt RunError(TInt aError); private: void Request(); @@ -98,6 +99,7 @@ // from CActive virtual void DoCancel(); virtual void RunL(); + virtual TInt RunError(TInt aError); private: void Request(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver_clientapi/inc/NSmlClientContactSuiteAPIActiveCallback.h --- a/syncmlfw/common/sosserver_clientapi/inc/NSmlClientContactSuiteAPIActiveCallback.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver_clientapi/inc/NSmlClientContactSuiteAPIActiveCallback.h Thu Jul 15 19:36:11 2010 +0300 @@ -64,6 +64,7 @@ // from CActive virtual void DoCancel(); virtual void RunL(); + virtual TInt RunError(TInt aError); private: void Request(); diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver_clientapi/src/NSmlClientAPIActiveCallback.cpp --- a/syncmlfw/common/sosserver_clientapi/src/NSmlClientAPIActiveCallback.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver_clientapi/src/NSmlClientAPIActiveCallback.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -267,6 +267,14 @@ #endif } +// ---------------------------------------------------------------------------- +// CSmlActiveEventCallback::RunError +// ---------------------------------------------------------------------------- +TInt CSmlActiveEventCallback::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + // ----------------------------------------------------------------------------- // CSmlActiveEventCallback::Request() // Makes an event request to server. @@ -437,7 +445,15 @@ } #endif } - + +// ---------------------------------------------------------------------------- +// CSmlActiveProgressCallback::RunError +// ---------------------------------------------------------------------------- +TInt CSmlActiveProgressCallback::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + // ----------------------------------------------------------------------------- // CSmlActiveProgressCallback::Request() // Sends asynchronous progress event request to server. diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/common/sosserver_clientapi/src/NSmlClientContactSuiteAPIActiveCallback.cpp --- a/syncmlfw/common/sosserver_clientapi/src/NSmlClientContactSuiteAPIActiveCallback.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/common/sosserver_clientapi/src/NSmlClientContactSuiteAPIActiveCallback.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -154,7 +154,15 @@ } #endif } - + +// ---------------------------------------------------------------------------- +// CSmlActiveContactSuiteProgressCallback::RunError +// ---------------------------------------------------------------------------- +TInt CSmlActiveContactSuiteProgressCallback::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + // ----------------------------------------------------------------------------- // CSmlActiveContactSuiteProgressCallback::Request() // Sends asynchronous progress event request to server. diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp --- a/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/dm/dmnetworkmon/src/DMNetworkMon.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -165,7 +165,7 @@ TInt CDMNetworkMon::RunError ( TInt aError ) { DBG_FILE_CODE(aError, _S8("CDMNetworkMon::RunError() The Error occurred is ")); - return aError; + return KErrNone; } // ---------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldsasyncrequesthandler.h --- a/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldsasyncrequesthandler.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldsasyncrequesthandler.h Thu Jul 15 19:36:11 2010 +0300 @@ -249,7 +249,8 @@ private: // Functions from base classes virtual void DoCancel(); - virtual void RunL(); + virtual void RunL(); + TInt RunError ( TInt aError ); public: protected: diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldshostsessioncancel.h --- a/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldshostsessioncancel.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/inc/Nsmldshostsessioncancel.h Thu Jul 15 19:36:11 2010 +0300 @@ -59,6 +59,7 @@ //From CActive class void RunL(); void DoCancel(); + TInt RunError ( TInt aError ); private: MNSmlDsHostSessionCancelEventHandler* iHandler; diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/hostserver/dshostserverbase/src/NsmldschangedItemsFetcher.cpp --- a/syncmlfw/ds/hostserver/dshostserverbase/src/NsmldschangedItemsFetcher.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/src/NsmldschangedItemsFetcher.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -177,5 +177,12 @@ User::RequestComplete( rstatus, KErrNone ); } } - + +// ---------------------------------------------------------------------------- +// CNSmlDSChangedItemsFetcher::RunError +// ---------------------------------------------------------------------------- +TInt CNSmlDSChangedItemsFetcher::RunError ( TInt aError ) +{ + return KErrNone; +} // End of File diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsessioncancel.cpp --- a/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsessioncancel.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/hostserver/dshostserverbase/src/Nsmldshostsessioncancel.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -105,6 +105,14 @@ _DBG_FILE("CNSmlHostSessionCancel::RunL() : End"); } +// ---------------------------------------------------------------------------- +// CNSmlHostSessionCancel::RunError +// ---------------------------------------------------------------------------- +TInt CNSmlHostSessionCancel::RunError ( TInt aError ) +{ + return KErrNone; +} + // -------------------------------------------------------------------------- // void CNSmlHostSessionCancel::DoCancel() // -------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/netmon/src/CNetMon.cpp --- a/syncmlfw/ds/netmon/src/CNetMon.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/netmon/src/CNetMon.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -164,7 +164,7 @@ TInt CNetMon::RunError ( TInt aError ) { DBG_FILE_CODE(aError, _S8("CNetMon::RunError() The Error occurred is ")); - return aError; + return KErrNone; } // ---------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/ds/syncagent/src/nsmldsnetmon.cpp --- a/syncmlfw/ds/syncagent/src/nsmldsnetmon.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/ds/syncagent/src/nsmldsnetmon.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -138,7 +138,7 @@ // ---------------------------------------------------------------------------- TInt CNsmlDSNetmon::RunError ( TInt aError ) { - return aError; + return KErrNone; } // ---------------------------------------------------------------------------- diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h --- a/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/syncmlnotifier/inc/SyncMLAppLaunchNotifier.h Thu Jul 15 19:36:11 2010 +0300 @@ -150,8 +150,13 @@ * @param None. * @return None. */ - void RunL(); - + void RunL(); + /** + * From CSyncMLNotifierBase Gets called when RunL leaves. + * @param aError. + * @return TInt. + */ + TInt RunError(TInt aError); /** * From RConnectionMonitor gets the staus of roaming . * If roaming returns true else returns false diff -r 490439ac0bd4 -r 4af31167ea77 syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp --- a/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -536,6 +536,16 @@ FLOG(_L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunL() completed")); } +// ---------------------------------------------------------------------------- +// CSyncMLAppLaunchNotifier::RunError +// ---------------------------------------------------------------------------- +TInt CSyncMLAppLaunchNotifier::RunError ( TInt aError ) + { + FTRACE( FPrint( + _L("[SmlNotif]\t CSyncMLAppLaunchNotifier::RunError() The Error occurred is %d"), aError ) ); + return KErrNone; + } + // ----------------------------------------------------------------------------- // CSyncMLNotifierBase::SyncServiceL // ----------------------------------------------------------------------------- @@ -893,7 +903,7 @@ TInt CDMDisclaimerObserver::RunError(TInt aError) { FTRACE( FPrint( _L("[SmlNotif]\t CDMDisclaimerObserver::RunError() Error = %d"), aError ) ); - return aError; + return KErrNone; } // End of File diff -r 490439ac0bd4 -r 4af31167ea77 terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h --- a/terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h Mon Jun 21 16:37:58 2010 +0300 +++ b/terminalsecurity/SCP/SCPClient/inc/SCPLockObserver.h Thu Jul 15 19:36:11 2010 +0300 @@ -77,6 +77,7 @@ private: // from CActive /** @see CActive::RunL() */ void RunL(); + TInt RunError(TInt aError); /** @see CActive::DoCancel() */ void DoCancel(); private: // data diff -r 490439ac0bd4 -r 4af31167ea77 terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp --- a/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -208,6 +208,16 @@ Dprint(_L("[CSCPLockObserver]-> RunL() <<<")); } + +// ---------------------------------------------------------------------------- +// CSCPLockObserver::RunError +// ---------------------------------------------------------------------------- +TInt CSCPLockObserver::RunError ( TInt /*aError*/ ) + { + return KErrNone; + } + + // // ---------------------------------------------------------- // CSCPLockObserver::DoCancel() diff -r 490439ac0bd4 -r 4af31167ea77 terminalsecurity/SCP/SCPTimestampPlugin/src/SCPUserInf.cpp --- a/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPUserInf.cpp Mon Jun 21 16:37:58 2010 +0300 +++ b/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPUserInf.cpp Thu Jul 15 19:36:11 2010 +0300 @@ -159,7 +159,7 @@ } } -TInt CSCPUserInf::RunError(TInt aError) +TInt CSCPUserInf::RunError(TInt /*aError */) { - return aError; + return KErrNone; }