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

1 files changed, 10 insertions, 13 deletions

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
@@ -21,2 +21,4 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
   setCaption( tr("Battery status") );
+  setMinimumSize( 150, 200 );
+
   QPushButton *pb = new QPushButton( tr("Close"), this );
@@ -26,4 +28,3 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
 
-  pb->setMaximumHeight(40);
-  pb->setMaximumWidth( 120 );
+  pb->setMaximumSize( 120, 40 );
 
@@ -31,3 +32,3 @@ BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
 
-  layout->addStretch( 0 );
+  layout->addStretch();
   layout->addWidget( pb );
@@ -81,5 +82,5 @@ bool BatteryStatus::getProcApmStatusIpaq() {
 	if (bat2 == true) {
-	  jackStatus = (*line).mid((*line).find('(')+1., (*line).find(')')-(*line).find('(')-1);
+      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);
 	}
@@ -148,6 +149,2 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
 
-
-    int screenWidth = qApp->desktop()->width();
-    int screenHeight = qApp->desktop()->height();
-
   QPainter p(this);
@@ -215,5 +212,5 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
 
-  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 );
@@ -242,3 +239,3 @@ void BatteryStatus::paintEvent( QPaintEvent * ) {
 
-      int jackPerc =  ( jackPercent / 100.0 ) * ( screenWidth - 47 ) ;
+      int jackPerc =  ( jackPercent / 100 ) * ( width() - 47 ) ;