author | harlekin <harlekin> | 2002-07-21 20:02:13 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-21 20:02:13 (UTC) |
commit | 086b00610edfb25fb25cf54a0f8da8a16b55246a (patch) (unidiff) | |
tree | e16de393854040440ebc5ceeb6cbd48b27aff605 /noncore/net/opietooth/manager | |
parent | 8abe7e0604c930cbb46308febeec67d5bf70d255 (diff) | |
download | opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.zip opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.tar.gz opie-086b00610edfb25fb25cf54a0f8da8a16b55246a.tar.bz2 |
connection to popups on services
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 15 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btdeviceitem.h | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.h | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.h | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 5 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.cpp | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/stdpopups.h | 7 |
11 files changed, 39 insertions, 23 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index c81d4d1..ec05a95 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -287,2 +287,4 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { | |||
287 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { | 287 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { |
288 | if (!item ) | ||
289 | return; | ||
288 | 290 | ||
@@ -344,5 +346,5 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
344 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 346 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); |
345 | popup = m_popHelper.find( it.key(), | 347 | popup = m_popHelper.find( it.key() /*1*/, |
346 | service->services(), | 348 | service->services(), |
347 | service->parent() ); | 349 | (BTDeviceItem*)service->parent() ); |
348 | }else { | 350 | }else { |
@@ -361,9 +363,9 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
361 | ret = popup->exec( point ); | 363 | ret = popup->exec( point ); |
362 | 364 | qWarning("returned from exec() "); | |
363 | if ( ret == -1 ) | 365 | if ( ret == -1 ) |
364 | delete popup; | 366 | ; |
365 | else if ( ret == test1 ) | 367 | else if ( ret == test1 ) |
366 | delete popup; | 368 | ; |
367 | else if ( ret == con ) | 369 | else if ( ret == con ) |
368 | delete popup; | 370 | ; |
369 | else if ( ret == del ) { | 371 | else if ( ret == del ) { |
@@ -372,2 +374,3 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
372 | } | 374 | } |
375 | delete popup; | ||
373 | } | 376 | } |
diff --git a/noncore/net/opietooth/manager/btdeviceitem.h b/noncore/net/opietooth/manager/btdeviceitem.h index ae51483..e4c6ce7 100644 --- a/noncore/net/opietooth/manager/btdeviceitem.h +++ b/noncore/net/opietooth/manager/btdeviceitem.h | |||
@@ -1,4 +1,4 @@ | |||
1 | 1 | ||
2 | #ifndef OPIE_TOOTH_BT_DEVIVE_ITEM | 2 | #ifndef OPIE_TOOTH_BT_DEVICE_ITEM |
3 | #define OPIE_TOOTH_BT_DEVIVE_ITEM | 3 | #define OPIE_TOOTH_BT_DEVICE_ITEM |
4 | 4 | ||
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 762b028..121c069 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro | |||
@@ -9,3 +9,3 @@ HEADERS = btconnectionitem.h btdeviceitem.h \ | |||
9 | pppdialog.h obexdialog.h \ | 9 | pppdialog.h obexdialog.h \ |
10 | devicehandler.h | 10 | devicehandler.h rfcpopup.h |
11 | 11 | ||
@@ -17,3 +17,4 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ | |||
17 | bticonloader.cpp pppdialog.cpp \ | 17 | bticonloader.cpp pppdialog.cpp \ |
18 | obexdialog.cpp devicehandler.cpp | 18 | obexdialog.cpp devicehandler.cpp \ |
19 | rfcpopup.cpp | ||
19 | INCLUDEPATH += $(OPIEDIR)/include | 20 | INCLUDEPATH += $(OPIEDIR)/include |
diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index cb142eb..15973d4 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp | |||
@@ -14,2 +14,4 @@ | |||
14 | 14 | ||
15 | using namespace OpieTooth; | ||
16 | |||
15 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 17 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h index 1a73b57..28d2be2 100644 --- a/noncore/net/opietooth/manager/obexdialog.h +++ b/noncore/net/opietooth/manager/obexdialog.h | |||
@@ -12,2 +12,5 @@ class QLineEdit; | |||
12 | 12 | ||
13 | |||
14 | namespace OpieTooth { | ||
15 | |||
13 | class ObexDialog : public QDialog { | 16 | class ObexDialog : public QDialog { |
@@ -34,3 +37,3 @@ private: | |||
34 | }; | 37 | }; |
35 | 38 | } | |
36 | #endif | 39 | #endif |
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index ba91e04..4a4daf2 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -19,3 +19,3 @@ void PopupHelper::insert( int id, popupFactory fact ) { | |||
19 | 19 | ||
20 | QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { | 20 | QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) { |
21 | //qWarning("find"); | 21 | //qWarning("find"); |
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h index 7541ac5..6d4d413 100644 --- a/noncore/net/opietooth/manager/popuphelper.h +++ b/noncore/net/opietooth/manager/popuphelper.h | |||
@@ -11,3 +11,3 @@ | |||
11 | namespace OpieTooth { | 11 | namespace OpieTooth { |
12 | typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*); | 12 | typedef QPopupMenu* (*popupFactory)(const Services&, BTDeviceItem*); |
13 | typedef QMap<int, popupFactory> FactoryMap; | 13 | typedef QMap<int, popupFactory> FactoryMap; |
@@ -18,3 +18,3 @@ namespace OpieTooth { | |||
18 | void insert( int id, popupFactory fact ); | 18 | void insert( int id, popupFactory fact ); |
19 | QPopupMenu* find( int id, const Services&, QListViewItem* ); | 19 | QPopupMenu* find( int id, const Services&, BTDeviceItem* ); |
20 | private: | 20 | private: |
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 4d926a5..1f347ce 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp | |||
@@ -9,2 +9,4 @@ | |||
9 | 9 | ||
10 | using namespace OpieTooth; | ||
11 | |||
10 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 12 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h index b80b73d..6fdc90a 100644 --- a/noncore/net/opietooth/manager/pppdialog.h +++ b/noncore/net/opietooth/manager/pppdialog.h | |||
@@ -12,2 +12,5 @@ class QLineEdit; | |||
12 | 12 | ||
13 | |||
14 | namespace OpieTooth { | ||
15 | |||
13 | class PPPDialog : public QDialog { | 16 | class PPPDialog : public QDialog { |
@@ -20,3 +23,2 @@ public: | |||
20 | 23 | ||
21 | |||
22 | private slots: | 24 | private slots: |
@@ -33,2 +35,3 @@ private: | |||
33 | }; | 35 | }; |
36 | } | ||
34 | #endif | 37 | #endif |
diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp index 2290b9a..750365e 100644 --- a/noncore/net/opietooth/manager/stdpopups.cpp +++ b/noncore/net/opietooth/manager/stdpopups.cpp | |||
@@ -1,3 +1,3 @@ | |||
1 | 1 | ||
2 | //#include "rfccompopup.h" | 2 | #include "rfcpopup.h" |
3 | 3 | ||
@@ -7,10 +7,9 @@ extern "C" { | |||
7 | 7 | ||
8 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) { | 8 | QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, OpieTooth::BTDeviceItem* item ) { |
9 | // return OpieTooth::RfcComPopup( servive, item ); | 9 | return new OpieTooth::RfcCommPopup(/* servive, item*/ ); // fix spellin RfComm vs. RfcComm and paramaters |
10 | return 0l; | 10 | //return 0l; |
11 | } | 11 | } |
12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) { | 12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ) { |
13 | return 0l; | 13 | return 0l; |
14 | } | 14 | } |
15 | |||
16 | } | 15 | } |
diff --git a/noncore/net/opietooth/manager/stdpopups.h b/noncore/net/opietooth/manager/stdpopups.h index 185d68d..b57d4de 100644 --- a/noncore/net/opietooth/manager/stdpopups.h +++ b/noncore/net/opietooth/manager/stdpopups.h | |||
@@ -9,5 +9,8 @@ | |||
9 | 9 | ||
10 | #include "btdeviceitem.h" | ||
11 | |||
10 | extern "C" { | 12 | extern "C" { |
11 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, QListViewItem* ); | 13 | |
12 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ); | 14 | QPopupMenu* newRfcComPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); |
15 | QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* ); | ||
13 | } | 16 | } |