--- a/bluetoothengine/btnotif/btdevicedialogplugin/inc/btmoredevicesdialogwidget.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btnotif/btdevicedialogplugin/inc/btmoredevicesdialogwidget.h	Mon Jul 12 18:51:05 2010 +0300
@@ -16,8 +16,8 @@
  */
 
 
-#ifndef BTMOREDEVICESDIALOGWIDGET_H_
-#define BTMOREDEVICESDIALOGWIDGET_H_
+#ifndef BTMOREDEVICESDIALOGWIDGET_H
+#define BTMOREDEVICESDIALOGWIDGET_H
 
 #include <QObject>
 #include <QVariantMap>
@@ -26,10 +26,9 @@
 #include <hbpopup.h>
 #include <hbdocumentloader.h>
 #include <qstandarditemmodel.h>
-
+#include <hbaction.h>
 
-class BTMoreDevicesDialogWidget : public HbDialog,
-                                public HbDeviceDialogInterface
+class BTMoreDevicesDialogWidget : public QObject,  public HbDeviceDialogInterface
     {
     Q_OBJECT
     
@@ -37,12 +36,12 @@
     BTMoreDevicesDialogWidget(const QVariantMap &parameters);
     ~BTMoreDevicesDialogWidget();
     
-public: // from HbDeviceDialogInterface
+public: // from HbDeviceDialogInterface`
     bool setDeviceDialogParameters(const QVariantMap &parameters);
     int deviceDialogError() const;
     void closeDeviceDialog(bool byClient);
     HbPopup *deviceDialogWidget() const;
-  //  virtual QObject *signalSender() const;
+    virtual QObject *signalSender() const;
     
 public slots:
     void moreDevicesClicked();
@@ -52,8 +51,8 @@
     
 private:
     bool constructDialog(const QVariantMap &parameters);
-    void hideEvent(QHideEvent *event);
-    void showEvent(QShowEvent *event);
+ //   void hideEvent(QHideEvent *event);
+ //   void showEvent(QShowEvent *event);
     QIcon icon(/*QString deviceType*/);
     
 signals:
@@ -63,8 +62,9 @@
 private:
     HbDocumentLoader *mLoader;
     int              mDeviceDialogData;
-//    HbAction *mMoreAction;
-//    HbAction *mCancelAction;
+    HbDialog *mMoreDeviceDialog;
+    HbAction *mMoreAction;
+    HbAction *mCancelAction;
     
     /**
      * 
@@ -76,4 +76,4 @@
     Q_DISABLE_COPY(BTMoreDevicesDialogWidget)
     };
 
-#endif /* BTMOREDEVICESDIALOGWIDGET_H_ */
+#endif /* BTMOREDEVICESDIALOGWIDGET_H */