summaryrefslogtreecommitdiff
path: root/core/applets/clockapplet
Side-by-side diff
Diffstat (limited to 'core/applets/clockapplet') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp12
-rw-r--r--core/applets/clockapplet/clock.h1
-rw-r--r--core/applets/clockapplet/clockapplet.pro4
-rw-r--r--core/applets/clockapplet/clockappletimpl.cpp67
-rw-r--r--core/applets/clockapplet/clockappletimpl.h45
5 files changed, 15 insertions, 114 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index aadd9b6..9fead03 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -20,6 +20,7 @@
#include "clock.h"
+#include <opie2/otaskbarapplet.h>
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/config.h>
@@ -38,6 +39,11 @@ LauncherClock::LauncherClock( QWidget *parent ) : QLabel( parent )
show();
}
+int LauncherClock::position()
+{
+ return 10;
+}
+
void LauncherClock::readConfig() {
Config config( "qpe" );
config.setGroup( "Time" );
@@ -107,3 +113,9 @@ void LauncherClock::slotClockChanged( bool pm )
readConfig();
updateTime();
}
+
+Q_EXPORT_INTERFACE()
+{
+ Q_CREATE_INSTANCE( OTaskbarAppletWrapper<LauncherClock> );
+}
+
diff --git a/core/applets/clockapplet/clock.h b/core/applets/clockapplet/clock.h
index caa0c5f..996fb56 100644
--- a/core/applets/clockapplet/clock.h
+++ b/core/applets/clockapplet/clock.h
@@ -29,6 +29,7 @@ class LauncherClock : public QLabel
Q_OBJECT
public:
LauncherClock( QWidget *parent );
+ static int position();
protected slots:
void updateTime( void );
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 057e332..8ce3f6f 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -1,7 +1,7 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on release
-HEADERS = clock.h clockappletimpl.h
-SOURCES = clock.cpp clockappletimpl.cpp
+HEADERS = clock.h
+SOURCES = clock.cpp
TARGET = clockapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
diff --git a/core/applets/clockapplet/clockappletimpl.cpp b/core/applets/clockapplet/clockappletimpl.cpp
deleted file mode 100644
index 7481f19..0000000
--- a/core/applets/clockapplet/clockappletimpl.cpp
+++ b/dev/null
@@ -1,67 +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 "clock.h"
-#include "clockappletimpl.h"
-
-
-ClockAppletImpl::ClockAppletImpl()
- : clock(0)
-{
-}
-
-ClockAppletImpl::~ClockAppletImpl()
-{
- delete clock;
-}
-
-QWidget *ClockAppletImpl::applet( QWidget *parent )
-{
- if ( !clock )
- clock = new LauncherClock( parent );
- return clock;
-}
-
-int ClockAppletImpl::position() const
-{
- return 10;
-}
-
-#ifndef QT_NO_COMPONENT
-QRESULT ClockAppletImpl::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( ClockAppletImpl )
-}
-#endif
-
diff --git a/core/applets/clockapplet/clockappletimpl.h b/core/applets/clockapplet/clockappletimpl.h
deleted file mode 100644
index 1f9c8f0..0000000
--- a/core/applets/clockapplet/clockappletimpl.h
+++ b/dev/null
@@ -1,45 +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 CLOCKAPPLETIMPL_H
-#define CLOCKAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class LauncherClock;
-
-class ClockAppletImpl : public TaskbarAppletInterface
-{
-public:
- ClockAppletImpl();
- virtual ~ClockAppletImpl();
-
-#ifndef QT_NO_COMPONENT
- QRESULT queryInterface( const QUuid&, QUnknownInterface** );
- Q_REFCOUNT
-#endif
-
- virtual QWidget *applet( QWidget *parent );
- virtual int position() const;
-
-private:
- LauncherClock *clock;
-};
-
-#endif