Diffstat (limited to 'noncore/settings/sysinfo/sysinfo.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 | |||
@@ -24,36 +24,36 @@ | |||
24 | 24 | ||
25 | #include "memory.h" | 25 | #include "memory.h" |
26 | #include "devicesinfo.h" | 26 | #include "devicesinfo.h" |
27 | #include "storage.h" | 27 | #include "storage.h" |
28 | #include "processinfo.h" | 28 | #include "processinfo.h" |
29 | #include "modulesinfo.h" | 29 | #include "modulesinfo.h" |
30 | #include "benchmarkinfo.h" | 30 | #include "benchmarkinfo.h" |
31 | #include "sysloginfo.h" | 31 | #include "sysloginfo.h" |
32 | #include "versioninfo.h" | 32 | #include "versioninfo.h" |
33 | #include "sysinfo.h" | 33 | #include "sysinfo.h" |
34 | 34 | ||
35 | /* OPIE */ | 35 | /* OPIE */ |
36 | #include <opie2/oresource.h> | ||
36 | #include <opie2/otabwidget.h> | 37 | #include <opie2/otabwidget.h> |
37 | using namespace Opie::Ui; | 38 | using namespace Opie::Ui; |
38 | #include <qpe/config.h> | 39 | #include <qpe/config.h> |
39 | #include <qpe/resource.h> | ||
40 | 40 | ||
41 | /* QT */ | 41 | /* QT */ |
42 | #include <qlayout.h> | 42 | #include <qlayout.h> |
43 | 43 | ||
44 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) | 44 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) |
45 | : QWidget( parent, name, WStyle_ContextHelp ) | 45 | : QWidget( parent, name, WStyle_ContextHelp ) |
46 | { | 46 | { |
47 | setIcon( Resource::loadPixmap( "system_icon" ) ); | 47 | setIcon( Opie::Core::OResource::loadPixmap( "system_icon", Opie::Core::OResource::SmallIcon ) ); |
48 | setCaption( tr("System Info") ); | 48 | setCaption( tr("System Info") ); |
49 | 49 | ||
50 | QVBoxLayout *lay = new QVBoxLayout( this ); | 50 | QVBoxLayout *lay = new QVBoxLayout( this ); |
51 | OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); | 51 | OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global ); |
52 | lay->addWidget( tab ); | 52 | lay->addWidget( tab ); |
53 | 53 | ||
54 | tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") ); | 54 | tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") ); |
55 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) | 55 | #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) |
56 | tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") ); | 56 | tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") ); |
57 | #endif | 57 | #endif |
58 | tab->addTab( new DevicesInfo( tab ), "sysinfo/cputabicon", tr("Devices") ); | 58 | tab->addTab( new DevicesInfo( tab ), "sysinfo/cputabicon", tr("Devices") ); |
59 | tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr( "Process" ) ); | 59 | tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr( "Process" ) ); |