diff -r 91746b151f97 -r 997690c3397a bluetoothengine/btnotif/btdevicedialogplugin/inc/btmoredevicesdialogwidget.h --- a/bluetoothengine/btnotif/btdevicedialogplugin/inc/btmoredevicesdialogwidget.h Fri Jun 11 13:48:51 2010 +0300 +++ b/bluetoothengine/btnotif/btdevicedialogplugin/inc/btmoredevicesdialogwidget.h Wed Jun 23 18:23:52 2010 +0300 @@ -26,10 +26,9 @@ #include #include #include - +#include -class BTMoreDevicesDialogWidget : public HbDialog, - public HbDeviceDialogInterface +class BTMoreDevicesDialogWidget : public QObject, public HbDeviceDialogInterface { Q_OBJECT @@ -37,12 +36,12 @@ BTMoreDevicesDialogWidget(const QVariantMap ¶meters); ~BTMoreDevicesDialogWidget(); -public: // from HbDeviceDialogInterface +public: // from HbDeviceDialogInterface` bool setDeviceDialogParameters(const QVariantMap ¶meters); 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 ¶meters); - 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; /** *