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
@@ -59,21 +59,21 @@ namespace OpieTooth {
}
BluezApplet::~BluezApplet() {
}
- 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;
}
}
int BluezApplet::setBluezStatus(int c) {
if (c == 1) {
@@ -125,25 +125,30 @@ namespace OpieTooth {
QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
ret = menu->exec(p, 0);
switch(ret) {
case 0:
setBluezStatus(0);
+ timerEvent(NULL);
break;
case 1:
setBluezStatus(1);
+ timerEvent(NULL);
break;
case 2:
// start bluetoothmanager
launchManager();
+ timerEvent(NULL);
break;
case 3:
setBluezDiscoveryStatus(0);
+ timerEvent(NULL);
break;
case 4:
setBluezDiscoveryStatus(1);
+ timerEvent(NULL);
break;
//case 7:
// With table of currently-detected devices.
}
timerEvent(NULL);
@@ -162,13 +167,13 @@ namespace OpieTooth {
/**
* Refresh timer
* @param the timer event
*/
void BluezApplet::timerEvent( QTimerEvent * ) {
- int oldactive = bluezactive;
+ bool oldactive = bluezactive;
int olddiscovery = bluezDiscoveryActive;
bluezactive = checkBluezStatus();
bluezDiscoveryActive = checkBluezDiscoveryStatus();
if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) {
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
@@ -47,24 +47,24 @@ namespace OpieTooth {
public slots:
private:
void mousePressEvent( QMouseEvent * );
void paintEvent( QPaintEvent* );
void launchManager();
- int checkBluezStatus();
+ bool checkBluezStatus();
int setBluezStatus(int);
int checkBluezDiscoveryStatus();
int setBluezDiscoveryStatus(int);
int sockfd;
private:
Device* btDevice;
QPixmap bluezOnPixmap;
QPixmap bluezOffPixmap;
QPixmap bluezDiscoveryOnPixmap;
- int bluezactive;
+ bool bluezactive;
int bluezDiscoveryActive;
private slots:
};