From 7b861d2f14bdb50558863354522dee7c7a9ef34d Mon Sep 17 00:00:00 2001 From: harlekin Date: Sun, 23 Jun 2002 20:07:29 +0000 Subject: update --- 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 { connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), 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 @@ -400,6 +401,9 @@ 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 @@ -27,8 +27,6 @@ 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 @@ -15,16 +15,19 @@ 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); } BTListItem::~BTListItem() { } -} +}; 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 @@ namespace OpieTooth { class BTListItem : public QListViewItem { - Q_OBJECT public: - BTListItem( QListView * parent ); BTListItem( QListViewItem * parent ); @@ -18,7 +16,7 @@ namespace OpieTooth { BTListItem( QListViewItem * parent , QString, QString , QString ); ~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 @@ -1,8 +1,8 @@ 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 DEPENDPATH += $(OPIEDIR)/include -- cgit v0.9.0.2