author | drw <drw> | 2005-05-04 21:53:48 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-04 21:53:48 (UTC) |
commit | 56fa3f4bcedabb5255fedca463724d57316e2cdb (patch) (unidiff) | |
tree | c8fd8e25e65d158eaf670c6d75041132584c032e /core | |
parent | a19581c15cdb15f17988b6af958e6aa27eb01c7d (diff) | |
download | opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.zip opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.gz opie-56fa3f4bcedabb5255fedca463724d57316e2cdb.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/clockapplet/clock.cpp | 6 | ||||
-rw-r--r-- | core/applets/clockapplet/clockapplet.pro | 2 | ||||
-rw-r--r-- | core/applets/clockapplet/config.in | 2 | ||||
-rw-r--r-- | core/applets/clockapplet/opie-clockapplet.control | 2 |
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 | |||
@@ -24,14 +24,14 @@ | |||
24 | #include "clock.h" | 24 | #include "clock.h" |
25 | 25 | ||
26 | /* OPIE */ | 26 | /* OPIE */ |
27 | #include <opie2/odebug.h> | 27 | #include <opie2/odebug.h> |
28 | #include <opie2/oresource.h> | ||
28 | #include <opie2/otaskbarapplet.h> | 29 | #include <opie2/otaskbarapplet.h> |
29 | 30 | ||
30 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
31 | #include <qpe/qcopenvelope_qws.h> | 32 | #include <qpe/qcopenvelope_qws.h> |
32 | #include <qpe/config.h> | 33 | #include <qpe/config.h> |
33 | #include <qpe/resource.h> | ||
34 | 34 | ||
35 | #include <qpopupmenu.h> | 35 | #include <qpopupmenu.h> |
36 | 36 | ||
37 | using namespace Opie::Core; | 37 | using namespace Opie::Core; |
@@ -74,10 +74,10 @@ void LauncherClock::mousePressEvent( QMouseEvent * ) | |||
74 | 74 | ||
75 | Config config( "Clock" ); | 75 | Config config( "Clock" ); |
76 | config.setGroup( "Daily Alarm" ); | 76 | config.setGroup( "Daily Alarm" ); |
77 | bool alarmOn = config.readBoolEntry("Enabled", FALSE); | 77 | bool alarmOn = config.readBoolEntry("Enabled", FALSE); |
78 | menu->insertItem(Resource::loadIconSet(alarmOn?"clockapplet/smallalarm":"clockapplet/smallalarm_off" ), | 78 | menu->insertItem( Opie::Core::OResource::loadPixmap( alarmOn ? "clockapplet/smallalarm" : "clockapplet/smallalarm_off", |
79 | tr("Alarm..."), 2); | 79 | Opie::Core::OResource::SmallIcon ), tr("Alarm..."), 2 ); |
80 | 80 | ||
81 | 81 | ||
82 | /* FIXME use OTaskBarApplet ### */ | 82 | /* FIXME use OTaskBarApplet ### */ |
83 | QPoint curPos = mapToGlobal( QPoint(0,0) ); | 83 | QPoint curPos = mapToGlobal( QPoint(0,0) ); |
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 | |||
@@ -5,9 +5,9 @@ SOURCES = clock.cpp | |||
5 | TARGET = clockapplet | 5 | TARGET = clockapplet |
6 | DESTDIR = $(OPIEDIR)/plugins/applets | 6 | DESTDIR = $(OPIEDIR)/plugins/applets |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += .. | 8 | DEPENDPATH += .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe -lopiecore2 |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
13 | target.path = $$prefix/plugins/applets | 13 | target.path = $$prefix/plugins/applets |
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 @@ | |||
1 | config CLOCKAPPLET | 1 | config CLOCKAPPLET |
2 | boolean "opie-clockapplet (Digital clock applet)" | 2 | boolean "opie-clockapplet (Digital clock applet)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | 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 | |||
@@ -3,8 +3,8 @@ Files: plugins/applets/libclockapplet.so* | |||
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2 |
8 | Description: Clock applet | 8 | Description: Clock applet |
9 | Clock applet for the Opie environment taskbar. | 9 | Clock applet for the Opie environment taskbar. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $QPE_VERSION$EXTRAVERSION |