author | harlekin <harlekin> | 2002-06-16 20:21:06 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-16 20:21:06 (UTC) |
commit | 5c098847f0fd716c4fe697e5eb314111a4ae5df1 (patch) (side-by-side diff) | |
tree | 590ed709442bf6ba4a28eb242840dcf1de6da756 /noncore/net/opietooth/manager | |
parent | 8dde6abcd14717bd362248c365fe140efe0f0386 (diff) | |
download | opie-5c098847f0fd716c4fe697e5eb314111a4ae5df1.zip opie-5c098847f0fd716c4fe697e5eb314111a4ae5df1.tar.gz opie-5c098847f0fd716c4fe697e5eb314111a4ae5df1.tar.bz2 |
remoteDevice not removeDevices
Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 3 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/scandialog.h | 4 |
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 @@ -1,36 +1,38 @@ #ifndef BLUEBASE_H #define BLUEBASE_H #include <qvariant.h> #include <qwidget.h> #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; class QTabWidget; class QCheckBox; namespace OpieTooth { class BlueBase : public BluetoothBase { Q_OBJECT public: BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BlueBase(); protected: private slots: 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 @@ -113,58 +113,57 @@ namespace OpieTooth { QCheckListItem *deviceItem2 = new QCheckListItem( ListView1, "Test1", QCheckListItem::CheckBox ); deviceItem2->setText(1, "BLAH" ); progressTimer(); // when finished, it emmite foundDevices() // checken ob initialisiert , qcop ans applet. localDevice->searchDevices(); } void ScanDialog::stopSearch() { } void ScanDialog::fillList(const QString& device, RemoteDevices::ValueList deviceList) { QCheckListItem * deviceItem; 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. */ void ScanDialog::emitToManager() { if (!ListView1) { return; } 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 ); } /* * Cleanup */ ScanDialog::~ScanDialog() { emitToManager(); delete localDevice; } } 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 @@ -1,62 +1,62 @@ /* main.cpp * * copyright : (c) 2002 by Maximilian Reiß * email : max.reiss@gmx.de * */ /*************************************************************************** * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #ifndef SCANDIALOG_H #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; class QListViewItem; class QPushButton; class QProgressBar; namespace OpieTooth { -#include <remotedevices.h> + class Manager; class Device; class ScanDialog : public QDialog { Q_OBJECT public: ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~ScanDialog(); QFrame* Frame7; QProgressBar* progress; QPushButton* StartButton; QPushButton* StopButton; QListView* ListView1; protected: QVBoxLayout* Layout11; private slots: void stopSearch(); void startSearch(); void progressTimer(); |