author | harlekin <harlekin> | 2004-01-07 22:59:40 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-01-07 22:59:40 (UTC) |
commit | c4d6574e85f74d6086c1709ecf0d117df7417222 (patch) (side-by-side diff) | |
tree | 73ec72034552ff8def55dd8c0b7115d05a2d3260 /noncore | |
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 @@ -21,19 +21,13 @@ #include "detail.h" #include <sys/types.h> #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 ) : QWidget( parent, name, WStyle_ContextHelp ) { QVBoxLayout *layout = new QVBoxLayout( this ); 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 @@ -17,11 +17,10 @@ ** not clear to you. ** **********************************************************************/ #include "sysinfo.h" -#include <qpe/qpeapplication.h> #include <opie/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> ) 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 @@ -18,20 +18,15 @@ ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** **********************************************************************/ #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> #include "modulesinfo.h" #include "detail.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 @@ -17,16 +17,13 @@ ** **********************************************************************/ #include <qpe/qpeapplication.h> #include <qdir.h> -#include <qfile.h> -#include <qheader.h> #include <qlayout.h> -#include <qlistview.h> #include <qmessagebox.h> #include <qtimer.h> #include <qwhatsthis.h> #include <sys/types.h> #include <signal.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 @@ -21,13 +21,12 @@ #include <qpe/storage.h> #include <qlabel.h> #include <qlayout.h> #include <qscrollview.h> -#include <qtimer.h> #include <qwhatsthis.h> #include "graph.h" #include "storage.h" #include <stdio.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 @@ -19,20 +19,16 @@ **********************************************************************/ #include <qpe/resource.h> #include <qpe/version.h> #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> #include "versioninfo.h" #include <opie/odevice.h> @@ -55,21 +51,21 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) QString kernelVersionString; QFile file( "/proc/version" ); if ( file.open( IO_ReadOnly ) ) { 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(); } QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " ); palmtopVersionString.append( QPE_VERSION ); |