summaryrefslogtreecommitdiff
authordrw <drw>2005-06-09 21:17:15 (UTC)
committer drw <drw>2005-06-09 21:17:15 (UTC)
commitd5c8de3585a6e94c18156e51299f1e49cc992285 (patch) (side-by-side diff)
treee7a0bf5f44e7d972904c748d8c03f97ae52c5c87
parent346a2cd09c2c28bd4d2086b0c152dd348913eaa9 (diff)
downloadopie-d5c8de3585a6e94c18156e51299f1e49cc992285.zip
opie-d5c8de3585a6e94c18156e51299f1e49cc992285.tar.gz
opie-d5c8de3585a6e94c18156e51299f1e49cc992285.tar.bz2
Resource -> OResource
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp4
-rw-r--r--noncore/settings/sysinfo/sysinfo.cpp4
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp8
3 files changed, 8 insertions, 8 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 2a269b8..ac6e1fa 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -22,10 +22,10 @@
#include <opie2/odebug.h>
#include <opie2/ostorageinfo.h>
#include <opie2/olistview.h>
+#include <opie2/oresource.h>
#include <qpe/qpeapplication.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpedecoration_qws.h>
-#include <qpe/resource.h>
#include <qpe/config.h>
using namespace Opie::Core;
using namespace Opie::Ui;
@@ -329,7 +329,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
++loops;
}
- QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
+ QPixmap p = Opie::Core::OResource::loadPixmap( "sysinfo/pattern" );
t.restart();
stop = t.elapsed() + seconds*1000;
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index 03db22a..63be111 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -33,10 +33,10 @@
#include "sysinfo.h"
/* OPIE */
+#include <opie2/oresource.h>
#include <opie2/otabwidget.h>
using namespace Opie::Ui;
#include <qpe/config.h>
-#include <qpe/resource.h>
/* QT */
#include <qlayout.h>
@@ -44,7 +44,7 @@ using namespace Opie::Ui;
SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
: QWidget( parent, name, WStyle_ContextHelp )
{
- setIcon( Resource::loadPixmap( "system_icon" ) );
+ setIcon( Opie::Core::OResource::loadPixmap( "system_icon", Opie::Core::OResource::SmallIcon ) );
setCaption( tr("System Info") );
QVBoxLayout *lay = new QVBoxLayout( this );
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 5736faa..29c9a05 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -22,7 +22,7 @@
/* OPIE */
#include <opie2/odevice.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
#include <qpe/version.h>
/* QT */
@@ -89,7 +89,7 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
hb1->setSpacing( 2 );
QLabel *palmtopLogo = new QLabel( container );
- QImage logo1 = Resource::loadImage( "logo/opielogo" );
+ QImage logo1 = Opie::Core::OResource::loadImage( "logo/opielogo" );
logo1 = logo1.smoothScale( 50, 55 );
QPixmap logo1Pixmap;
logo1Pixmap.convertFromImage( logo1 );
@@ -106,7 +106,7 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
hb1->setSpacing( 2 );
QLabel *linuxLogo = new QLabel( container );
- QImage logo2 = Resource::loadImage( "logo/tux-logo" );
+ QImage logo2 = Opie::Core::OResource::loadImage( "logo/tux-logo" );
logo2 = logo2.smoothScale( 55, 60 );
QPixmap logo2Pixmap;
logo2Pixmap.convertFromImage( logo2 );
@@ -141,7 +141,7 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
else
modelPixmap += "pda";
- QImage logo3 = Resource::loadImage( modelPixmap );
+ QImage logo3 = Opie::Core::OResource::loadImage( modelPixmap );
int width = logo3.width();
int height = logo3.height();