author | harlekin <harlekin> | 2004-01-07 22:59:40 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-07 22:59:40 (UTC) |
commit | c4d6574e85f74d6086c1709ecf0d117df7417222 (patch) (unidiff) | |
tree | 73ec72034552ff8def55dd8c0b7115d05a2d3260 /noncore/settings/sysinfo | |
parent | 872dc276a047a289561779fb59ab4ce45aaa9062 (diff) | |
download | opie-c4d6574e85f74d6086c1709ecf0d117df7417222.zip opie-c4d6574e85f74d6086c1709ecf0d117df7417222.tar.gz opie-c4d6574e85f74d6086c1709ecf0d117df7417222.tar.bz2 |
bring over some enhancements I allready did in branch
-rw-r--r-- | noncore/settings/sysinfo/detail.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/sysinfo/main.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.cpp | 5 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 16 |
6 files changed, 6 insertions, 26 deletions
diff --git a/noncore/settings/sysinfo/detail.cpp b/noncore/settings/sysinfo/detail.cpp index 2c5fdc4..79daa2b 100644 --- a/noncore/settings/sysinfo/detail.cpp +++ b/noncore/settings/sysinfo/detail.cpp | |||
@@ -25,11 +25,5 @@ | |||
25 | #include <stdio.h> | 25 | #include <stdio.h> |
26 | 26 | ||
27 | #include <qcombobox.h> | ||
28 | #include <qlayout.h> | 27 | #include <qlayout.h> |
29 | #include <qlistview.h> | ||
30 | #include <qmessagebox.h> | ||
31 | #include <qpushbutton.h> | ||
32 | #include <qtextview.h> | ||
33 | #include <qwhatsthis.h> | ||
34 | 28 | ||
35 | Detail::Detail( QWidget* parent, const char* name, WFlags ) | 29 | Detail::Detail( QWidget* parent, const char* name, WFlags ) |
diff --git a/noncore/settings/sysinfo/main.cpp b/noncore/settings/sysinfo/main.cpp index 02b1098..d071f71 100644 --- a/noncore/settings/sysinfo/main.cpp +++ b/noncore/settings/sysinfo/main.cpp | |||
@@ -21,5 +21,4 @@ | |||
21 | #include "sysinfo.h" | 21 | #include "sysinfo.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | #include <opie/oapplicationfactory.h> | 23 | #include <opie/oapplicationfactory.h> |
25 | 24 | ||
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp index 0bf51e8..566b179 100644 --- a/noncore/settings/sysinfo/modulesinfo.cpp +++ b/noncore/settings/sysinfo/modulesinfo.cpp | |||
@@ -22,12 +22,7 @@ | |||
22 | #include <qpe/qpeapplication.h> | 22 | #include <qpe/qpeapplication.h> |
23 | 23 | ||
24 | #include <qcombobox.h> | ||
25 | #include <qfile.h> | 24 | #include <qfile.h> |
26 | #include <qheader.h> | ||
27 | #include <qlayout.h> | 25 | #include <qlayout.h> |
28 | #include <qlistview.h> | ||
29 | #include <qmessagebox.h> | 26 | #include <qmessagebox.h> |
30 | #include <qpushbutton.h> | ||
31 | #include <qstring.h> | ||
32 | #include <qtimer.h> | 27 | #include <qtimer.h> |
33 | #include <qwhatsthis.h> | 28 | #include <qwhatsthis.h> |
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp index 709158d..af0fe26 100644 --- a/noncore/settings/sysinfo/processinfo.cpp +++ b/noncore/settings/sysinfo/processinfo.cpp | |||
@@ -21,8 +21,5 @@ | |||
21 | 21 | ||
22 | #include <qdir.h> | 22 | #include <qdir.h> |
23 | #include <qfile.h> | ||
24 | #include <qheader.h> | ||
25 | #include <qlayout.h> | 23 | #include <qlayout.h> |
26 | #include <qlistview.h> | ||
27 | #include <qmessagebox.h> | 24 | #include <qmessagebox.h> |
28 | #include <qtimer.h> | 25 | #include <qtimer.h> |
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp index 4ef7122..fc583e3 100644 --- a/noncore/settings/sysinfo/storage.cpp +++ b/noncore/settings/sysinfo/storage.cpp | |||
@@ -25,5 +25,4 @@ | |||
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qscrollview.h> | 26 | #include <qscrollview.h> |
27 | #include <qtimer.h> | ||
28 | #include <qwhatsthis.h> | 27 | #include <qwhatsthis.h> |
29 | 28 | ||
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp index 1984823..c44a05a 100644 --- a/noncore/settings/sysinfo/versioninfo.cpp +++ b/noncore/settings/sysinfo/versioninfo.cpp | |||
@@ -23,12 +23,8 @@ | |||
23 | 23 | ||
24 | #include <qfile.h> | 24 | #include <qfile.h> |
25 | #include <qimage.h> | ||
26 | #include <qlabel.h> | 25 | #include <qlabel.h> |
27 | #include <qlayout.h> | 26 | #include <qlayout.h> |
28 | #include <qpixmap.h> | ||
29 | #include <qpainter.h> | ||
30 | #include <qscrollview.h> | 27 | #include <qscrollview.h> |
31 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
32 | #include <qtimer.h> | ||
33 | #include <qwhatsthis.h> | 29 | #include <qwhatsthis.h> |
34 | 30 | ||
@@ -59,13 +55,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | |||
59 | { | 55 | { |
60 | QTextStream t( &file ); | 56 | QTextStream t( &file ); |
61 | QString v; | 57 | QStringList strList; |
62 | t >> v; t >> v; t >> v; | 58 | |
63 | v = v.left( 20 ); | 59 | strList = QStringList::split( " " , t.read(), false ); |
60 | |||
64 | kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " ); | 61 | kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " ); |
65 | kernelVersionString.append( v ); | 62 | kernelVersionString.append( strList[2] ); |
66 | kernelVersionString.append( "<br>" ); | 63 | kernelVersionString.append( "<br>" ); |
67 | t >> v; | ||
68 | kernelVersionString.append( tr( "Compiled by: " ) ); | 64 | kernelVersionString.append( tr( "Compiled by: " ) ); |
69 | kernelVersionString.append( v ); | 65 | kernelVersionString.append( strList[3] ); |
70 | kernelVersionString.append("</qt>"); | 66 | kernelVersionString.append("</qt>"); |
71 | file.close(); | 67 | file.close(); |