summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp15
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.h4
2 files changed, 12 insertions, 7 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 94e29c7..8bb7a93 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -64,11 +64,11 @@ namespace OpieTooth {
- int BluezApplet::checkBluezStatus() {
+ bool BluezApplet::checkBluezStatus() {
if (btDevice) {
if (btDevice->isLoaded() ) {
- return 1;
+ return true;
} else {
- return 0;
+ return false;
}
} else {
- return 0;
+ return false;
}
@@ -130,2 +130,3 @@ namespace OpieTooth {
setBluezStatus(0);
+ timerEvent(NULL);
break;
@@ -133,2 +134,3 @@ namespace OpieTooth {
setBluezStatus(1);
+ timerEvent(NULL);
break;
@@ -137,2 +139,3 @@ namespace OpieTooth {
launchManager();
+ timerEvent(NULL);
break;
@@ -140,2 +143,3 @@ namespace OpieTooth {
setBluezDiscoveryStatus(0);
+ timerEvent(NULL);
break;
@@ -143,2 +147,3 @@ namespace OpieTooth {
setBluezDiscoveryStatus(1);
+ timerEvent(NULL);
break;
@@ -167,3 +172,3 @@ namespace OpieTooth {
void BluezApplet::timerEvent( QTimerEvent * ) {
- int oldactive = bluezactive;
+ bool oldactive = bluezactive;
int olddiscovery = bluezDiscoveryActive;
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index da05a18..6a8a00e 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -52,3 +52,3 @@ public slots:
void launchManager();
- int checkBluezStatus();
+ bool checkBluezStatus();
int setBluezStatus(int);
@@ -63,3 +63,3 @@ public slots:
QPixmap bluezDiscoveryOnPixmap;
- int bluezactive;
+ bool bluezactive;
int bluezDiscoveryActive;