summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-08 17:58:50 (UTC)
committer zecke <zecke>2002-07-08 17:58:50 (UTC)
commit35d0ca5cc59b82af7b7ddb343ec092c3171b11ef (patch) (side-by-side diff)
tree8a7dac4bef44014c262c4b5549697229cbecc084
parent078242aa3182fa98582a4881767f3aa1ff22b165 (diff)
downloadopie-35d0ca5cc59b82af7b7ddb343ec092c3171b11ef.zip
opie-35d0ca5cc59b82af7b7ddb343ec092c3171b11ef.tar.gz
opie-35d0ca5cc59b82af7b7ddb343ec092c3171b11ef.tar.bz2
fix memleaks
fix possible crashes clean up
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp162
-rw-r--r--noncore/net/opietooth/manager/bluebase.h28
2 files changed, 81 insertions, 109 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 2001db1..ff6981b 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -41,38 +41,38 @@
#include <qpe/resource.h>
#include <qpe/config.h>
#include <remotedevice.h>
#include <services.h>
-namespace OpieTooth {
+using namespace OpieTooth;
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
: BluetoothBase( parent, name, fl ) {
- localDevice = new Manager( "hci0" );
+ m_localDevice = new Manager( "hci0" );
connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
// not good since lib is async
// connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
// this, SLOT( addServicesToDevice( QListViewItem * ) ) );
connect( ListView2, SIGNAL( clicked( QListViewItem* )),
this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
- connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
+ connect( m_localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
- connect( localDevice, SIGNAL( available( const QString&, bool ) ),
+ connect( m_localDevice, SIGNAL( available( const QString&, bool ) ),
this, SLOT( deviceActive( const QString& , bool ) ) );
- connect( localDevice, SIGNAL( connections( Connection::ValueList ) ),
+ connect( m_localDevice, SIGNAL( connections( Connection::ValueList ) ),
this, SLOT( addConnectedDevices( Connection::ValueList ) ) );
//Load all icons needed
- offPix = Resource::loadPixmap( "editdelete" );
- onPix = Resource::loadPixmap( "installed" );
+ m_offPix = Resource::loadPixmap( "editdelete" );
+ m_onPix = Resource::loadPixmap( "installed" );
QPalette pal = this->palette();
QColor col = pal.color( QPalette::Active, QColorGroup::Background );
pal.setColor( QPalette::Active, QColorGroup::Button, col );
pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
pal.setColor( QPalette::Normal, QColorGroup::Button, col );
@@ -85,101 +85,79 @@ namespace OpieTooth {
initGui();
//TESTING
ListView2->setRootIsDecorated(true);
BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
- topLV2->setPixmap( 1, onPix );
+ topLV2->setPixmap( 1, m_onPix );
(void) new BTListItem( topLV2, "Serial" ,"", "service" );
(void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
writeToHciConfig();
// search conncetions
addConnectedDevices();
- iconLoader = new BTIconLoader();
+ m_iconLoader = new BTIconLoader();
}
/**
* Reads all options from the config file
*/
void BlueBase::readConfig() {
Config cfg( "bluetoothmanager" );
cfg.setGroup( "bluezsettings" );
- deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
- defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
- useEncryption = cfg.readNumEntry( "useEncryption" , 1 );
- enableAuthentification = cfg.readNumEntry( "enableAuthentification" , 1 );
- enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 );
- enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 );
+ m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
+ m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
+ m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE );
+ m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE );
+ m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE );
+ m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE );
}
/**
* Writes all options to the config file
*/
void BlueBase::writeConfig() {
Config cfg( "bluetoothmanager" );
cfg.setGroup( "bluezsettings" );
- cfg.writeEntry( "name" , deviceName );
- cfg.writeEntryCrypt( "passkey" , defaultPasskey );
- cfg.writeEntry( "useEncryption" , useEncryption );
- cfg.writeEntry( "enableAuthentification" , enableAuthentification );
- cfg.writeEntry( "enablePagescan" , enablePagescan );
- cfg.writeEntry( "enableInquiryscan" , enableInquiryscan );
+ cfg.writeEntry( "name" , m_deviceName );
+ cfg.writeEntryCrypt( "passkey" , m_defaultPasskey );
+ cfg.writeEntry( "useEncryption" , m_useEncryption );
+ cfg.writeEntry( "enableAuthentification" , m_enableAuthentification );
+ cfg.writeEntry( "enablePagescan" , m_enablePagescan );
+ cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan );
writeToHciConfig();
}
void BlueBase::writeToHciConfig() {
- HciConfWrapper *hciconf = new HciConfWrapper( "/tmp/hcid.conf" );
- hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
+ HciConfWrapper hciconf ( "/tmp/hcid.conf" );
+ hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
// hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
- hciconf->setName( deviceName );
-
- if ( useEncryption == 1) {
- hciconf->setEncrypt( true );
- } else {
- hciconf->setEncrypt( false );
- }
-
-
- if ( enableAuthentification == 1) {
- hciconf->setAuth( true );
- } else {
- hciconf->setAuth( false );
- }
-
- if ( enablePagescan == 1) {
- hciconf->setPscan( true );
- } else {
- hciconf->setPscan( false );
- }
-
- if ( enableInquiryscan == 1) {
- hciconf->setIscan( true );
- } else {
- hciconf->setIscan( false );
- }
- delete hciconf;
+ hciconf.setName( m_deviceName );
+ hciconf.setEncrypt( m_useEncryption );
+ hciconf.setAuth( m_enableAuthentification );
+ hciconf.setPscan( m_enablePagescan );
+ hciconf.setIscan( m_enableInquiryscan );
}
/**
* Read the list of allready known devices
*
*/
void BlueBase::readSavedDevices() {
- QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
+ QValueList<RemoteDevice> loadedDevices;
QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/");
// list of .conf files
QStringList devicesFileList = deviceListSave.entryList();
// cut .conf of to get the mac and also read the name entry in it.
@@ -191,16 +169,16 @@ namespace OpieTooth {
qDebug((*it).latin1() );
Config conf((*it));
conf.setGroup("Info");
name = conf.readEntry("name", "Error");
qDebug("MAC: " + mac);
qDebug("NAME: " + name);
- RemoteDevice currentDevice = RemoteDevice( mac , name );
- loadedDevices->append( &currentDevice );
+ RemoteDevice currentDevice( mac , name );
+ loadedDevices.append( currentDevice );
}
- addSearchedDevices( *loadedDevices );
+ addSearchedDevices( loadedDevices );
}
/**
* Write the list of allready known devices
*
*/
@@ -218,88 +196,84 @@ namespace OpieTooth {
/**
* Set up the gui
*/
void BlueBase::initGui() {
- StatusLabel->setText( getStatus() ); // maybe move it to getStatus()
- cryptCheckBox->setChecked( useEncryption );
- authCheckBox->setChecked( enableAuthentification );
- pagescanCheckBox->setChecked( enablePagescan );
- inquiryscanCheckBox->setChecked( enableInquiryscan );
- deviceNameLine->setText( deviceName );
- passkeyLine->setText( defaultPasskey );
+ StatusLabel->setText( status() ); // maybe move it to getStatus()
+ cryptCheckBox->setChecked( m_useEncryption );
+ authCheckBox->setChecked( m_enableAuthentification );
+ pagescanCheckBox->setChecked( m_enablePagescan );
+ inquiryscanCheckBox->setChecked( m_enableInquiryscan );
+ deviceNameLine->setText( m_deviceName );
+ passkeyLine->setText( m_defaultPasskey );
// set info tab
setInfo();
}
/**
* Get the status informations and returns it
* @return QString the status informations gathered
*/
- QString BlueBase::getStatus(){
+ QString BlueBase::status()const{
QString infoString = tr( "<b>Device name : </b> Ipaq" );
infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
return (infoString);
}
/**
* Read the current values from the gui and invoke writeConfig()
*/
void BlueBase::applyConfigChanges() {
- deviceName = deviceNameLine->text();
- defaultPasskey = passkeyLine->text();
- useEncryption = cryptCheckBox->isChecked();
- enableAuthentification = authCheckBox->isChecked();
- enablePagescan = pagescanCheckBox->isChecked();
- enableInquiryscan = inquiryscanCheckBox->isChecked();
+ m_deviceName = deviceNameLine->text();
+ m_defaultPasskey = passkeyLine->text();
+ m_useEncryption = cryptCheckBox->isChecked();
+ m_enableAuthentification = authCheckBox->isChecked();
+ m_enablePagescan = pagescanCheckBox->isChecked();
+ m_enableInquiryscan = inquiryscanCheckBox->isChecked();
writeConfig();
- QMessageBox* box = new QMessageBox( this, "Test" );
- box->setText( tr( "Changes applied" ) );
- box->show();
+ QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
}
/**
* Add fresh found devices from scan dialog to the listing
*
*/
- void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
+ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
BTListItem * deviceItem;
- QListIterator<RemoteDevice> it( newDevices );
-
- for( ; it.current() ; ++it ) {
+ QValueList<RemoteDevice>::ConstIterator it;
- RemoteDevice *dev = it.current();
- deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" );
+ for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
+ deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" );
deviceItem->setExpandable ( true );
// look if device is avail. atm, async
- deviceActive( dev );
+ deviceActive( (*it) );
// ggf auch hier?
addServicesToDevice( deviceItem );
}
}
/**
* Action that is toggled on entrys on click
*/
- void BlueBase::startServiceActionClicked( QListViewItem *item ) {
+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 ) {
+void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) {
QPopupMenu *menu = new QPopupMenu();
int ret=0;
if ( ((BTListItem*)item)->type() == "device") {
@@ -352,17 +326,16 @@ namespace OpieTooth {
* Search and display avail. services for a device (on expand from device listing)
*
*/
void BlueBase::addServicesToDevice( BTListItem * item ) {
qDebug("addServicesToDevice");
// row of mac adress text(3)
- RemoteDevice *device = new RemoteDevice( item->mac(), item->name() );
- deviceList.insert( item->mac() , item );
+ RemoteDevice device( item->mac(), item->name() );
+ m_deviceList.insert( item->mac() , item );
// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
- localDevice->searchServices( *device );
- delete device;
+ m_localDevice->searchServices( device );
}
/**
* Overloaded. This one it the one that is connected to the foundServices signal
* @param device the mac address of the remote device
@@ -372,39 +345,39 @@ namespace OpieTooth {
qDebug("fill services list");
QMap<QString,BTListItem*>::Iterator it;
BTListItem* deviceItem = 0;
// get the right devices which requested the search
- for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
+ for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) {
if ( it.key() == device ) {
deviceItem = it.data();
}
}
QValueList<OpieTooth::Services>::Iterator it2;
BTListItem * serviceItem;
if (!servicesList.isEmpty() ) {
// add services
for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" );
- serviceItem->setPixmap( 0, iconLoader->serviceIcon( (*it2).classIdList() ) );
+ serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) );
}
} else {
serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" );
}
}
/**
* Add the existing connections (pairs) to the connections tab.
* This one triggers the search
*/
void BlueBase::addConnectedDevices() {
- localDevice->searchConnections();
+ m_localDevice->searchConnections();
}
void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) {
QValueList<OpieTooth::Connection>::Iterator it;
BTListItem * connectionItem;
@@ -422,15 +395,15 @@ namespace OpieTooth {
QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
}
/**
* Find out if a device can currently be reached
*/
- void BlueBase::deviceActive( RemoteDevice *device ) {
+ void BlueBase::deviceActive( const RemoteDevice &device ) {
// search by mac, async, gets a signal back
- localDevice->isAvailable( device->mac() );
+ m_localDevice->isAvailable( device.mac() );
}
/**
* The signal catcher. Set the avail. status on device.
* @param device - the mac address
* @param connected - if it is avail. or not
@@ -439,22 +412,22 @@ namespace OpieTooth {
qDebug("deviceActive slot");
QMap<QString,BTListItem*>::Iterator it;
BTListItem* deviceItem = 0;
// get the right devices which requested the search
- for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
+ for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) {
if ( it.key() == device ) {
deviceItem = it.data();
}
}
if ( connected ) {
- deviceItem->setPixmap( 1, onPix );
+ deviceItem->setPixmap( 1, m_onPix );
} else {
- deviceItem->setPixmap( 1, offPix );
+ deviceItem->setPixmap( 1, m_offPix );
}
}
/**
* Open the "scan for devices" dialog
*/
@@ -468,18 +441,17 @@ namespace OpieTooth {
/**
* Set the informations about the local device in information Tab
*/
void BlueBase::setInfo() {
- StatusLabel->setText( getStatus() );
+ StatusLabel->setText( status() );
}
/**
* Decontructor
*/
BlueBase::~BlueBase() {
writeSavedDevices();
- delete iconLoader;
- }
+ delete m_iconLoader;
}
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index ce0483f..73fac97 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -44,34 +44,34 @@ namespace OpieTooth {
private:
void readConfig();
void writeConfig();
void readSavedDevices();
void writeSavedDevices();
void writeToHciConfig();
- QString getStatus();
+ QString status()const;
void initGui();
void setInfo();
- Manager *localDevice;
- QMap<QString,BTListItem*> deviceList;
+ Manager *m_localDevice;
+ QMap<QString,BTListItem*> m_deviceList;
- void deviceActive( RemoteDevice *device );
+ void deviceActive( const RemoteDevice &device );
- QString deviceName;
- QString defaultPasskey;
- int useEncryption;
- int enableAuthentification;
- int enablePagescan;
- int enableInquiryscan;
+ QString m_deviceName;
+ QString m_defaultPasskey;
+ bool m_useEncryption;
+ bool m_enableAuthentification;
+ bool m_enablePagescan;
+ bool m_enableInquiryscan;
- QPixmap offPix;
- QPixmap onPix;
+ QPixmap m_offPix;
+ QPixmap m_onPix;
- BTIconLoader *iconLoader;
+ BTIconLoader *m_iconLoader;
private slots:
- void addSearchedDevices( QList<RemoteDevice> &newDevices );
+ void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
void addServicesToDevice( BTListItem *item );
void addServicesToDevice( const QString& device, Services::ValueList );
void addConnectedDevices();
void addConnectedDevices( Connection::ValueList );
void startServiceActionClicked( QListViewItem *item );
void startServiceActionHold( QListViewItem *, const QPoint &, int );