--- a/contentstorage/cahandler/url/inc/caurlhandler.h	Thu May 27 13:11:12 2010 +0300
+++ b/contentstorage/cahandler/url/inc/caurlhandler.h	Fri Jun 11 13:58:37 2010 +0300
@@ -15,75 +15,26 @@
  *
  */
 
-#ifndef __CCAURLHANDLER_H__
-#define __CCAURLHANDLER_H__
-
-#include <e32base.h>
-
-class CCaInnerEntry;
+#ifndef CAURLHANDLER_H
+#define CAURLHANDLER_H
 
-// Constants
-const TUid KUidBrowser =
-    {
-    0x10008D39
-    };
-_LIT( KBrowserPrefix, "4 " );
-
-/**
- *  Command handler for url entries.
- *
- *  @lib caclient.lib
- */
-NONSHARABLE_CLASS( CCaUrlHandler ): public CBase
-    {
-
-public:
-    // construction
+#include "cahandler.h"
 
-    /**
-     * Destructor.
-     */
-    virtual ~CCaUrlHandler();
-
-    /**
-     * Two-phased constructor. Leaves on failure.
-     * @return The constructed object.
-     */
-    static CCaUrlHandler* NewL();
+class QString;
 
-protected:
-    // construction
-
-    /**
-     * Constructor.
-     * @param aMenu Menu.
-     */
-    CCaUrlHandler();
-
-    /**
-     * Second-phase constructor.
-     */
-    void ConstructL();
+class CaUrlHandler: public QObject, public CaHandler
+{
+    Q_OBJECT
+    Q_INTERFACES(CaHandler)
 
 public:
 
+    explicit CaUrlHandler(QObject *parent = 0);
 
-    /**
-     * Handle command.
-     * @param aEntry The url entry to be processed.
-     * @param aCommand Command.
-     */
-    void HandleCommandL( CCaInnerEntry& aEntry, const TDesC8& aCommand );
+    virtual ~CaUrlHandler();
 
-private:
-    // internal
+    int execute(const CaEntry &entry, const QString &command);
 
-    /**
-     * Launches the url.
-     * @param aUrl The url to be launched.
-     */
-    void LaunchUrlL( const TDesC& aUrl );
+};
 
-    };
-
-#endif // __CCAURLHANDLER_H__
+#endif // CAURLHANDLER_H