--- a/controlpanel/controlpanel_plat/inc/cpitemdatahelper.h	Thu Apr 01 03:17:51 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpitemdatahelper.h	Thu Apr 01 03:23:37 2010 +0800
@@ -17,10 +17,12 @@
 #ifndef CP_ITEM_DATA_HELPER_H
 #define CP_ITEM_DATA_HELPER_H
 
-#include <qobject>
+#include <QObject>
 #include <cpglobal.h>
 
 class QObject;
+class HbWidget;
+class QModelIndex;
 class HbDataForm;
 class HbAbstractViewItem;
 class HbDataFormModelItem;
@@ -30,33 +32,33 @@
 {
 	Q_OBJECT
 public:
-    CpItemDataHelper();
-    ~CpItemDataHelper();
+    explicit CpItemDataHelper(HbDataForm *form = 0);
+    virtual ~CpItemDataHelper();
 
-    void addConnection(HbDataFormModelItem *item,
-        const QString &signal,
-        QObject *receiver,
-        const QString &method);
-
-    void removeConnection(HbDataFormModelItem *item,
-        const QString &signal,
-        QObject *receiver,
-        const QString &method);
+	void bindToForm(HbDataForm *form);
 
 	void addItemPrototype(HbAbstractViewItem *prototype);
 
-	void bindToForm(HbDataForm *form) const;
+    void addConnection(HbDataFormModelItem *item,
+        const char *signal,
+        QObject *receiver,
+        const char *method);
+
+    void removeConnection(HbDataFormModelItem *item,
+        const char *signal,
+        QObject *receiver,
+        const char *method);
 
-signals:
-	void connectionAdded(HbDataFormModelItem *item,
-		const QString &signal,
-		QObject *receiver,
-		const QString &method);
-	void connectionRemoved(HbDataFormModelItem *item,
-		const QString &signal,
-		QObject *receiver,
-		const QString &method);
-	void prototypeAdded(HbAbstractViewItem *prototype);
+    void connectToForm(const char *signal,
+        QObject *receiver,
+        const char *method);
+
+    void disconnectFromForm(const char *signal,
+        QObject *receiver,
+        const char *method);
+
+    HbWidget *widgetFromModelIndex(const QModelIndex &index);
+   
 private:
     CpItemDataHelperPrivate *d;
 };