summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp8
-rw-r--r--noncore/net/opietooth/manager/bluebase.h2
-rw-r--r--noncore/net/opietooth/manager/btlistitem.cpp11
-rw-r--r--noncore/net/opietooth/manager/btlistitem.h6
-rw-r--r--noncore/net/opietooth/manager/manager.pro4
5 files changed, 17 insertions, 14 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 772dbd1..77eb62b 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -58,14 +58,15 @@ namespace OpieTooth {
58 // this, SLOT( addServicesToDevice( QListViewItem * ) ) ); 58 // this, SLOT( addServicesToDevice( QListViewItem * ) ) );
59 connect( ListView2, SIGNAL( clicked( QListViewItem* )), 59 connect( ListView2, SIGNAL( clicked( QListViewItem* )),
60 this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); 60 this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
61 connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), 61 connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
62 this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) ); 62 this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
63 connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ), 63 connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
64 this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); 64 this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
65 65 // connect( localDevice, SIGNAL( available( const QString& device, bool connected ) ),
66 // this, SLOT() );
66 67
67 //Load all icons needed 68 //Load all icons needed
68 69
69 offPix = Resource::loadPixmap( "editdelete" ); 70 offPix = Resource::loadPixmap( "editdelete" );
70 onPix = Resource::loadPixmap( "installed" ); 71 onPix = Resource::loadPixmap( "installed" );
71 72
@@ -397,12 +398,15 @@ namespace OpieTooth {
397 localDevice->isAvailable( device->mac() ); 398 localDevice->isAvailable( device->mac() );
398 399
399 return true; 400 return true;
400 } 401 }
401 402
402 403
404
405
406
403 /** 407 /**
404 * Open the "scan for devices" dialog 408 * Open the "scan for devices" dialog
405 */ 409 */
406 void BlueBase::startScan() { 410 void BlueBase::startScan() {
407 411
408 ScanDialog *scan = new ScanDialog( this, "", true); 412 ScanDialog *scan = new ScanDialog( this, "", true);
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index bc48bb3..dee721d 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -24,14 +24,12 @@ class QPushButton;
24class QTabWidget; 24class QTabWidget;
25class QCheckBox; 25class QCheckBox;
26 26
27 27
28namespace OpieTooth { 28namespace OpieTooth {
29 29
30
31
32 class BlueBase : public BluetoothBase { 30 class BlueBase : public BluetoothBase {
33 Q_OBJECT 31 Q_OBJECT
34 32
35 public: 33 public:
36 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); 34 BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
37 ~BlueBase(); 35 ~BlueBase();
diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp
index 4901710..19d1057 100644
--- a/noncore/net/opietooth/manager/btlistitem.cpp
+++ b/noncore/net/opietooth/manager/btlistitem.cpp
@@ -12,19 +12,22 @@ namespace OpieTooth {
12 12
13 } 13 }
14 14
15 15
16 // name, and then mac and then servicetype 16 // name, and then mac and then servicetype
17 BTListItem::BTListItem( QListView * parent, QString name , QString mac, QString type ) 17 BTListItem::BTListItem( QListView * parent, QString name , QString mac, QString type )
18 : QListViewItem( parent, name, mac, type ){ 18 : QListViewItem( parent, name ){
19 setText(4, mac);
20 setText(5, type);
19 21
20 } 22 }
21 23
22 BTListItem::BTListItem( QListViewItem * parent , QString name, QString mac, QString type ) 24 BTListItem::BTListItem( QListViewItem * parent , QString name, QString mac, QString type )
23 : QListViewItem( parent, name, mac, type ){ 25 : QListViewItem( parent, name ){
24 26 setText(4, mac);
27 setText(5, type);
25 } 28 }
26 29
27 BTListItem::~BTListItem() { 30 BTListItem::~BTListItem() {
28 } 31 }
29 32
30} 33};
diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h
index 28612b0..92b3803 100644
--- a/noncore/net/opietooth/manager/btlistitem.h
+++ b/noncore/net/opietooth/manager/btlistitem.h
@@ -3,22 +3,20 @@
3 3
4#include <qlistview.h> 4#include <qlistview.h>
5 5
6namespace OpieTooth { 6namespace OpieTooth {
7 7
8 class BTListItem : public QListViewItem { 8 class BTListItem : public QListViewItem {
9 Q_OBJECT
10 9
11 public: 10 public:
12
13 BTListItem( QListView * parent ); 11 BTListItem( QListView * parent );
14 BTListItem( QListViewItem * parent ); 12 BTListItem( QListViewItem * parent );
15 13
16 // name, and then mac and then servicetype 14 // name, and then mac and then servicetype
17 BTListItem( QListView * , QString, QString, QString ); 15 BTListItem( QListView * , QString, QString, QString );
18 BTListItem( QListViewItem * parent , QString, QString , QString ); 16 BTListItem( QListViewItem * parent , QString, QString , QString );
19 ~BTListItem(); 17 ~BTListItem();
20 18
21 } 19 };
22} 20};
23 21
24#endif 22#endif
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 1d86684..3754869 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,11 +1,11 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on debug 2CONFIG = qt warn_on debug
3#CONFIG = qt warn_on release 3#CONFIG = qt warn_on release
4HEADERS = bluebase.h scandialog.h 4HEADERS = bluebase.h scandialog.h btlistitem.h
5SOURCES = main.cpp bluebase.cpp scandialog.cpp 5SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp
6INCLUDEPATH += $(OPIEDIR)/include 6INCLUDEPATH += $(OPIEDIR)/include
7INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib 7INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib
8DEPENDPATH += $(OPIEDIR)/include 8DEPENDPATH += $(OPIEDIR)/include
9LIBS += -lqpe -lopietooth -lopie 9LIBS += -lqpe -lopietooth -lopie
10INTERFACES = bluetoothbase.ui devicedialog.ui 10INTERFACES = bluetoothbase.ui devicedialog.ui
11TARGET = $(OPIEDIR)/bin/bluetooth-manager 11TARGET = $(OPIEDIR)/bin/bluetooth-manager