Resource -> OResource

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
@@ -18,14 +18,15 @@
 
 #include "cardmon.h"
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <opie2/odevice.h>
-#include <opie2/otaskbarapplet.h>
 #include <opie2/oprocess.h>
+#include <opie2/oresource.h>
+#include <opie2/otaskbarapplet.h>
 
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 using namespace Opie::Core;
 using namespace Opie::Ui;
 
@@ -47,13 +48,13 @@ using namespace Opie::Ui;
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 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 );
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received(const QCString&,const QByteArray&) ), this,
              SLOT( cardMessage(const QCString&,const QByteArray&) ) );
 
@@ -88,13 +89,13 @@ void CardMonitor::popUp( QString message, QString icon ) {
     }
 
     popupMenu->clear();
     if ( icon.isEmpty() ) {
         popupMenu->insertItem( message, 0 );
     } else {
-        popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
+        popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
                                message, 0 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = popupMenu->sizeHint();
     popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
@@ -110,27 +111,27 @@ void CardMonitor::popupTimeout() {
 void CardMonitor::mousePressEvent( QMouseEvent * ) {
     QPopupMenu * menu = new QPopupMenu( this );
     QStringList cmd;
     bool execute = true;
 
     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 );
     }
 
     if ( cardInPcmcia0 ) {
         menu->
         insertItem( QIconSet
-                    ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ),
+                    ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
                     tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
     }
 
     if ( cardInPcmcia1 ) {
         menu->
         insertItem( QIconSet
-                    ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
+                    ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
                     tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = menu->sizeHint();
     int opt = menu->exec( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),