remoteDevice not removeDevices

3 files changed, 5 insertions, 4 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index ae5ce67..5364e51 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -7,12 +7,14 @@
 #include <qscrollview.h>
 #include <qsplitter.h>
 #include <qlist.h>
 
 #include "bluetoothbase.h"
 
+#include <remotedevice.h>
+
 class QVBox;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QPushButton;
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index 70ea77a..8a7ea01 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -131,13 +131,12 @@ namespace OpieTooth {
         RemoteDevices::ValueList::Iterator it;
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
 
             deviceItem = new QCheckListItem( ListView1, (*it).name() );
             deviceItem->setText(1, (*it).mac() );
         }
-
     }
 
 /*
  * Iterates trough the items, and collects the checked items.
  * Then it emits it, so the manager can connect to the signal to fill the listing.
  */
@@ -148,13 +147,13 @@ namespace OpieTooth {
         }
 
         QList<RemoteDevices> *deviceList = new QList<RemoteDevices>;
 
         QListViewItemIterator it( ListView1 );
         for ( ; it.current(); ++it ) {
-            if ( it.current()->isSelected() ) {
+            if ( ((QCheckListItem*)it.current())->isOn() ) {
                 RemoteDevices* device = new RemoteDevices(  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 4785a62..0ca302a 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -18,13 +18,13 @@
 #define SCANDIALOG_H
 
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qlist.h>
 
-
+#include <remotedevice.h>
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
 class QListView;
@@ -32,13 +32,13 @@ class QListViewItem;
 class QPushButton;
 class QProgressBar;
 
 
 namespace OpieTooth {
 
-#include <remotedevices.h>
+
 class Manager;
 class Device;
 
     class ScanDialog : public QDialog {
         Q_OBJECT