author | drw <drw> | 2005-04-29 00:05:39 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-29 00:05:39 (UTC) |
commit | 0d940522f5d849dd480bd2785d592f3d787e0941 (patch) (unidiff) | |
tree | 035a7b4ed517f221fd7ced4eec83708326cd50f5 | |
parent | c1cab57555a395c9da678b92f492779506421386 (diff) | |
download | opie-0d940522f5d849dd480bd2785d592f3d787e0941.zip opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.gz opie-0d940522f5d849dd480bd2785d592f3d787e0941.tar.bz2 |
Resource -> OResource
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 13 |
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 | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
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 | ||
27 | #include <qpe/applnk.h> | 28 | #include <qpe/applnk.h> |
@@ -51,5 +52,5 @@ using namespace Opie::Ui; | |||
51 | CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ) | 52 | 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 | ||
55 | QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); | 56 | QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this ); |
@@ -92,5 +93,5 @@ void CardMonitor::popUp( QString message, QString icon ) { | |||
92 | popupMenu->insertItem( message, 0 ); | 93 | popupMenu->insertItem( message, 0 ); |
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 ); |
96 | } | 97 | } |
@@ -114,5 +115,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
114 | 115 | ||
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 ); |
118 | } | 119 | } |
@@ -121,5 +122,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
121 | menu-> | 122 | menu-> |
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 ); |
125 | } | 126 | } |
@@ -128,5 +129,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
128 | menu-> | 129 | menu-> |
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 ); |
132 | } | 133 | } |