summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-25 22:02:49 (UTC)
committer mickeyl <mickeyl>2006-05-25 22:02:49 (UTC)
commit5e2d061e5396213efe57c8ad7751bb7e8812dccd (patch) (side-by-side diff)
tree6c139ada699d4cb1db9b983a4e77d878c90089c4
parent0a37c2f7c92ca6b0b6357271b02fb871e0afcbdc (diff)
downloadopie-5e2d061e5396213efe57c8ad7751bb7e8812dccd.zip
opie-5e2d061e5396213efe57c8ad7751bb7e8812dccd.tar.gz
opie-5e2d061e5396213efe57c8ad7751bb7e8812dccd.tar.bz2
g++ 4.1 fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/batteryapplet/batterystatus.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/batteryapplet/batterystatus.h b/core/applets/batteryapplet/batterystatus.h
index 4da446d..bf8d75c 100644
--- a/core/applets/batteryapplet/batterystatus.h
+++ b/core/applets/batteryapplet/batterystatus.h
@@ -1,64 +1,64 @@
/**********************************************************************
** Copyright (C) 2000 Trolltech AS. All rights reserved.
**
** This file is part of Qtopia Environment.
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file.
**
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
** See http://www.trolltech.com/gpl/ for GPL licensing information.
**
** Contact info@trolltech.com if any conditions of this licensing are
** not clear to you.
**
**********************************************************************/
#ifndef BATTERY_STATUS_H
#define BATTERY_STATUS_H
#include <qframe.h>
class PowerStatus;
class BatteryStatus : public QFrame
{
Q_OBJECT
public:
BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 );
~BatteryStatus();
- void BatteryStatus::UpdateBatteryStatus();
+ void UpdateBatteryStatus();
void updatePercent( int );
QSize sizeHint() const;
protected:
void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height );
void paintEvent( QPaintEvent *pe );
- bool BatteryStatus::getProcApmStatusIpaq();
+ bool getProcApmStatusIpaq();
private:
QString statusText() const;
QString statusTextIpaq() const;
const PowerStatus *ps;
int percent;
int ipaqPercent;
int jackPercent;
int jackMinutes;
QString perc1;
QString sec1;
QString perc2;
QString sec2;
QString ipaqStatus;
QString jackStatus;
QString ipaqChem;
QString jackChem;
bool bat2;
bool bat2inserted;
int screenWidth;
int screenHeight;
};
#endif