--- a/contentstorage/caclient/s60/inc/cahandler.h	Fri Apr 16 15:16:09 2010 +0300
+++ b/contentstorage/caclient/s60/inc/cahandler.h	Mon May 03 12:48:45 2010 +0300
@@ -21,16 +21,17 @@
 #include <cadefs.h>
 #include <caclient_global.h>
 
-class CaEntry;
+class CCaInnerEntry;
 class QString;
 
-class CaHandler: public QObject
+class CaHandler
 {
-    Q_OBJECT
-    
 public:
-    virtual int execute(const CaEntry &entry,
+    virtual ~CaHandler() {}
+    virtual int execute(CCaInnerEntry &innerEntry,
                         const QString &commandName) = 0;
 };
 
+Q_DECLARE_INTERFACE(CaHandler, "com.nokia.homescreen.ICommandHandler")
+
 #endif