author | mickeyl <mickeyl> | 2004-03-01 14:31:39 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-03-01 14:31:39 (UTC) |
commit | 2fbfc7e166235805294b932949f9a24b063d2199 (patch) (side-by-side diff) | |
tree | 353ef0424c54f6443852863c87cdcbfeee696d1c /core | |
parent | 3cdec2fe5b3201a121cfbb2352162fe0cbae0a1d (diff) | |
download | opie-2fbfc7e166235805294b932949f9a24b063d2199.zip opie-2fbfc7e166235805294b932949f9a24b063d2199.tar.gz opie-2fbfc7e166235805294b932949f9a24b063d2199.tar.bz2 |
libopie1-->libopie2
-rw-r--r-- | core/applets/batteryapplet/battery.cpp | 13 | ||||
-rw-r--r-- | core/applets/batteryapplet/battery.h | 1 | ||||
-rw-r--r-- | core/applets/batteryapplet/batteryapplet.pro | 6 | ||||
-rw-r--r-- | core/applets/batteryapplet/batteryappletimpl.cpp | 65 | ||||
-rw-r--r-- | core/applets/batteryapplet/batteryappletimpl.h | 43 | ||||
-rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 5 |
6 files changed, 20 insertions, 113 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index 9a9ddf6..fed9b34 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -22,2 +22,4 @@ +/* OPIE */ +#include <opie2/otaskbarapplet.h> #include <qpe/applnk.h> @@ -27,2 +29,3 @@ +/* QT */ #include <qpainter.h> @@ -170 +173,11 @@ void BatteryMeter::paintEvent( QPaintEvent* ) +int BatteryMeter::position() +{ + return 8; +} + +Q_EXPORT_INTERFACE() +{ + Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> ); +} + diff --git a/core/applets/batteryapplet/battery.h b/core/applets/batteryapplet/battery.h index c2d1216..622c083 100644 --- a/core/applets/batteryapplet/battery.h +++ b/core/applets/batteryapplet/battery.h @@ -37,2 +37,3 @@ class BatteryMeter : public QWidget QSize sizeHint() const; + static int position(); diff --git a/core/applets/batteryapplet/batteryapplet.pro b/core/applets/batteryapplet/batteryapplet.pro index 2076987..d956aa0 100644 --- a/core/applets/batteryapplet/batteryapplet.pro +++ b/core/applets/batteryapplet/batteryapplet.pro @@ -2,4 +2,4 @@ TEMPLATE = lib CONFIG += qt plugin warn_on release -HEADERS = battery.h batterystatus.h batteryappletimpl.h -SOURCES = battery.cpp batterystatus.cpp batteryappletimpl.cpp +HEADERS = battery.h batterystatus.h +SOURCES = battery.cpp batterystatus.cpp TARGET = batteryapplet @@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include .. -LIBS += -lqpe -lopie +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 diff --git a/core/applets/batteryapplet/batteryappletimpl.cpp b/core/applets/batteryapplet/batteryappletimpl.cpp deleted file mode 100644 index 7cc5f50..0000000 --- a/core/applets/batteryapplet/batteryappletimpl.cpp +++ b/dev/null @@ -1,65 +0,0 @@ -/********************************************************************** -** 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. -** -**********************************************************************/ -#include "battery.h" -#include "batteryappletimpl.h" - - -BatteryAppletImpl::BatteryAppletImpl() - : battery(0) -{ -} - -BatteryAppletImpl::~BatteryAppletImpl() -{ - delete battery; -} - -QWidget *BatteryAppletImpl::applet( QWidget *parent ) -{ - if ( !battery ) - battery = new BatteryMeter( parent ); - return battery; -} - -int BatteryAppletImpl::position() const -{ - return 8; -} - -QRESULT BatteryAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) -{ - *iface = 0; - if ( uuid == IID_QUnknown ) - *iface = this; - else if ( uuid == IID_TaskbarApplet ) - *iface = this; - else - return QS_FALSE; - - if ( *iface ) - (*iface)->addRef(); - return QS_OK; -} - -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( BatteryAppletImpl ) -} - diff --git a/core/applets/batteryapplet/batteryappletimpl.h b/core/applets/batteryapplet/batteryappletimpl.h deleted file mode 100644 index 99654e3..0000000 --- a/core/applets/batteryapplet/batteryappletimpl.h +++ b/dev/null @@ -1,43 +0,0 @@ -/********************************************************************** -** 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 BATTERYAPPLETIMPL_H -#define BATTERYAPPLETIMPL_H - -#include <qpe/taskbarappletinterface.h> - -class BatteryMeter; - -class BatteryAppletImpl : public TaskbarAppletInterface -{ -public: - BatteryAppletImpl(); - virtual ~BatteryAppletImpl(); - - QRESULT queryInterface( const QUuid&, QUnknownInterface** ); - Q_REFCOUNT - - virtual QWidget *applet( QWidget *parent ); - virtual int position() const; - -private: - BatteryMeter *battery; -}; - -#endif diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index 86b20e8..b9ca7b5 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -3,6 +3,7 @@ +/* OPIE */ +#include <opie2/odevice.h> #include <qpe/power.h> -#include <opie/odevice.h> - +/* QT */ #include <qpainter.h> |