--- a/contentstorage/caclient/s60/inc/caclientproxy.h	Fri Mar 19 09:35:23 2010 +0200
+++ b/contentstorage/caclient/s60/inc/caclientproxy.h	Fri Apr 16 15:16:09 2010 +0300
@@ -19,14 +19,16 @@
 #define CACLIENTPROXY_H
 
 #include <QMutex>
+#include <QSharedPointer>
 
 // INCLUDES
 #include "cadef.h"
 #include "caclientsession.h"
 #include "canotifier.h"
+#include "cahandlerproxy.h"
 
 //FORWARD DECLARATIONS
-class CCaHandlerEngine;
+
 class CaClientNotifierProxy;
 class CaEntry;
 class CaQuery;
@@ -215,13 +217,6 @@
     void getEntryIdsL(const CaQuery &query,
                       QList<int> &sourceIdList);
 
-    /**
-     * Method for fetching entries. Symbian specific.
-     * @param entry entry
-     * @param command command.
-     */
-    void executeCommandL(const CaEntry &entry,
-                         const QString &command);
 
     /**
      * Touch.
@@ -240,9 +235,8 @@
     // Own.
     RCaClientSession mSession;
 
-    // Engine handler.
-    // Own.
-    CCaHandlerEngine *mHandler;
+    // Command handler.
+    QSharedPointer<CaHandlerProxy> mCommandHandler;
 
     // Mutex to serialize access to mSessions.
     QMutex mMutex;