Diffstat (limited to 'noncore/settings/sysinfo/versioninfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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 | |||
@@ -19,13 +19,13 @@ | |||
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "versioninfo.h" | 21 | #include "versioninfo.h" |
22 | 22 | ||
23 | /* OPIE */ | 23 | /* OPIE */ |
24 | #include <opie2/odevice.h> | 24 | #include <opie2/odevice.h> |
25 | #include <qpe/resource.h> | 25 | #include <opie2/oresource.h> |
26 | #include <qpe/version.h> | 26 | #include <qpe/version.h> |
27 | 27 | ||
28 | /* QT */ | 28 | /* QT */ |
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | #include <qlabel.h> | 30 | #include <qlabel.h> |
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
@@ -86,13 +86,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
86 | palmtopVersionString.append( "</qt>" ); | 86 | palmtopVersionString.append( "</qt>" ); |
87 | 87 | ||
88 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); | 88 | QHBoxLayout *hb1 = new QHBoxLayout( vb ); |
89 | hb1->setSpacing( 2 ); | 89 | hb1->setSpacing( 2 ); |
90 | 90 | ||
91 | QLabel *palmtopLogo = new QLabel( container ); | 91 | QLabel *palmtopLogo = new QLabel( container ); |
92 | QImage logo1 = Resource::loadImage( "logo/opielogo" ); | 92 | QImage logo1 = Opie::Core::OResource::loadImage( "logo/opielogo" ); |
93 | logo1 = logo1.smoothScale( 50, 55 ); | 93 | logo1 = logo1.smoothScale( 50, 55 ); |
94 | QPixmap logo1Pixmap; | 94 | QPixmap logo1Pixmap; |
95 | logo1Pixmap.convertFromImage( logo1 ); | 95 | logo1Pixmap.convertFromImage( logo1 ); |
96 | palmtopLogo->setPixmap( logo1Pixmap ); | 96 | palmtopLogo->setPixmap( logo1Pixmap ); |
97 | palmtopLogo->setFixedSize( 60, 60 ); | 97 | palmtopLogo->setFixedSize( 60, 60 ); |
98 | hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); | 98 | hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft ); |
@@ -103,13 +103,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
103 | 103 | ||
104 | 104 | ||
105 | QHBoxLayout *hb2 = new QHBoxLayout( vb ); | 105 | QHBoxLayout *hb2 = new QHBoxLayout( vb ); |
106 | hb1->setSpacing( 2 ); | 106 | hb1->setSpacing( 2 ); |
107 | 107 | ||
108 | QLabel *linuxLogo = new QLabel( container ); | 108 | QLabel *linuxLogo = new QLabel( container ); |
109 | QImage logo2 = Resource::loadImage( "logo/tux-logo" ); | 109 | QImage logo2 = Opie::Core::OResource::loadImage( "logo/tux-logo" ); |
110 | logo2 = logo2.smoothScale( 55, 60 ); | 110 | logo2 = logo2.smoothScale( 55, 60 ); |
111 | QPixmap logo2Pixmap; | 111 | QPixmap logo2Pixmap; |
112 | logo2Pixmap.convertFromImage( logo2 ); | 112 | logo2Pixmap.convertFromImage( logo2 ); |
113 | linuxLogo->setPixmap( logo2Pixmap ); | 113 | linuxLogo->setPixmap( logo2Pixmap ); |
114 | linuxLogo->setFixedSize( 60, 60 ); | 114 | linuxLogo->setFixedSize( 60, 60 ); |
115 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); | 115 | hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft ); |
@@ -138,13 +138,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
138 | modelPixmap += "jornada56x"; | 138 | modelPixmap += "jornada56x"; |
139 | else if ( model == Model_Jornada_720 ) | 139 | else if ( model == Model_Jornada_720 ) |
140 | modelPixmap += "jornada720"; | 140 | modelPixmap += "jornada720"; |
141 | else | 141 | else |
142 | modelPixmap += "pda"; | 142 | modelPixmap += "pda"; |
143 | 143 | ||
144 | QImage logo3 = Resource::loadImage( modelPixmap ); | 144 | QImage logo3 = Opie::Core::OResource::loadImage( modelPixmap ); |
145 | 145 | ||
146 | int width = logo3.width(); | 146 | int width = logo3.width(); |
147 | int height = logo3.height(); | 147 | int height = logo3.height(); |
148 | float aspect = float( height ) / width; | 148 | float aspect = float( height ) / width; |
149 | logo3 = logo3.smoothScale( 50, 50.0 * aspect ); | 149 | logo3 = logo3.smoothScale( 50, 50.0 * aspect ); |
150 | 150 | ||