summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-25 22:02:49 (UTC)
committer mickeyl <mickeyl>2006-05-25 22:02:49 (UTC)
commit5e2d061e5396213efe57c8ad7751bb7e8812dccd (patch) (unidiff)
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 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#ifndef BATTERY_STATUS_H 20#ifndef BATTERY_STATUS_H
21#define BATTERY_STATUS_H 21#define BATTERY_STATUS_H
22 22
23#include <qframe.h> 23#include <qframe.h>
24 24
25class PowerStatus; 25class PowerStatus;
26 26
27class BatteryStatus : public QFrame 27class BatteryStatus : public QFrame
28{ 28{
29 Q_OBJECT 29 Q_OBJECT
30public: 30public:
31 BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 ); 31 BatteryStatus( const PowerStatus *s, QWidget *parent=0, WFlags f = 0 );
32 ~BatteryStatus(); 32 ~BatteryStatus();
33 void BatteryStatus::UpdateBatteryStatus(); 33 void UpdateBatteryStatus();
34 void updatePercent( int ); 34 void updatePercent( int );
35 QSize sizeHint() const; 35 QSize sizeHint() const;
36protected: 36protected:
37 void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height ); 37 void drawSegment( QPainter *p, const QRect &r, const QColor &topgrad, const QColor &botgrad, const QColor &highlight, int hightlight_height );
38 void paintEvent( QPaintEvent *pe ); 38 void paintEvent( QPaintEvent *pe );
39 bool BatteryStatus::getProcApmStatusIpaq(); 39 bool getProcApmStatusIpaq();
40 40
41private: 41private:
42 QString statusText() const; 42 QString statusText() const;
43 QString statusTextIpaq() const; 43 QString statusTextIpaq() const;
44 const PowerStatus *ps; 44 const PowerStatus *ps;
45 int percent; 45 int percent;
46 int ipaqPercent; 46 int ipaqPercent;
47 int jackPercent; 47 int jackPercent;
48 int jackMinutes; 48 int jackMinutes;
49 QString perc1; 49 QString perc1;
50 QString sec1; 50 QString sec1;
51 QString perc2; 51 QString perc2;
52 QString sec2; 52 QString sec2;
53 QString ipaqStatus; 53 QString ipaqStatus;
54 QString jackStatus; 54 QString jackStatus;
55 QString ipaqChem; 55 QString ipaqChem;
56 QString jackChem; 56 QString jackChem;
57 bool bat2; 57 bool bat2;
58 bool bat2inserted; 58 bool bat2inserted;
59 int screenWidth; 59 int screenWidth;
60 int screenHeight; 60 int screenHeight;
61}; 61};
62 62
63#endif 63#endif
64 64