diff -r 625f43ae9362 -r 5ebadcda06cb btobexprofiles/obexreceiveservices/bip/inc/BIPController.h --- a/btobexprofiles/obexreceiveservices/bip/inc/BIPController.h Fri Aug 06 16:43:21 2010 +0300 +++ b/btobexprofiles/obexreceiveservices/bip/inc/BIPController.h Fri Sep 03 16:17:59 2010 +0300 @@ -30,7 +30,6 @@ #include #include #include "btengdevman.h" -#include #include #include @@ -58,8 +57,7 @@ * The main controller for Basic Imaging Profile. */ NONSHARABLE_CLASS (CBIPController): public CSrcsInterface, public MObexServerNotify, - public MObexUtilsPropertyNotifyHandler, - public MObexUtilsDialogObserver, + public MObexUtilsPropertyNotifyHandler, public MBTEngDevManObserver, public MHbDeviceDialogObserver { @@ -94,9 +92,6 @@ private: // from MBTEngDevManObserver void HandleGetDevicesComplete(TInt aErr, CBTDeviceArray* aDeviceArray); -private: //from MObexUtilsDialogObserver - void DialogDismissed(TInt aButtonId); - private: CBIPController(); void ConstructL(); @@ -118,6 +113,11 @@ TBool IsBackupRunning(); TBool ProcessExists( const TSecureId& aSecureId ); + void LaunchFailureDialogL(); + void LaunchMemoryFullDialogL(TInt aDrive); + void AddParamL(const TInt aKey, const TAny* aValue, + CHbSymbianVariant::TType aValueType, CHbSymbianVariantMap& aVariantMap); + private: void DataReceived(CHbSymbianVariantMap& aData); void DeviceDialogClosed(TInt aCompletionCode); @@ -161,13 +161,14 @@ TBTDeviceName iRemoteDeviceName; TFileName iReceivingFileName; TFileName iCenRepFolder; - CObexUtilsDialog* iDialog; CHbDeviceDialogSymbian* iProgressDialog; TBool iDialogActive; TInt iFileCount; + CHbDeviceDialogSymbian* iFailureDialog; TBool iReceivingFailed; CHbDeviceDialogSymbian* iRecvDoneDialog; TBool iShowRecvCompleteDialog; + CHbDeviceDialogSymbian* iMemoryFullDailog; }; _LIT(KBipPanicCategory, "BIP");