Fix size and drawing of battery status widget and eliminate compiler warnings

2 files changed, 40 insertions, 43 deletions

diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp
index 3b64fb5..9a9ddf6 100644
--- a/core/applets/batteryapplet/battery.cpp
+++ b/core/applets/batteryapplet/battery.cpp
@@ -71,5 +71,5 @@ void BatteryMeter::mousePressEvent( QMouseEvent* e )
 }
 
-void BatteryMeter::mouseReleaseEvent( QMouseEvent* e)
+void BatteryMeter::mouseReleaseEvent( QMouseEvent* /*e*/ )
 {
     if ( batteryView && batteryView->isVisible() ) {
@@ -111,9 +111,9 @@ void BatteryMeter::chargeTimeout()
     percent += 20;
     if ( percent > 100 )
-	percent = 0;
+    percent = 0;
 
     repaint(FALSE);
     if ( batteryView )
-	batteryView->updatePercent( percent );
+    batteryView->updatePercent( percent );
 }
 
@@ -155,5 +155,5 @@ void BatteryMeter::paintEvent( QPaintEvent* )
     p.setBrush(color);
 
-    int extra = ((percent * h) % 100)/(100/4);
+    //int extra = ((percent * h) % 100)/(100/4);
 
     int middle = w/2;
diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 64e0499..86b20e8 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -20,4 +20,6 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
   : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
   setCaption( tr("Battery status") );
+  setMinimumSize( 150, 200 );
+
   QPushButton *pb = new QPushButton( tr("Close"), this );
   QVBoxLayout *layout = new QVBoxLayout ( this );
@@ -25,10 +27,9 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
   jackPercent = 0;
 
-  pb->setMaximumHeight(40);
-  pb->setMaximumWidth( 120 );
+  pb->setMaximumSize( 120, 40 );
 
   pb->show();
 
-  layout->addStretch( 0 );
+  layout->addStretch();
   layout->addWidget( pb );
 
@@ -65,29 +66,29 @@ bool BatteryStatus::getProcApmStatusIpaq() {
       // not nice, need a rewrite later
       if( (*line).startsWith(" Percentage") ){
-    	if (bat2 == true) {
-	  perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
-	} else {
-	  perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
-	}
+        if (bat2 == true) {
+      perc2 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
+    } else {
+      perc1 = (*line).mid(((*line).find('('))+1,(*line).find(')')-(*line).find('(')-2);
+    }
       }else if( (*line).startsWith(" Life") ){
-	if (bat2 == true) {
-	  sec2 = (*line).mid(((*line).find(':')+2), 5 );
-	} else {
-	  sec1 = (*line).mid(((*line).find(':')+2), 5 );
-	}
+    if (bat2 == true) {
+      sec2 = (*line).mid(((*line).find(':')+2), 5 );
+    } else {
+      sec1 = (*line).mid(((*line).find(':')+2), 5 );
+    }
       }else if( (*line).startsWith("Battery #1") ){
-	bat2 = true;
+    bat2 = true;
       }else if( (*line).startsWith(" Status") ){
-	if (bat2 == true) {
-	  jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
+    if (bat2 == true) {
+      jackStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
         } else {
-	  ipaqStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
-	}
+      ipaqStatus = (*line).mid((*line).find('(')+1, (*line).find(')')-(*line).find('(')-1);
+    }
       }else if( (*line).startsWith(" Chemistry") ) {
-	if (bat2 == true) {
-	  jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
-	} else {
-	  ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
-	}
+    if (bat2 == true) {
+      jackChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
+    } else {
+      ipaqChem = (*line).mid((*line).find('('), (*line).find(')')-(*line).find('(')+1);
+    }
       }
     }
@@ -131,5 +132,5 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
   for ( int j = 0; j < hy-2; j++ ) {
     p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
-		       v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
+               v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
     p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j );
   }
@@ -140,5 +141,5 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
   for ( int j = 0; j < ng-hy-hh; j++ ) {
     p->setPen( QColor( h1 + ((h2-h1)*j)/(ng-1), s1 + ((s2-s1)*j)/(ng-1),
-		       v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
+               v1 + ((v2-v1)*j)/(ng-1),  QColor::Hsv ) );
     p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j );
   }
@@ -147,16 +148,12 @@ void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topg
 void BatteryStatus::paintEvent( QPaintEvent * ) {
 
-
-    int screenWidth = qApp->desktop()->width();
-    int screenHeight = qApp->desktop()->height();
-
   QPainter p(this);
   QString text;
   if ( ps->batteryStatus() == PowerStatus::Charging ) {
-	if (bat2) {
-	  text = tr("Charging both devices");
-	} else {
-	  text = tr("Charging");
-	}
+    if (bat2) {
+      text = tr("Charging both devices");
+    } else {
+      text = tr("Charging");
+    }
   } else if ( ps->batteryPercentAccurate() ) {
     text.sprintf( tr("Percentage battery remaining") + ": %i%%", percent );
@@ -191,5 +188,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
   if ( ps->batteryTimeRemaining() >= 0 ) {
     text.sprintf( tr("Battery time remaining") + ": %im %02is",
-		  ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
+          ps->batteryTimeRemaining() / 60, ps->batteryTimeRemaining() % 60 );
     p.drawText( 10, 130, text );
   }
@@ -214,7 +211,7 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
     return;
 
-  int rightEnd1 = screenWidth - 47;
-  int rightEnd2 = screenWidth - 35;
-  int percent2 = ( percent / 100.0 ) * rightEnd1 ;
+  int rightEnd1 = width() - 47;
+  int rightEnd2 = width() - 35;
+  int percent2 = ( percent / 100 ) * rightEnd1 ;
   p.setPen( black );
   qDrawShadePanel( &p,   9, 30, rightEnd1 , 39, colorGroup(), TRUE, 1, NULL);
@@ -241,5 +238,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
       }
 
-      int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
+      int jackPerc =  ( jackPercent / 100 ) * ( width() - 47 ) ;
 
       qDrawShadePanel( &p,   9, 160, rightEnd1, 39, colorGroup(), TRUE, 1, NULL);