summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp3
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp2
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,13 +1,12 @@
/*
* 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 *
@@ -296,17 +295,17 @@ namespace OpieTooth {
}
/**
* 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());
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
@@ -142,25 +142,27 @@ namespace OpieTooth {
*/
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;