--- a/connectivitymodules/SeCon/services/pcd/inc/sconsbeclient.h	Wed Jun 23 18:02:53 2010 +0300
+++ b/connectivitymodules/SeCon/services/pcd/inc/sconsbeclient.h	Tue Jul 06 14:06:02 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -33,11 +33,10 @@
     public:
         /**
          * Two-phase constructor
-         * @param aMaxObjectSize Max object size
          * @param aFs aReference to RFs connection.
          * @return CSConSBEClient instance
          */
-        static CSConSBEClient* NewL( const TInt aMaxObjectSize, RFs& aFs );
+        static CSConSBEClient* NewL( RFs& aFs );
         /**
          * Destructor
          * @return none
@@ -96,11 +95,10 @@
     private:
         /**
          * Constructor
-         * @paran aMaxObjectSize Max object size
          * @param aFs aReference to RFs connection.
          * @return none
          */
-        CSConSBEClient( const TInt aMaxObjectSize, RFs& aFs );
+        CSConSBEClient( RFs& aFs );
         
         /**
          * Implementation of CActive::DoCancel()
@@ -138,7 +136,12 @@
          * @return KErrNone if no erros. Else system wide error codes.
          */
         TInt ProcessRequestDataL();
-        /**
+		/**
+		 * Request data to iDataBuffer
+		 * @return none
+		 */
+		void RequestDataL( CSBGenericTransferType& aGenericTransferType );
+		/**
          * Executes GetDataOwnerStatus task
          * @return none
          */
@@ -153,7 +156,7 @@
          * @param aDrive Drive number as TInt
          * @return drive number as TDriveNumber
          */
-        TDriveNumber GetDriveNumber( const TInt& aDrive ) const;
+        TDriveNumber GetDriveNumber( TInt aDrive ) const;
         /**
          * Filters the drive list
          * @param aDriveList Drive list to be filtered
@@ -209,25 +212,20 @@
          * @param TDriveList drives to include
          * @return dataowner data size in specified drives
          */
-        TUint JavaDataSizeL( const TDesC& aJavaHash, const TDriveList& aDriveList ) const;
-        
-    private:
-        CSBEClient*                     iSBEClient;
-        TRequestStatus*                 iCallerStatus;
-        TBool                           iProcessComplete;
-        TInt                            iProcessIndex;
-        TInt                            iMaxObjectSize;
-        
-        CSConTask*                      iCurrentTask;
-        TInt                            iDataPos;
-        TBool                           iDataLeft;
-        TPtrC8                          iDataPtr;
-        TBool                           iLastChunk;
-        TBool                           iBURModeNormal;
-        TBool                           iRestoreMode;
-        RFs&                            iFs;
-        TBool                           iAllSnapshotsSuppliedCalled;
-    };
+         TUint JavaDataSizeL( const TDesC& aJavaHash, const TDriveList& aDriveList ) const;
+         
+	private:
+		CSBEClient*						iSBEClient;
+		TRequestStatus* 				iCallerStatus;
+		CSConTask*						iCurrentTask;
+		TBool							iBURModeNormal;
+		TBool                           iRestoreMode;
+		RFs&                            iFs;
+		TBool                           iAllSnapshotsSuppliedCalled;
+		TBool                           iLastChunk;
+		CBufFlat*                       iDataBuffer;
+		TInt                            iDataBufferSize;
+	};
 
 #endif