author | drw <drw> | 2005-06-09 21:17:15 (UTC) |
---|---|---|
committer | drw <drw> | 2005-06-09 21:17:15 (UTC) |
commit | d5c8de3585a6e94c18156e51299f1e49cc992285 (patch) (side-by-side diff) | |
tree | e7a0bf5f44e7d972904c748d8c03f97ae52c5c87 | |
parent | 346a2cd09c2c28bd4d2086b0c152dd348913eaa9 (diff) | |
download | opie-d5c8de3585a6e94c18156e51299f1e49cc992285.zip opie-d5c8de3585a6e94c18156e51299f1e49cc992285.tar.gz opie-d5c8de3585a6e94c18156e51299f1e49cc992285.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 8 |
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 @@ -24,2 +24,3 @@ #include <opie2/olistview.h> +#include <opie2/oresource.h> #include <qpe/qpeapplication.h> @@ -27,3 +28,2 @@ #include <qpe/qpedecoration_qws.h> -#include <qpe/resource.h> #include <qpe/config.h> @@ -331,3 +331,3 @@ int BenchmarkInfo::gfxRendering( int seconds ) - QPixmap p = Resource::loadPixmap( "sysinfo/pattern" ); + QPixmap p = Opie::Core::OResource::loadPixmap( "sysinfo/pattern" ); t.restart(); 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 @@ -35,2 +35,3 @@ /* OPIE */ +#include <opie2/oresource.h> #include <opie2/otabwidget.h> @@ -38,3 +39,2 @@ using namespace Opie::Ui; #include <qpe/config.h> -#include <qpe/resource.h> @@ -46,3 +46,3 @@ SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) { - setIcon( Resource::loadPixmap( "system_icon" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "system_icon", Opie::Core::OResource::SmallIcon ) ); setCaption( tr("System Info") ); 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 @@ -24,3 +24,3 @@ #include <opie2/odevice.h> -#include <qpe/resource.h> +#include <opie2/oresource.h> #include <qpe/version.h> @@ -91,3 +91,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QLabel *palmtopLogo = new QLabel( container ); - QImage logo1 = Resource::loadImage( "logo/opielogo" ); + QImage logo1 = Opie::Core::OResource::loadImage( "logo/opielogo" ); logo1 = logo1.smoothScale( 50, 55 ); @@ -108,3 +108,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) 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 ); @@ -143,3 +143,3 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) - QImage logo3 = Resource::loadImage( modelPixmap ); + QImage logo3 = Opie::Core::OResource::loadImage( modelPixmap ); |