summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 452339c..11ce880 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -23,4 +23,5 @@
#include <opie2/odevice.h>
-#include <opie2/otaskbarapplet.h>
#include <opie2/oprocess.h>
+#include <opie2/oresource.h>
+#include <opie2/otaskbarapplet.h>
@@ -52,3 +53,3 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent )
{
- pm = Resource::loadImage( "cardmon/pcmcia").smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize());
+ pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
@@ -93,3 +94,3 @@ void CardMonitor::popUp( QString message, QString icon ) {
} else {
- popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
+ popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
message, 0 );
@@ -115,3 +116,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
if ( cardInSd ) {
- menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
+ menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ),
tr( "Eject SD/MMC card" ), 0 );
@@ -122,3 +123,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
insertItem( QIconSet
- ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
+ ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
@@ -129,3 +130,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
insertItem( QIconSet
- ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
+ ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );