summaryrefslogtreecommitdiff
authordrw <drw>2005-05-04 21:53:48 (UTC)
committer drw <drw>2005-05-04 21:53:48 (UTC)
commit56fa3f4bcedabb5255fedca463724d57316e2cdb (patch) (side-by-side diff)
treec8fd8e25e65d158eaf670c6d75041132584c032e
parenta19581c15cdb15f17988b6af958e6aa27eb01c7d (diff)
downloadopie-56fa3f4bcedabb5255fedca463724d57316e2cdb.zip
opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.gz
opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.bz2
Resource -> OResource
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/clockapplet/clock.cpp6
-rw-r--r--core/applets/clockapplet/clockapplet.pro2
-rw-r--r--core/applets/clockapplet/config.in2
-rw-r--r--core/applets/clockapplet/opie-clockapplet.control2
4 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/clockapplet/clock.cpp b/core/applets/clockapplet/clock.cpp
index d7d326d..ba8eb15 100644
--- a/core/applets/clockapplet/clock.cpp
+++ b/core/applets/clockapplet/clock.cpp
@@ -25,12 +25,12 @@
/* OPIE */
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
#include <opie2/otaskbarapplet.h>
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/config.h>
-#include <qpe/resource.h>
#include <qpopupmenu.h>
@@ -75,8 +75,8 @@ void LauncherClock::mousePressEvent( QMouseEvent * )
Config config( "Clock" );
config.setGroup( "Daily Alarm" );
bool alarmOn = config.readBoolEntry("Enabled", FALSE);
- menu->insertItem(Resource::loadIconSet(alarmOn?"clockapplet/smallalarm":"clockapplet/smallalarm_off" ),
- tr("Alarm..."), 2);
+ menu->insertItem( Opie::Core::OResource::loadPixmap( alarmOn ? "clockapplet/smallalarm" : "clockapplet/smallalarm_off",
+ Opie::Core::OResource::SmallIcon ), tr("Alarm..."), 2 );
/* FIXME use OTaskBarApplet ### */
diff --git a/core/applets/clockapplet/clockapplet.pro b/core/applets/clockapplet/clockapplet.pro
index 910f44b..b227b77 100644
--- a/core/applets/clockapplet/clockapplet.pro
+++ b/core/applets/clockapplet/clockapplet.pro
@@ -6,7 +6,7 @@ TARGET = clockapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += ..
-LIBS += -lqpe
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
include( $(OPIEDIR)/include.pro )
diff --git a/core/applets/clockapplet/config.in b/core/applets/clockapplet/config.in
index 6c32f79..f934743 100644
--- a/core/applets/clockapplet/config.in
+++ b/core/applets/clockapplet/config.in
@@ -1,4 +1,4 @@
config CLOCKAPPLET
boolean "opie-clockapplet (Digital clock applet)"
default "y"
- depends ( LIBQPE || LIBQPE-X11 )
+ depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/applets/clockapplet/opie-clockapplet.control b/core/applets/clockapplet/opie-clockapplet.control
index 79d9fdd..32035d4 100644
--- a/core/applets/clockapplet/opie-clockapplet.control
+++ b/core/applets/clockapplet/opie-clockapplet.control
@@ -4,7 +4,7 @@ Priority: optional
Section: opie/applets
Maintainer: Opie Team <opie@handhelds.org>
Architecture: arm
-Depends: task-opie-minimal
+Depends: task-opie-minimal, libopiecore2
Description: Clock applet
Clock applet for the Opie environment taskbar.
Version: $QPE_VERSION$EXTRAVERSION