diff -r 19bd632b5100 -r b72428996822 bluetoothengine/btnotif/btdevicedialogplugin/inc/btdevicesearchdialogwidget.h
--- a/bluetoothengine/btnotif/btdevicedialogplugin/inc/btdevicesearchdialogwidget.h	Fri May 28 17:03:06 2010 +0300
+++ b/bluetoothengine/btnotif/btdevicedialogplugin/inc/btdevicesearchdialogwidget.h	Mon Jul 12 18:51:05 2010 +0300
@@ -28,8 +28,9 @@
 #include <qstandarditemmodel.h>
 #include <hbradiobuttonlist.h>
 #include <hblistwidget.h>
-#include <hbpushbutton.h>
 #include <hblabel.h>
+#include <hbaction.h>
+
 
 struct device
     {
@@ -38,7 +39,8 @@
     int     mDeviceIdx;
     };
 
-class BTDeviceSearchDialogWidget : public HbDialog,
+
+class BTDeviceSearchDialogWidget : public QObject,
                                 public HbDeviceDialogInterface
     {
     Q_OBJECT
@@ -52,6 +54,7 @@
     int deviceDialogError() const;
     void closeDeviceDialog(bool byClient);
     HbPopup *deviceDialogWidget() const;
+    virtual QObject *signalSender() const;
     
 public slots:
     void stopRetryClicked();
@@ -59,7 +62,8 @@
     void viewByClicked();
     void deviceSelected(const QModelIndex& modelIndex);
 //    void viewByItemSelected(int index);
-    void selectionDialogClosed(HbAction*);
+    void selectionDialogClosed(HbAction *action);
+    void searchDialogClosed(); 
     
 private:
     bool constructDialog(const QVariantMap &parameters);
@@ -87,8 +91,6 @@
     QList<QString>      mDeviceTypeList;
     QList<device>       mDeviceList;
     HbListView*         mListView;
-    HbPushButton*       mStopRetryBtn;
-    HbPushButton*       mViewByBtn;
     HbLabel*            mSearchLabel; 
     HbLabel*            mSearchIconLabel;
     HbLabel*            mSearchDoneLabel;
@@ -97,6 +99,11 @@
     int                 mDeviceLstIdx;
     int                 mSelectedType;
     int                 mDeviceDialogData;
+    HbDialog *mSearchDevicesDialog;
+    HbAction *mStopRetryAction;
+    HbAction *mViewByAction;
+
+    int mStopRetryFlag;
     
     Q_DISABLE_COPY(BTDeviceSearchDialogWidget)
     };