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 @@ -62,6 +62,7 @@ namespace OpieTooth { this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) ); connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ), - this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); - + this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); + // connect( localDevice, SIGNAL( available( const QString& device, bool connected ) ), + // this, SLOT() ); //Load all icons needed @@ -401,4 +402,7 @@ namespace OpieTooth { + + + /** * Open the "scan for devices" dialog 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 @@ -28,6 +28,4 @@ class QCheckBox; namespace OpieTooth { - - class BlueBase : public BluetoothBase { Q_OBJECT 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 @@ -16,11 +16,14 @@ namespace OpieTooth { // name, and then mac and then servicetype BTListItem::BTListItem( QListView * parent, QString name , QString mac, QString type ) - : QListViewItem( parent, name, mac, type ){ + : QListViewItem( parent, name ){ + setText(4, mac); + setText(5, type); } BTListItem::BTListItem( QListViewItem * parent , QString name, QString mac, QString type ) - : QListViewItem( parent, name, mac, type ){ - + : QListViewItem( parent, name ){ + setText(4, mac); + setText(5, type); } @@ -28,3 +31,3 @@ namespace OpieTooth { } -} +}; 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 @@ -7,8 +7,6 @@ namespace OpieTooth { class BTListItem : public QListViewItem { - Q_OBJECT public: - BTListItem( QListView * parent ); BTListItem( QListViewItem * parent ); @@ -19,6 +17,6 @@ namespace OpieTooth { ~BTListItem(); - } -} + }; +}; #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 @@ -2,6 +2,6 @@ TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = bluebase.h scandialog.h -SOURCES = main.cpp bluebase.cpp scandialog.cpp +HEADERS = bluebase.h scandialog.h btlistitem.h +SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |