Use of bat2 bool uninitialized (when on zaurus) resulted

in display of "Charging both devices" which confused users.

@@ -15,7 +15,7 @@
 using namespace Opie;

 BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
-  : QWidget( parent, 0, WDestructiveClose), ps(p) {
+  : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
   setCaption( tr("Battery status") );
   QPushButton *pb = new QPushButton( tr("Close"), this );
   pb->move( 70, 250 );

1 files changed, 1 insertions, 1 deletions

diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp
index 28d6275..7d3bdd9 100644
--- a/core/applets/batteryapplet/batterystatus.cpp
+++ b/core/applets/batteryapplet/batterystatus.cpp
@@ -1,146 +1,146 @@
 
 #include "batterystatus.h"
 
 #include <qpe/power.h>
 
 #include <opie/odevice.h>
 
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qdrawutil.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 
 using namespace Opie;
 
 BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent )
-  : QWidget( parent, 0, WDestructiveClose), ps(p) {
+  : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) {
   setCaption( tr("Battery status") );
   QPushButton *pb = new QPushButton( tr("Close"), this );
   pb->move( 70, 250 );
   pb->setMaximumHeight(20);
   pb->show();
   if ( ODevice::inst ( )-> series ( ) == Model_iPAQ ) {
       getProcApmStatusIpaq();
   }
   connect( pb, SIGNAL( clicked() ), this, SLOT( close() ) );
   percent = ps->batteryPercentRemaining();
   show();
 }
 
 BatteryStatus::~BatteryStatus()
 {
 }
 
 /*
  * Make use of the advanced apm interface of the ipaq
  */
 bool BatteryStatus::getProcApmStatusIpaq() {
 
   bat2 = false;
 
   QFile procApmIpaq("/proc/hal/battery");
 
   if (procApmIpaq.open(IO_ReadOnly) ) {
     QStringList list;
     // since it is /proc we _must_ use QTextStream
     QTextStream stream ( &procApmIpaq);
     QString streamIn;
     streamIn = stream.read();
     list = QStringList::split("\n", streamIn);
 
     for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) {
       // 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);
         }
       }else if( (*line).startsWith(" Life") ){
         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;
       }else if( (*line).startsWith(" Status") ){
         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);
         }
       }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);
         }
       }
     }
   } else {
     QMessageBox::warning(this, tr("Failure"),tr("could not open file"));
   }
 
   procApmIpaq.close();
 
   jackPercent = perc2.toInt();
   ipaqPercent = perc1.toInt();
 
   if (perc2.isEmpty()) {
     perc2 = "no data";
   } else {
     perc2 += " %";
   }
 
 
   if (sec2 == "0" || sec2 == "" || sec2.isEmpty()) {
     sec2 = "no data";
   } else {
     sec2 += " min";
   }
 
   jackStatus == (" ( " + jackStatus + " )");
 
   return true;
 }
 
 
 void BatteryStatus::updatePercent( int pc ) {
   percent = pc;
   repaint(FALSE);
 }
 
 void BatteryStatus::drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ) {
   int h1, h2, s1, s2, v1, v2, ng = r.height(), hy = ng*30/100, hh = hightlight_height;
   topgrad.hsv( &h1, &s1, &v1 );
   botgrad.hsv( &h2, &s2, &v2 );
   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 ) );
     p->drawLine( r.x(), r.top()+hy-2-j, r.x()+r.width(), r.top()+hy-2-j );
   }
   for ( int j = 0; j < hh; j++ ) {
     p->setPen( highlight );
     p->drawLine( r.x(), r.top()+hy-2+j, r.x()+r.width(), r.top()+hy-2+j );
     }
   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 ) );
     p->drawLine( r.x(), r.top()+hy+hh-2+j, r.x()+r.width(), r.top()+hy+hh-2+j );
   }
 }
 
 void BatteryStatus::paintEvent( QPaintEvent * ) {
 
   QPainter p(this);
   QString text;
   if ( ps->batteryStatus() == PowerStatus::Charging ) {
         if (bat2) {
           text = tr("Charging both devices");
         } else {
           text = tr("Charging");
         }
   } else if ( ps->batteryPercentAccurate() ) {