Diffstat (limited to 'noncore/applets/memoryapplet/memorymeter.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/applets/memoryapplet/memorymeter.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp index 54b5c52..9299f49 100644 --- a/noncore/applets/memoryapplet/memorymeter.cpp +++ b/noncore/applets/memoryapplet/memorymeter.cpp | |||
@@ -17,18 +17,16 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include "memorymeter.h" | 20 | #include "memorymeter.h" |
21 | #include "memorystatus.h" | 21 | #include "memorystatus.h" |
22 | 22 | ||
23 | #include <opie2/otaskbarapplet.h> | ||
23 | #include <qtopia/power.h> | 24 | #include <qtopia/power.h> |
24 | #include <qtopia/config.h> | 25 | #include <qtopia/config.h> |
25 | |||
26 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | ||
27 | #include <qtopia/qcopenvelope_qws.h> | 26 | #include <qtopia/qcopenvelope_qws.h> |
28 | #endif | ||
29 | 27 | ||
30 | #include <qpainter.h> | 28 | #include <qpainter.h> |
31 | #include <qtimer.h> | 29 | #include <qtimer.h> |
32 | #include <qapplication.h> | 30 | #include <qapplication.h> |
33 | 31 | ||
34 | #include <qtopia/applnk.h> | 32 | #include <qtopia/applnk.h> |
@@ -63,12 +61,17 @@ MemoryMeter::MemoryMeter( QWidget *parent ) | |||
63 | 61 | ||
64 | MemoryMeter::~MemoryMeter() | 62 | MemoryMeter::~MemoryMeter() |
65 | { | 63 | { |
66 | delete (QWidget *) memoryView; | 64 | delete (QWidget *) memoryView; |
67 | } | 65 | } |
68 | 66 | ||
67 | int MemoryMeter::position() | ||
68 | { | ||
69 | return 7; | ||
70 | } | ||
71 | |||
69 | QSize MemoryMeter::sizeHint() const | 72 | QSize MemoryMeter::sizeHint() const |
70 | { | 73 | { |
71 | return QSize(10, AppLnk::smallIconSize()); | 74 | return QSize(10, AppLnk::smallIconSize()); |
72 | } | 75 | } |
73 | 76 | ||
74 | bool MemoryMeter::updateMemoryViewGeometry() | 77 | bool MemoryMeter::updateMemoryViewGeometry() |
@@ -234,6 +237,11 @@ void MemoryMeter::paintEvent( QPaintEvent* ) | |||
234 | 237 | ||
235 | p.setBrush(darkc); | 238 | p.setBrush(darkc); |
236 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); | 239 | p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); |
237 | } | 240 | } |
238 | } | 241 | } |
239 | 242 | ||
243 | Q_EXPORT_INTERFACE() | ||
244 | { | ||
245 | Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> ); | ||
246 | } | ||
247 | |||