remoteDevice part II

4 files changed, 23 insertions, 12 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 71da82e..c993c7c 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -34,6 +34,7 @@
 #include <qapplication.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
+#include <qlistview.h>
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
@@ -41,7 +42,8 @@
 
 namespace OpieTooth {
 
-    class RemoteDevices;
+
+    #include <remotedevice.h>
 
     BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl ) {
@@ -153,10 +155,19 @@ namespace OpieTooth {
 }
 
 
-    void BlueBase::addSearchedDevices( QList<RemoteDevices> &newDevices ) {
+    void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
+
+        QListViewItem * deviceItem;
+
+        QListIterator<RemoteDevice> it(newDevices);
 
+        for( ; it.current(); ++it ) {
 
 
+            RemoteDevice *dev = it.current();
+            deviceItem = new QListViewItem( ListView4, dev->name() );
+            deviceItem->setText(1, dev->mac() );
+        }
     }
 
 
@@ -165,8 +176,8 @@ namespace OpieTooth {
  */
     void BlueBase::startScan() {
         ScanDialog *scan = new ScanDialog( this, "", true);
-        QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevices>&) ),
-                         this, SLOT( addSearchedDevices(QList<RemoteDevices>& ) ));
+        QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ),
+                         this, SLOT( addSearchedDevices(QList<RemoteDevice>& ) ));
 
         scan->showMaximized();
     }
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 5364e51..c8ceed2 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -53,7 +53,7 @@ namespace OpieTooth {
 	int enableInquiryscan;
 
 	private slots:
-        void addSearchedDevices( QList<RemoteDevices> &newDevices );
+        void addSearchedDevices( QList<RemoteDevice> &newDevices );
       	void applyConfigChanges();
 
     };
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 8a7ea01..bd7d23c 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -124,11 +124,11 @@ namespace OpieTooth {
 
     }
 
-    void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) {
+    void ScanDialog::fillList(const QString& device, RemoteDevice::ValueList deviceList) {
 
         QCheckListItem * deviceItem;
 
-        RemoteDevices::ValueList::Iterator it;
+        RemoteDevice::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
 
             deviceItem = new QCheckListItem( ListView1, (*it).name() );
@@ -146,13 +146,13 @@ namespace OpieTooth {
             return;
         }
 
-        QList<RemoteDevices> *deviceList = new QList<RemoteDevices>;
+        QList<RemoteDevice> *deviceList = new QList<RemoteDevice>;
 
         QListViewItemIterator it( ListView1 );
         for ( ; it.current(); ++it ) {
             if ( ((QCheckListItem*)it.current())->isOn() ) {
-                RemoteDevices* device = new RemoteDevices(  it.current()->text(1), it.current()->text(0));
-                   deviceList->append( device );
+                RemoteDevice * device = new RemoteDevice(  it.current()->text(1), it.current()->text(0));
+                deviceList->append( device );
             }
         }
         emit selectedDevices( *deviceList );
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index 0ca302a..adc960c 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -60,7 +60,7 @@ class Device;
         void stopSearch();
         void startSearch();
           void progressTimer();
-        void fillList(const QString& device, RemoteDevices::ValueList list);
+        void fillList(const QString& device, RemoteDevice::ValueList list);
 
     private:
         void emitToManager();
@@ -68,7 +68,7 @@ class Device;
         int progressStat;
 
     signals:
-        void selectedDevices(QList<RemoteDevices>&);
+        void selectedDevices(QList<RemoteDevice>&);
     };