diff -r ad0f53516d84 -r b922b9936679 omads/omadsextensions/adapters/contacts/inc/NSmlContactsModsFetcher.h
--- a/omads/omadsextensions/adapters/contacts/inc/NSmlContactsModsFetcher.h	Fri Feb 19 22:40:37 2010 +0200
+++ b/omads/omadsextensions/adapters/contacts/inc/NSmlContactsModsFetcher.h	Fri Mar 12 15:41:30 2010 +0200
@@ -25,7 +25,7 @@
 #include <f32file.h>
 #include <cntdb.h>
 #include <cntitem.h>
-#include "nsmlchangefinder.h"
+#include <MContactsModsFetcher.h>
 
 #include <CVPbkContactManager.h>
 #include <MVPbkContactStore.h>
@@ -41,13 +41,15 @@
 _LIT( KNSmlContactSyncNoSync, "none" ); // Taken from phonebook
 
 // CLASS DECLARATION
+class CNSmlChangeFinder;
+class TNSmlSnapshotItem;
 
 // ------------------------------------------------------------------------------------------------
 // CNSmlContactsModsFetcher
 //
 // @lib nsmlcontactsdataprovider.lib
 // ------------------------------------------------------------------------------------------------
-class CNSmlContactsModsFetcher : public CActive,
+class CNSmlContactsModsFetcher : public CActive, public MContactsModsFetcher,
 								MVPbkContactViewObserver,
 								MVPbkSingleContactOperationObserver,
 								MVPbkContactOperationBase
@@ -68,12 +70,6 @@
 		void ConstructL();
 
 		/**
-		* Reads all modifications from clients contacts databse.
-		* @param		aStatus				On completion of the operation, contains the result code.
-		*/
-		void FetchModificationsL( TRequestStatus& aStatus );
-
-		/**
 		* ~CNSmlContactsModsFetcher() desctructor.
 		*/
 		virtual ~CNSmlContactsModsFetcher();
@@ -170,7 +166,20 @@
 		*						added to snapshot
 		*/
         void UpdateSnapshotL( MVPbkStoreContact* aContact );
-		
+
+    private: // from MContactsModsFetcher
+
+        /**
+        * Cancels the current asynchronous request
+        */
+        void CancelRequest( );
+
+        /**
+        * Reads all modifications from clients contacts databse.
+        * @param    aStatus   On completion of the operation, contains the result code.
+        */    
+        void FetchModificationsL( TRequestStatus& aStatus );
+
 	private: // data
 		TRequestStatus* iCallerStatus;
 		TTime iFromTime;