summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp20
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp2
2 files changed, 11 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 6328b59..7a92dc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -49,25 +49,25 @@ namespace OpieTooth {
: BluetoothBase( parent, name, fl ) {
localDevice = new Manager( "hci0" );
connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
- connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ),
- this, SLOT( addServicesToDevice( QListViewItem *item ) ) );
+ connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
+ this, SLOT( addServicesToDevice( QListViewItem * ) ) );
connect( ListView2, SIGNAL( clicked( QListViewItem* )),
- this, SLOT( startServiceActionClicked( QListViewItem *item ) ) );
- connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ),
- this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) );
+ this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
+ connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
+ this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
//Load all icons needed
- QPixmap offPix = Resource::loadPixmap( "editdelete" );
- QPixmap onPix = Resource::loadPixmap( "installed" );
+ offPix = Resource::loadPixmap( "editdelete" );
+ 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);
@@ -82,18 +82,18 @@ namespace OpieTooth {
//TESTING
ListView2->setRootIsDecorated(true);
QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
- topLV->setPixmap( 0, offPix );
+ topLV->setPixmap( 1, offPix );
// (void) new QListViewItem( topLV, "on" );
//(void) new QListViewItem( topLV, "off" );
QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
- topLV2->setPixmap( 0, onPix );
+ topLV2->setPixmap( 1, onPix );
(void) new QListViewItem( topLV2, "on" );
(void) new QListViewItem( topLV2, "off" );
}
@@ -254,13 +254,13 @@ namespace OpieTooth {
}
/*
* 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)
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index ec8df82..9520e73 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -98,13 +98,13 @@ namespace OpieTooth {
// hack, make cleaner later
void ScanDialog::progressTimer() {
progressStat++;
if (progressStat++ < 20) {
- QTimer::singleShot( 1000, this, SLOT(progressTimer() ) );
+ QTimer::singleShot( 2000, this, SLOT(progressTimer() ) );
}
progress->setProgress(progressStat++);
}
void ScanDialog::accept() {