bring over some enhancements I allready did in branch

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 @@
 #include <stdio.h>
 
-#include <qcombobox.h>
 #include <qlayout.h>
-#include <qlistview.h>
-#include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qtextview.h>
-#include <qwhatsthis.h>
 
 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 @@
 #include "sysinfo.h"
 
-#include <qpe/qpeapplication.h>
 #include <opie/oapplicationfactory.h>
 
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 @@
 #include <qpe/qpeapplication.h>
 
-#include <qcombobox.h>
 #include <qfile.h>
-#include <qheader.h>
 #include <qlayout.h>
-#include <qlistview.h>
 #include <qmessagebox.h>
-#include <qpushbutton.h>
-#include <qstring.h>
 #include <qtimer.h>
 #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 @@
 
 #include <qdir.h>
-#include <qfile.h>
-#include <qheader.h>
 #include <qlayout.h>
-#include <qlistview.h>
 #include <qmessagebox.h>
 #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 @@
 #include <qlayout.h>
 #include <qscrollview.h>
-#include <qtimer.h>
 #include <qwhatsthis.h>
 
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 @@
 
 #include <qfile.h>
-#include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qpixmap.h>
-#include <qpainter.h>
 #include <qscrollview.h>
 #include <qtextstream.h>
-#include <qtimer.h>
 #include <qwhatsthis.h>
 
@@ -59,13 +55,13 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
     {
         QTextStream t( &file );
-        QString v;
-        t >> v; t >> v; t >> v;
-        v = v.left( 20 );
+  QStringList strList;
+
+  strList = QStringList::split(  " " , t.read(),  false );
+
         kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " );
-        kernelVersionString.append( v );
+        kernelVersionString.append( strList[2] );
         kernelVersionString.append( "<br>" );
-        t >> v;
         kernelVersionString.append( tr( "Compiled by: " ) );
-        kernelVersionString.append( v );
+        kernelVersionString.append( strList[3] );
         kernelVersionString.append("</qt>");
         file.close();