cleanups

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
@@ -47,24 +47,26 @@
 #include <device.h>
 
 namespace OpieTooth {
 
     BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) {
         setFixedHeight( 18 );
         setFixedWidth( 14 );
         bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
         bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" );
         //    bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass" );
         startTimer(5000);
         btDevice = 0;
+        bluezactive = false;
+        bluezDiscoveryActive = false;
 
     }
 
     BluezApplet::~BluezApplet() {
     }
 
     bool BluezApplet::checkBluezStatus() {
         if (btDevice) {
             if (btDevice->isLoaded() ) {
                 return true;
             } else {
                 return false;
@@ -91,25 +93,25 @@ namespace OpieTooth {
     }
 
     int BluezApplet::setBluezDiscoveryStatus(int d) {
     }
 
     void BluezApplet::mousePressEvent( QMouseEvent *) {
 
         QPopupMenu *menu = new QPopupMenu();
         QPopupMenu *signal = new QPopupMenu();
         int ret=0;
 
         /* Refresh active state */
-        timerEvent(NULL);
+        timerEvent( 0 );
 
 
         if (bluezactive) {
             menu->insertItem( tr("Disable Bluetooth"), 0 );
         } else {
             menu->insertItem( tr("Enable Bluetooth"), 1 );
         }
 
         menu->insertItem( tr("Launch manager"), 2 );
 
         menu->insertSeparator(6);
         menu->insertItem( tr("Signal strength"), signal,  5);
@@ -119,48 +121,47 @@ namespace OpieTooth {
             menu->insertItem( tr("Disable discovery"), 3 );
         } else {
             menu->insertItem( tr("Enable discovery"), 4 );
         }
 
 
         QPoint p = mapToGlobal( QPoint(1, -menu->sizeHint().height()-1) );
         ret = menu->exec(p, 0);
 
         switch(ret) {
         case 0:
             setBluezStatus(0);
-            timerEvent(NULL);
+            timerEvent( 0 );
             break;
         case 1:
             setBluezStatus(1);
-            timerEvent(NULL);
+            timerEvent( 0 );
             break;
         case 2:
             // start bluetoothmanager
             launchManager();
-            timerEvent(NULL);
+            timerEvent( 0 );
             break;
         case 3:
             setBluezDiscoveryStatus(0);
-            timerEvent(NULL);
+            timerEvent( 0 );
             break;
         case 4:
             setBluezDiscoveryStatus(1);
-            timerEvent(NULL);
+            timerEvent(0 );
             break;
             //case 7:
             // With table of currently-detected devices.
         }
 
-        timerEvent(NULL);
         delete signal;
         delete menu;
     }
 
 
 /**
  * Launches the bluetooth manager
  */
     void BluezApplet::launchManager() {
         QCopEnvelope e("QPE/System", "execute(QString)");
         e << QString("bluetooth-manager");
     }
@@ -168,37 +169,35 @@ namespace OpieTooth {
 /**
  * Refresh timer
  * @param the timer event
  */
     void BluezApplet::timerEvent( QTimerEvent * ) {
         bool oldactive = bluezactive;
         int olddiscovery = bluezDiscoveryActive;
 
         bluezactive = checkBluezStatus();
         bluezDiscoveryActive = checkBluezDiscoveryStatus();
 
         if ((bluezactive != oldactive) || (bluezDiscoveryActive != olddiscovery)) {
-            paintEvent(NULL);
+            update();
         }
     }
 
 /**
  * Implementation of the paint event
  * @param the QPaintEvent
  */
     void BluezApplet::paintEvent( QPaintEvent* ) {
         QPainter p(this);
         qDebug("paint bluetooth pixmap");
 
-        p.eraseRect ( 0, 0, this->width(), this->height() );
-
         if (bluezactive > 0) {
             p.drawPixmap( 0, 1,  bluezOnPixmap );
         } else {
             p.drawPixmap( 0, 1,  bluezOffPixmap );
         }
 
         if (bluezDiscoveryActive > 0) {
             p.drawPixmap( 0, 1,  bluezDiscoveryOnPixmap );
         }
     }
 };
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
@@ -45,31 +45,30 @@ namespace OpieTooth {
     protected:
         void timerEvent(QTimerEvent *te );
 
 public slots:
     private:
         void mousePressEvent( QMouseEvent * );
         void paintEvent( QPaintEvent* );
         void launchManager();
         bool checkBluezStatus();
         int setBluezStatus(int);
         int checkBluezDiscoveryStatus();
         int setBluezDiscoveryStatus(int);
-        int sockfd;
 
     private:
         Device* btDevice;
         QPixmap bluezOnPixmap;
         QPixmap bluezOffPixmap;
         QPixmap bluezDiscoveryOnPixmap;
         bool bluezactive;
-        int bluezDiscoveryActive;
+        bool bluezDiscoveryActive;
 
 private slots:
 
 
     };
 };
 
 
 #endif