summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp19
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.h3
2 files changed, 10 insertions, 12 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 8bb7a93..c0ad246 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -58,2 +58,4 @@ namespace OpieTooth {
btDevice = 0;
+ bluezactive = false;
+ bluezDiscoveryActive = false;
@@ -102,3 +104,3 @@ namespace OpieTooth {
/* Refresh active state */
- timerEvent(NULL);
+ timerEvent( 0 );
@@ -130,3 +132,3 @@ namespace OpieTooth {
setBluezStatus(0);
- timerEvent(NULL);
+ timerEvent( 0 );
break;
@@ -134,3 +136,3 @@ namespace OpieTooth {
setBluezStatus(1);
- timerEvent(NULL);
+ timerEvent( 0 );
break;
@@ -139,3 +141,3 @@ namespace OpieTooth {
launchManager();
- timerEvent(NULL);
+ timerEvent( 0 );
break;
@@ -143,3 +145,3 @@ namespace OpieTooth {
setBluezDiscoveryStatus(0);
- timerEvent(NULL);
+ timerEvent( 0 );
break;
@@ -147,3 +149,3 @@ namespace OpieTooth {
setBluezDiscoveryStatus(1);
- timerEvent(NULL);
+ timerEvent(0 );
break;
@@ -153,3 +155,2 @@ namespace OpieTooth {
- timerEvent(NULL);
delete signal;
@@ -179,3 +180,3 @@ namespace OpieTooth {
if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) {
- paintEvent(NULL);
+ update();
}
@@ -191,4 +192,2 @@ namespace OpieTooth {
- p.eraseRect ( 0, 0, this->width(), this->height() );
-
if (bluezactive > 0) {
diff --git a/noncore/net/opietooth/applet/bluezapplet.h b/noncore/net/opietooth/applet/bluezapplet.h
index 6a8a00e..a8d91a5 100644
--- a/noncore/net/opietooth/applet/bluezapplet.h
+++ b/noncore/net/opietooth/applet/bluezapplet.h
@@ -56,3 +56,2 @@ public slots:
int setBluezDiscoveryStatus(int);
- int sockfd;
@@ -64,3 +63,3 @@ public slots:
bool bluezactive;
- int bluezDiscoveryActive;
+ bool bluezDiscoveryActive;