--- a/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonebookoperationdelete.h	Wed Feb 17 13:58:55 2010 +0200
+++ b/adaptationlayer/tsy/nokiatsy_dll/inc/cmmphonebookoperationdelete.h	Wed Apr 21 14:29:55 2010 +0300
@@ -72,6 +72,11 @@
         ~CMmPhoneBookOperationDelete();
 
         /**
+        * By default Symbian OS constructor is private.
+        */
+        CMmPhoneBookOperationDelete();
+
+        /**
         * This method creates entry point to correct operation
         * @param aPhonebookType PhoneBook type
         * @param aIpc IPC
@@ -81,18 +86,7 @@
             TName aPhonebookType,
             TInt aIpc );
 
-  private:
-
-        /**
-        * By default Symbian OS constructor is private.
-        */
-        CMmPhoneBookOperationDelete();
-
-        /**
-        * Class attributes are created in ConstructL.
-        */
-        //void ConstructL();
-
+    protected:
         /**
         * Separates different IPC requests for each other.
         *
@@ -118,6 +112,8 @@
             const TDesC8& aFileData,
             TInt aTransId );
 
+    private:
+
         /**
         * Handles request to delete a phonebook entry
         * @return KErrNone or error value
@@ -151,6 +147,22 @@
         TInt HandleReadEntryResp( const TDesC8& aFileData );
 
         /**
+        * Handles Delete for phoenBook Entry
+        * @param aFileData File data
+        * @return KErrNone or error value
+        */
+        TInt HandleDeleteEntryResp(
+            TBool &aComplete,
+            TInt &aLocation );
+
+        /**
+        * Handles Deelte for phoenBook Entry Ext Data
+        * @param aFileData File data
+        * @return KErrNone or error value
+        */
+        TInt HandleDeleteExtResp();
+
+        /**
         * Creates and sends ISI message in order to read an extension
         * @return KErrNone or error value
         */
@@ -176,7 +188,7 @@
         * @param aFileData File data
         * @return KErrNone or error value
         */
-        TInt HandleWriteMBIReadResp(TInt aStatus, TUint8 aDetails, TBool &aComplete, const TDesC8& aFileData );
+        TInt HandleMBIReadResp(TInt aStatus, TUint8 aDetails, TBool &aComplete, const TDesC8& aFileData );
         
         /**
         * Creates request to Delete MBI profile
@@ -189,18 +201,17 @@
         // None
 
     protected:  // Data
-        // none
+        // Phone book entry to be deleted
+        CPhoneBookStoreEntry* iPhoneBookEntry;
+
+        // IPC number of operation
+        TInt iIpc;
 
     private:    // Data
 
        // Keep track on current delete phase
        TPBDeletePhases iCurrentDeletePhase;
 
-       // Phone book entry to be deleted
-       CPhoneBookStoreEntry* iPhoneBookEntry;
-
-       // IPC number of operation
-       TInt iIpc;
 
        // Number of entries
        TInt iNumOfEntries;