-rw-r--r-- | noncore/applets/memoryapplet/memorymeter.cpp | 6 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 1 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.h | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp index 9299f49..9cdeaf4 100644 --- a/noncore/applets/memoryapplet/memorymeter.cpp +++ b/noncore/applets/memoryapplet/memorymeter.cpp @@ -22,24 +22,25 @@ #include <opie2/otaskbarapplet.h> #include <qtopia/power.h> #include <qtopia/config.h> #include <qtopia/qcopenvelope_qws.h> #include <qpainter.h> #include <qtimer.h> #include <qapplication.h> #include <qtopia/applnk.h> +using namespace Opie::Ui; MemoryMeter::MemoryMeter( QWidget *parent ) : QWidget( parent ), memoryView(0) { bvsz = QSize(); if ( qApp->desktop()->height() >= 300 ) { memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); } else { memoryView = new MemoryStatus( 0 ); @@ -231,17 +232,14 @@ void MemoryMeter::paintEvent( QPaintEvent* ) p.setBrush(c); p.drawRect(batt_xoffset, unused_offset, band_width, unused_height); p.drawRect(batt_xoffset + 2 * band_width, unused_offset, band_width, unused_height); p.setBrush(lightc); p.drawRect(batt_xoffset + band_width, unused_offset, band_width, unused_height); p.setBrush(darkc); p.drawRect(batt_xoffset + 3 * band_width, unused_offset, band_width, unused_height); } } -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> ); -} +EXPORT_OPIE_APPLET_v1( MemoryMeter ) diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp index c01ba28..95ae06b 100644 --- a/noncore/applets/memoryapplet/memorystatus.cpp +++ b/noncore/applets/memoryapplet/memorystatus.cpp @@ -19,24 +19,25 @@ **********************************************************************/ #include "memorystatus.h" #include "../../settings/sysinfo/memory.h" #include "swapfile.h" #include <qpainter.h> #include <qpushbutton.h> #include <qdrawutil.h> #include <qlabel.h> #include <qlayout.h> +using namespace Opie::Ui; MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) : QFrame(parent, 0, f), mi(0), sf(0) { setCaption( tr("Memory Status") ); //resize( 220, 180 ); QVBoxLayout *lay = new QVBoxLayout( this ); tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); lay->addWidget( tab ); tab->addTab( mi = new MemoryInfo( tab ), "memory/memorytabicon", tr("Memory") ); tab->addTab( sf = new Swapfile( tab ), "memory/storagetabicon", tr("Swapfile") ); diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h index c3926db..d16787b 100644 --- a/noncore/applets/memoryapplet/memorystatus.h +++ b/noncore/applets/memoryapplet/memorystatus.h @@ -17,33 +17,33 @@ ** not clear to you. ** **********************************************************************/ #ifndef MEMORY_STATUS_H #define MEMORY_STATUS_H #include <qframe.h> #include <opie2/otabwidget.h> class MemoryInfo; class Swapfile; -using Opie::OTabWidget; + class MemoryStatus : public QFrame { Q_OBJECT public: MemoryStatus(QWidget *parent = 0, WFlags f = 0); ~MemoryStatus(); QSize sizeHint() const; MemoryInfo* mi; Swapfile* sf; int percent(); private: - OTabWidget *tab; + Opie::Ui::OTabWidget *tab; }; #endif |