author | harlekin <harlekin> | 2002-06-23 20:07:29 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-23 20:07:29 (UTC) |
commit | 7b861d2f14bdb50558863354522dee7c7a9ef34d (patch) (unidiff) | |
tree | bb7633ab55e6564f47e9fd16321fa5841c055671 /noncore/net/opietooth/manager | |
parent | ed7e4fe3f0f838957c0830b8357d2252327dc938 (diff) | |
download | opie-7b861d2f14bdb50558863354522dee7c7a9ef34d.zip opie-7b861d2f14bdb50558863354522dee7c7a9ef34d.tar.gz opie-7b861d2f14bdb50558863354522dee7c7a9ef34d.tar.bz2 |
update
Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 8 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btlistitem.cpp | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btlistitem.h | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 |
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 | |||
@@ -61,8 +61,9 @@ namespace OpieTooth { | |||
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 | ||
@@ -400,6 +401,9 @@ namespace OpieTooth { | |||
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 | */ |
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 | |||
@@ -27,8 +27,6 @@ class QCheckBox; | |||
27 | 27 | ||
28 | namespace OpieTooth { | 28 | namespace OpieTooth { |
29 | 29 | ||
30 | |||
31 | |||
32 | class BlueBase : public BluetoothBase { | 30 | class BlueBase : public BluetoothBase { |
33 | Q_OBJECT | 31 | Q_OBJECT |
34 | 32 | ||
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 | |||
@@ -15,16 +15,19 @@ namespace OpieTooth { | |||
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 | |||
@@ -6,10 +6,8 @@ | |||
6 | namespace OpieTooth { | 6 | namespace 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 | ||
@@ -18,7 +16,7 @@ namespace OpieTooth { | |||
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,8 +1,8 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on debug | 2 | CONFIG = qt warn_on debug |
3 | #CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | HEADERS = bluebase.h scandialog.h | 4 | HEADERS = bluebase.h scandialog.h btlistitem.h |
5 | SOURCES = main.cpp bluebase.cpp scandialog.cpp | 5 | SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 7 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |