--- a/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.cpp	Fri May 14 17:24:44 2010 +0300
+++ b/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.cpp	Mon May 24 20:50:46 2010 +0300
@@ -15,14 +15,13 @@
 *
 */
 
-#include "hbactivityplugininterface.h"
 #include "hbactivityplugin.h"
 
 #include <qservicemanager.h>
 
 QTM_USE_NAMESPACE
 
-HbActivityPlugin::HbActivityPlugin(QObject *parent) : HbActivityPluginInterface(parent), mActivityClient(0)
+HbActivityPlugin::HbActivityPlugin(QObject *parent) : QObject(parent), mActivityClient(0)
 {
     QServiceManager serviceManager;
 

--- a/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.h	Fri May 14 17:24:44 2010 +0300
+++ b/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.h	Mon May 24 20:50:46 2010 +0300
@@ -18,9 +18,10 @@
 #ifndef HBACTIVITYPLUGIN_H
 #define HBACTIVITYPLUGIN_H
 
-#include "hbactivityplugininterface.h"
+#include <QObject>
+#include "hbactivityplugininterface_p.h"
 
-class HbActivityPlugin : public HbActivityPluginInterface
+class HbActivityPlugin : public QObject, public HbActivityPluginInterface
 {
     Q_OBJECT
     Q_INTERFACES(HbActivityPluginInterface)
@@ -38,6 +39,9 @@
     virtual bool waitActivity();
     virtual QVariantHash parseCommandLine(const QStringList &commandLineParams);
 
+signals:
+    void activityRequested(const QString &activityId);
+
 private:
     QObject *mActivityClient;
 

--- a/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.pro	Fri May 14 17:24:44 2010 +0300
+++ b/activityfw/orbitintegration/hbactivityplugin/hbactivityplugin.pro	Mon May 24 20:50:46 2010 +0300
@@ -22,7 +22,7 @@
 CONFIG += mobility
 MOBILITY = serviceframework
 
-HEADERS +=  hbactivityplugininterface.h \
+HEADERS +=  hbactivityplugininterface_p.h \
             hbactivityplugin.h \
 
 SOURCES +=  hbactivityplugin.cpp \

--- a/activityfw/orbitintegration/hbactivityplugin/hbactivityplugininterface.h	Fri May 14 17:24:44 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef HBACTIVITYPLUGININTERFACE_H
-#define HBACTIVITYPLUGININTERFACE_H
-
-#include <QtPlugin>
-#include <QObject>
-#include <QVariant>
-#include <QString>
-#include <QList>
-#include <QVariantHash>
-
-class HbActivityPluginInterface : public QObject
-{
-    Q_OBJECT
-
-public:
-    HbActivityPluginInterface(QObject *parent = 0) : QObject(parent) {}
-
-public:
-    virtual bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
-    virtual bool removeActivity(const QString &activityId) = 0;
-    virtual bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
-    virtual QList<QVariantHash> activities() = 0;
-    virtual QVariant activityData(const QString &activityId) = 0;
-    virtual bool waitActivity() = 0;
-    virtual QVariantHash parseCommandLine(const QStringList &commandLineParams) = 0;
-
-signals:
-    void activityRequested(const QString &activityId);
-
-};
-
-Q_DECLARE_INTERFACE(HbActivityPluginInterface, "HbActivityPluginInterface/1.0")
-
-#endif // HBACTIVITYPLUGININTERFACE_H

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/activityfw/orbitintegration/hbactivityplugin/hbactivityplugininterface_p.h	Mon May 24 20:50:46 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef HBACTIVITYPLUGININTERFACE_P_H
+#define HBACTIVITYPLUGININTERFACE_P_H
+
+#include <QtPlugin>
+#include <QVariant>
+#include <QString>
+#include <QList>
+#include <QVariantHash>
+
+class HbActivityPluginInterface
+{
+public:
+    virtual ~HbActivityPluginInterface() {}
+
+public:
+    virtual bool addActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
+    virtual bool removeActivity(const QString &activityId) = 0;
+    virtual bool updateActivity(const QString &activityId, const QVariant &data, const QVariantHash &parameters) = 0;
+    virtual QList<QVariantHash> activities() = 0;
+    virtual QVariant activityData(const QString &activityId) = 0;
+    virtual bool waitActivity() = 0;
+    virtual QVariantHash parseCommandLine(const QStringList &commandLineParams) = 0;
+
+signals:
+    // signal must be re-declared in the plugin implementation
+    void activityRequested(const QString &activityId);
+};
+
+Q_DECLARE_INTERFACE(HbActivityPluginInterface, "HbActivityPluginInterface/1.0")
+
+#endif // HBACTIVITYPLUGININTERFACE_P_H