| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 3 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/scandialog.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 4d476ac..22b16d2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -1,69 +1,68 @@ /* * bluebase.cpp * * --------------------- * - * begin : Sun 10 17:20:00 CEST 2002 * 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. * * * ***************************************************************************/ #include "bluebase.h" #include "scandialog.h" #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> #include <qvariant.h> #include <qwhatsthis.h> #include <qimage.h> #include <qpixmap.h> #include <qtabwidget.h> #include <qscrollview.h> #include <qvbox.h> #include <qmessagebox.h> #include <qapplication.h> #include <qcheckbox.h> #include <qlineedit.h> #include <qlistview.h> #include <qdir.h> #include <qpe/resource.h> #include <qpe/config.h> #include <remotedevice.h> namespace OpieTooth { BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) : BluetoothBase( parent, name, fl ) { QObject::connect( (QObject*)PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); QObject::connect( (QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); QObject::connect( (QObject*)ListView2, SIGNAL( expanded( QListViewItem * item ) ), this, SLOT( addServicesToDevice( QListViewItem * item ) ) ); QObject::connect( (QObject*)ListView2, SIGNAL( clicked( QListViewItem * )), this, SLOT( startServiceActionClicked( QListViewItem * item ) ) ); // // QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) ); //Load all icons needed QPixmap offPix = Resource::loadPixmap( "editdelete" ); QPixmap onPix = Resource::loadPixmap( "installed" ); QPalette pal = this->palette(); @@ -240,84 +239,84 @@ namespace OpieTooth { QListViewItem * deviceItem; QListIterator<RemoteDevice> it(newDevices); for( ; it.current(); ++it ) { RemoteDevice *dev = it.current(); deviceItem = new QListViewItem( ListView2, dev->name() ); if (deviceActive( dev ) ) { deviceItem->setPixmap(0, onPix); } else { deviceItem->setPixmap(0, offPix); } deviceItem->setText(1, dev->mac() ); } } /* * Action that is toggled on entrys on click */ void BlueBase::startServiceActionClicked( QListViewItem * item ) { } /* * Action that are toggled on hold (mostly QPopups i guess) */ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column) { } /* * Search and display avail. services for a device (on expand from device listing) * */ void BlueBase::addServicesToDevice( QListViewItem * item ) { // row of mac adress RemoteDevice *device = new RemoteDevice(item->text(1), item->text(0)); //dann nen manager und darauf dann searchServises, das liefert nen signal, das wieder connected // werden muss. // delete } /* * Find out if a device can currently be reached */ bool BlueBase::deviceActive( RemoteDevice *device ) { return true; } /** * Open the "scan for devices" dialog */ void BlueBase::startScan() { ScanDialog *scan = new ScanDialog( this, "", true); - QObject::connect((QObject*)scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ), + QObject::connect( scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ), this, SLOT( addSearchedDevices(QList<RemoteDevice>& ) )); scan->showMaximized(); } void BlueBase::setInfo() { StatusLabel->setText(getStatus()); } /** * Decontructor */ BlueBase::~BlueBase(){ writeSavedDevices(); } } diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp index bd7d23c..f8f7b15 100644 --- a/noncore/net/opietooth/manager/scandialog.cpp +++ b/noncore/net/opietooth/manager/scandialog.cpp @@ -86,84 +86,86 @@ namespace OpieTooth { Layout11->addWidget(progress); Layout11->addWidget( buttonFrame); localDevice = new Manager( "hci0" ); connect( (QObject*)StartButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); connect( (QObject*)StopButton, SIGNAL( clicked() ), this, SLOT( stopSearch() ) ); connect( (QObject*)localDevice, SIGNAL( foundDevices( const QString& , RemoteDevices::ValueList ) ), this, SLOT(fillList(const QString& , RemoteDevices::ValueList ) ) ) ; progressStat = 0; } // hack, make cleaner later void ScanDialog::progressTimer() { progressStat++; if (progressStat++ < 20) { QTimer::singleShot( 1000, this, SLOT(progressTimer() ) ); } progress->setProgress(progressStat++); } void ScanDialog::startSearch() { progress->setProgress(0); progressStat = 0; 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, RemoteDevice::ValueList deviceList) { QCheckListItem * deviceItem; RemoteDevice::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<RemoteDevice> *deviceList = new QList<RemoteDevice>; + deviceList->setAutoDelete(true); QListViewItemIterator it( ListView1 ); for ( ; it.current(); ++it ) { if ( ((QCheckListItem*)it.current())->isOn() ) { RemoteDevice * device = new RemoteDevice( it.current()->text(1), it.current()->text(0)); deviceList->append( device ); } } emit selectedDevices( *deviceList ); + delete deviceList; } /* * Cleanup */ ScanDialog::~ScanDialog() { emitToManager(); delete localDevice; } } |