summaryrefslogtreecommitdiff
authordrw <drw>2005-04-29 00:05:39 (UTC)
committer drw <drw>2005-04-29 00:05:39 (UTC)
commit0d940522f5d849dd480bd2785d592f3d787e0941 (patch) (unidiff)
tree035a7b4ed517f221fd7ced4eec83708326cd50f5
parentc1cab57555a395c9da678b92f492779506421386 (diff)
downloadopie-0d940522f5d849dd480bd2785d592f3d787e0941.zip
opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.gz
opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.bz2
Resource -> OResource
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 @@
23#include <opie2/odevice.h> 23#include <opie2/odevice.h>
24#include <opie2/otaskbarapplet.h>
25#include <opie2/oprocess.h> 24#include <opie2/oprocess.h>
25#include <opie2/oresource.h>
26#include <opie2/otaskbarapplet.h>
26 27
@@ -52,3 +53,3 @@ CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent )
52{ 53{
53 pm = Resource::loadImage( "cardmon/pcmcia").smoothScale(AppLnk::smallIconSize(), AppLnk::smallIconSize()); 54 pm = Opie::Core::OResource::loadPixmap( "cardmon/pcmcia", Opie::Core::OResource::SmallIcon );
54 55
@@ -93,3 +94,3 @@ void CardMonitor::popUp( QString message, QString icon ) {
93 } else { 94 } else {
94 popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ), 95 popupMenu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( icon, Opie::Core::OResource::SmallIcon ) ),
95 message, 0 ); 96 message, 0 );
@@ -115,3 +116,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
115 if ( cardInSd ) { 116 if ( cardInSd ) {
116 menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ), 117 menu->insertItem( QIconSet( Opie::Core::OResource::loadPixmap( "cardmon/ide", Opie::Core::OResource::SmallIcon ) ),
117 tr( "Eject SD/MMC card" ), 0 ); 118 tr( "Eject SD/MMC card" ), 0 );
@@ -122,3 +123,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
122 insertItem( QIconSet 123 insertItem( QIconSet
123 ( Resource::loadPixmap( "cardmon/" + cardInPcmcia0Type ) ), 124 ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia0Type, Opie::Core::OResource::SmallIcon ) ),
124 tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 ); 125 tr( "Eject card 0: %1" ).arg( cardInPcmcia0Name ), 1 );
@@ -129,3 +130,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
129 insertItem( QIconSet 130 insertItem( QIconSet
130 ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ), 131 ( Opie::Core::OResource::loadPixmap( "cardmon/" + cardInPcmcia1Type, Opie::Core::OResource::SmallIcon ) ),
131 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 ); 132 tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );