summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show 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
@@ -17,20 +17,20 @@
**********************************************************************/
#include "benchmarkinfo.h"
/* OPIE */
#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;
/* QT */
#include <qclipboard.h>
#include <qcolor.h>
#include <qcombobox.h>
@@ -324,17 +324,17 @@ int BenchmarkInfo::gfxRendering( int seconds )
while ( t.elapsed() < stop )
{
int k = rand() % 9;
br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 );
++loops;
}
- QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
+ QPixmap p = Opie::Core::OResource::loadPixmap( "sysinfo/pattern" );
t.restart();
stop = t.elapsed() + seconds*1000;
while ( t.elapsed() < stop )
{
bpw.p.drawPixmap( rand()%w, rand()%h, p );
++loops;
}
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
@@ -28,28 +28,28 @@
#include "processinfo.h"
#include "modulesinfo.h"
#include "benchmarkinfo.h"
#include "sysloginfo.h"
#include "versioninfo.h"
#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>
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 );
OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
lay->addWidget( tab );
tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") );
#if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
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
@@ -17,17 +17,17 @@
** not clear to you.
**
**********************************************************************/
#include "versioninfo.h"
/* OPIE */
#include <opie2/odevice.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
#include <qpe/version.h>
/* QT */
#include <qfile.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qscrollview.h>
#include <qtextstream.h>
@@ -84,34 +84,34 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
palmtopVersionString.append( tr( "Built on: " ) );
palmtopVersionString.append( __DATE__ );
palmtopVersionString.append( "</qt>" );
QHBoxLayout *hb1 = new QHBoxLayout( vb );
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 );
palmtopLogo->setPixmap( logo1Pixmap );
palmtopLogo->setFixedSize( 60, 60 );
hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
QLabel *palmtopVersion = new QLabel( container );
palmtopVersion->setText( palmtopVersionString );
hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
QHBoxLayout *hb2 = new QHBoxLayout( vb );
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 );
linuxLogo->setPixmap( logo2Pixmap );
linuxLogo->setFixedSize( 60, 60 );
hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
QLabel *kernelVersion = new QLabel( container );
@@ -136,17 +136,17 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
modelPixmap += "simpad";
else if ( model == Model_Jornada_56x )
modelPixmap += "jornada56x";
else if ( model == Model_Jornada_720 )
modelPixmap += "jornada720";
else
modelPixmap += "pda";
- QImage logo3 = Resource::loadImage( modelPixmap );
+ QImage logo3 = Opie::Core::OResource::loadImage( modelPixmap );
int width = logo3.width();
int height = logo3.height();
float aspect = float( height ) / width;
logo3 = logo3.smoothScale( 50, 50.0 * aspect );
QPixmap logo3Pixmap;
logo3Pixmap.convertFromImage( logo3 );