summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp15
-rw-r--r--noncore/net/opietooth/manager/btdeviceitem.h4
-rw-r--r--noncore/net/opietooth/manager/manager.pro5
-rw-r--r--noncore/net/opietooth/manager/obexdialog.cpp2
-rw-r--r--noncore/net/opietooth/manager/obexdialog.h39
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp2
-rw-r--r--noncore/net/opietooth/manager/popuphelper.h4
-rw-r--r--noncore/net/opietooth/manager/pppdialog.cpp2
-rw-r--r--noncore/net/opietooth/manager/pppdialog.h35
-rw-r--r--noncore/net/opietooth/manager/stdpopups.cpp11
-rw-r--r--noncore/net/opietooth/manager/stdpopups.h7
11 files changed, 71 insertions, 55 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
@@ -285,6 +285,8 @@ void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
285 * Action that are toggled on hold (mostly QPopups i guess) 285 * Action that are toggled on hold (mostly QPopups i guess)
286 */ 286 */
287void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { 287void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
288 if (!item )
289 return;
288 290
289 QPopupMenu *menu = new QPopupMenu(); 291 QPopupMenu *menu = new QPopupMenu();
290 int ret=0; 292 int ret=0;
@@ -342,9 +344,9 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
342 QPopupMenu *popup =0l; 344 QPopupMenu *popup =0l;
343 if ( it != list.end() ) { 345 if ( it != list.end() ) {
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 {
349 qWarning("Empty"); 351 qWarning("Empty");
350 } 352 }
@@ -359,17 +361,18 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
359 int del = popup->insertItem( tr("delete"), 2); 361 int del = popup->insertItem( tr("delete"), 2);
360 362
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 ) {
370 // take item first? -zecke 372 // take item first? -zecke
371 delete item; 373 delete item;
372 } 374 }
375 delete popup;
373 } 376 }
374 delete menu; 377 delete menu;
375} 378}
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,6 +1,6 @@
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
5 5
6#include <remotedevice.h> 6#include <remotedevice.h>
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
@@ -7,7 +7,7 @@ HEADERS = btconnectionitem.h btdeviceitem.h \
7 scandialog.h btlistitem.h \ 7 scandialog.h btlistitem.h \
8 hciconfwrapper.h bticonloader.h \ 8 hciconfwrapper.h bticonloader.h \
9 pppdialog.h obexdialog.h \ 9 pppdialog.h obexdialog.h \
10 devicehandler.h 10 devicehandler.h rfcpopup.h
11 11
12SOURCES = btconnectionitem.cpp btdeviceitem.cpp \ 12SOURCES = btconnectionitem.cpp btdeviceitem.cpp \
13 btserviceitem.cpp stdpopups.cpp \ 13 btserviceitem.cpp stdpopups.cpp \
@@ -15,7 +15,8 @@ SOURCES = btconnectionitem.cpp btdeviceitem.cpp \
15 bluebase.cpp scandialog.cpp \ 15 bluebase.cpp scandialog.cpp \
16 btlistitem.cpp hciconfwrapper.cpp \ 16 btlistitem.cpp hciconfwrapper.cpp \
17 bticonloader.cpp pppdialog.cpp \ 17 bticonloader.cpp pppdialog.cpp \
18 obexdialog.cpp devicehandler.cpp 18 obexdialog.cpp devicehandler.cpp \
19 rfcpopup.cpp
19INCLUDEPATH += $(OPIEDIR)/include 20INCLUDEPATH += $(OPIEDIR)/include
20INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 21INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
21DEPENDPATH += $(OPIEDIR)/include 22DEPENDPATH += $(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
@@ -12,6 +12,8 @@
12#include <opie/oprocess.h> 12#include <opie/oprocess.h>
13#include <opie/ofiledialog.h> 13#include <opie/ofiledialog.h>
14 14
15using namespace OpieTooth;
16
15ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) 17ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device )
16 : QDialog( parent, name, modal, fl ) { 18 : QDialog( parent, name, modal, fl ) {
17 19
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
@@ -10,27 +10,30 @@ class QPushButton;
10class QMultiLineEdit; 10class QMultiLineEdit;
11class QLineEdit; 11class QLineEdit;
12 12
13class ObexDialog : public QDialog {
14 13
15 Q_OBJECT 14namespace OpieTooth {
16 15
17public: 16 class ObexDialog : public QDialog {
18 ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
19 ~ObexDialog();
20 17
18 Q_OBJECT
19
20 public:
21 ObexDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
22 ~ObexDialog();
21 23
22private slots:
23 void browse();
24 void sendData();
25
26protected:
27 QVBoxLayout* layout;
28 QLineEdit* cmdLine;
29 QLineEdit* chNameLine;
30 QPushButton* sendButton;
31private:
32 // Device that is used
33 QString m_device;
34};
35 24
25private slots:
26 void browse();
27 void sendData();
28
29 protected:
30 QVBoxLayout* layout;
31 QLineEdit* cmdLine;
32 QLineEdit* chNameLine;
33 QPushButton* sendButton;
34 private:
35 // Device that is used
36 QString m_device;
37 };
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
@@ -17,7 +17,7 @@ void PopupHelper::insert( int id, popupFactory fact ) {
17 m_map.insert(id, fact ); 17 m_map.insert(id, fact );
18} 18}
19 19
20QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { 20QPopupMenu* PopupHelper::find( int id, const Services& ser, BTDeviceItem* item ) {
21 //qWarning("find"); 21 //qWarning("find");
22 FactoryMap::Iterator it = m_map.find(id ); 22 FactoryMap::Iterator it = m_map.find(id );
23 if ( it != m_map.end() ) { 23 if ( it != m_map.end() ) {
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
@@ -9,14 +9,14 @@
9#include <services.h> 9#include <services.h>
10 10
11namespace OpieTooth { 11namespace 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;
14 class PopupHelper { 14 class PopupHelper {
15 public: 15 public:
16 PopupHelper(); 16 PopupHelper();
17 ~PopupHelper(); 17 ~PopupHelper();
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:
21 void init(); 21 void init();
22 FactoryMap m_map; 22 FactoryMap m_map;
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
@@ -7,6 +7,8 @@
7#include <qlabel.h> 7#include <qlabel.h>
8#include <opie/oprocess.h> 8#include <opie/oprocess.h>
9 9
10using namespace OpieTooth;
11
10PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) 12PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device )
11 : QDialog( parent, name, modal, fl ) { 13 : QDialog( parent, name, modal, fl ) {
12 14
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
@@ -10,25 +10,28 @@ class QPushButton;
10class QMultiLineEdit; 10class QMultiLineEdit;
11class QLineEdit; 11class QLineEdit;
12 12
13class PPPDialog : public QDialog {
14 13
15 Q_OBJECT 14namespace OpieTooth {
16 15
17public: 16 class PPPDialog : public QDialog {
18 PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
19 ~PPPDialog();
20 17
18 Q_OBJECT
21 19
22private slots: 20 public:
23 void connectToDevice(); 21 PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0, const QString& device = 0);
24 void fillOutPut( OProcess* pppDial, char* cha, int len ); 22 ~PPPDialog();
25protected:
26 QVBoxLayout* layout;
27 QLineEdit* cmdLine;
28 QPushButton* connectButton;
29 QMultiLineEdit* outPut;
30 23
31private: 24 private slots:
32 QString m_device; 25 void connectToDevice();
33}; 26 void fillOutPut( OProcess* pppDial, char* cha, int len );
27 protected:
28 QVBoxLayout* layout;
29 QLineEdit* cmdLine;
30 QPushButton* connectButton;
31 QMultiLineEdit* outPut;
32
33 private:
34 QString m_device;
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,16 +1,15 @@
1 1
2//#include "rfccompopup.h" 2#include "rfcpopup.h"
3 3
4#include "stdpopups.h" 4#include "stdpopups.h"
5 5
6extern "C" { 6extern "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
@@ -7,9 +7,12 @@
7 7
8#include <services.h> 8#include <services.h>
9 9
10#include "btdeviceitem.h"
11
10extern "C" { 12extern "C" {
11QPopupMenu* newRfcComPopup( const OpieTooth::Services&, QListViewItem* ); 13
12QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ); 14 QPopupMenu* newRfcComPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* );
15 QPopupMenu* newObexPushPopup( const OpieTooth::Services&, OpieTooth::BTDeviceItem* );
13} 16}
14 17
15#endif 18#endif