3 files changed, 5 insertions, 5 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 0aeb251..d6ecec5 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -52,193 +52,193 @@ extern "C"
    double dhry_main( int );
 }
 #define DHRYSTONE_RUNS   20000000
 #define TEST_DURATION    3
 #define BUFF_SIZE        8192
 #define FILE_SIZE        1024 * 1024  // 1Mb
 //===========================================================================
 class BenchmarkPaintWidget : public QWidget
 {
  public:
    BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
    {
        resize( QApplication::desktop()->size() );
        show();
        p.begin( this );
    };
    ~BenchmarkPaintWidget()
    {
        p.end();
        hide();
    };
    QPainter p;
 };
 //===========================================================================
 BenchmarkInfo::BenchmarkInfo( QWidget *parent, const char *name, int wFlags )
        : QWidget( parent, name, wFlags )
 {
    setMinimumSize( 200, 150 );
    QVBoxLayout* vb = new QVBoxLayout( this );
    vb->setSpacing( 4 );
    vb->setMargin( 4 );
    tests = new QListView( this );
    tests->setMargin( 0 );
    tests->addColumn( tr( "Tests" ) );
    tests->addColumn( tr( "Results" ) );
    tests->addColumn( tr( "Comparison" ) );
    tests->setShowSortIndicator( true );
    test_alu = new QCheckListItem( tests, tr( "1. Integer Arithmetic  " ), QCheckListItem::CheckBox );
    test_fpu = new QCheckListItem( tests, tr( "2. Floating Point Unit  " ), QCheckListItem::CheckBox );
    test_txt = new QCheckListItem( tests, tr( "3. Text Rendering  " ), QCheckListItem::CheckBox );
    test_gfx = new QCheckListItem( tests, tr( "4. Gfx Rendering  " ), QCheckListItem::CheckBox );
    test_ram = new QCheckListItem( tests, tr( "5. RAM Performance  " ), QCheckListItem::CheckBox );
    test_sd = new QCheckListItem( tests, tr( "6. SD Card Performance  " ), QCheckListItem::CheckBox );
    test_cf = new QCheckListItem( tests, tr( "7. CF Card Performance  " ), QCheckListItem::CheckBox );   
       
    test_alu->setText( 1, "n/a" );
    test_fpu->setText( 1, "n/a" );   
    test_txt->setText( 1, "n/a" );
    test_gfx->setText( 1, "n/a" );
    test_ram->setText( 1, "n/a" );
    test_sd->setText( 1, "n/a" );
    test_cf->setText( 1, "n/a" );   
    
    test_alu->setText( 2, "n/a" );
    test_fpu->setText( 2, "n/a" );   
    test_txt->setText( 2, "n/a" );
    test_gfx->setText( 2, "n/a" );
    test_ram->setText( 2, "n/a" );
    test_sd->setText( 2, "n/a" );
    test_cf->setText( 2, "n/a" );   
    
    startButton = new QPushButton( tr( "&Start Tests!" ), this );
    connect( startButton, SIGNAL( clicked() ), this, SLOT( run() ) );
    
    vb->addWidget( tests, 2 );
    
    QFile f( QPEApplication::qpeDir() + "/share/sysinfo/results" );
    if ( f.open( IO_ReadOnly ) )
    {
        machineCombo = new QComboBox( this );
        
        QTextStream ts( &f );
        while( !ts.eof() )
        {
            QString machline = ts.readLine();
            qDebug( "sysinfo: parsing benchmark results for '%s'", (const char*) machline );
            QString resline = ts.readLine();
            machines.insert( machline, new QStringList( QStringList::split( ",", resline ) ) );
            machineCombo->insertItem( machline );
        }
        
        QHBoxLayout* hb = new QHBoxLayout( vb );
        hb->addWidget( new QLabel( tr( "Compare To:" ), this ) );
        hb->addWidget( machineCombo, 2 );
-        connect( machineCombo, SIGNAL( activated( int ) ), this, SLOT( machineActivated( int ) ) );
+        connect( machineCombo, SIGNAL( activated(int) ), this, SLOT( machineActivated(int) ) );
    }
    
    vb->addWidget( startButton, 2 );
 }
 BenchmarkInfo::~BenchmarkInfo()
 {}
 void BenchmarkInfo::machineActivated( int index )
 {
    QStringList* results = machines[ machineCombo->text( index ) ];
    if ( !results )
    {
        qDebug( "sysinfo: no results available." );
        return;
    }
    QStringList::Iterator it = results->begin();
    test_alu->setText( 2, *(it++) );
    test_fpu->setText( 2, *(it++) );   
    test_txt->setText( 2, *(it++) );
    test_gfx->setText( 2, *(it++) );
    test_ram->setText( 2, *(it++) );
    test_sd->setText( 2, *(it++) );
    test_cf->setText( 2, *(it++) );   
 }
 void BenchmarkInfo::run()
 {
    startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
    qApp->processEvents();
    QTime t;
    if ( test_alu->isOn() )
    {
        int d = round( dhry_main( DHRYSTONE_RUNS ) );
        test_alu->setText( 1, QString( "%1 dhrys" ).arg( QString::number( d ) ) );
        test_alu->setOn( false );
    }
    if ( test_fpu->isOn() )
    {
        t.start();
        BenchFFT();
        test_fpu->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) );
        test_fpu->setOn( false );
    }
    if ( test_txt->isOn() )
    {
        int value = textRendering( TEST_DURATION );
        test_txt->setText( 1, QString( "%1 chars/sec" ).arg( QString::number( value / TEST_DURATION ) ) );
        test_txt->setOn( false );
    }
    if ( test_gfx->isOn() )
    {
        int value = gfxRendering( TEST_DURATION );
        test_gfx->setText( 1, QString( "%1 gops/sec" ).arg( QString::number( value / 4 / TEST_DURATION ) ) ); // 4 tests
        test_gfx->setOn( false );
    }
    if ( test_ram->isOn() )    // /tmp is supposed to be in RAM on a PDA
    {
        performFileTest( "/tmp/benchmarkFile.dat", test_ram );
    }
    if ( test_cf->isOn() )
    {
        OStorageInfo storage;
        performFileTest( storage.cfPath() + "/benchmarkFile.dat", test_cf );
    }
    if ( test_sd->isOn() )
    {
        OStorageInfo storage;
        performFileTest( storage.sdPath() + "/benchmarkFile.dat", test_sd );
    }
    startButton->setText( tr( "&Start Tests!" ) );
 }
 int BenchmarkInfo::textRendering( int seconds )
 {
    QTime t;
    t.start();
    int stop = t.elapsed() + seconds * 1000;
    int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 };
    int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 };
    int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 };
    const QString text( "Opie Benchmark Test" );
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 9cb8ad2..e688a29 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -1,154 +1,154 @@
 /**********************************************************************
 ** ModulesInfo
 **
 ** Display Modules information
 **
 ** Copyright (C) 2002, Michael Lauer
 **                    mickey@tm.informatik.uni-frankfurt.de
 **                    http://www.Vanille.de
 **
 ** Based on ProcessInfo by Dan Williams <williamsdr@acm.org>
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "modulesinfo.h"
 #include "detail.h"
 /* OPIE */
 #include <qpe/qpeapplication.h>
 /* QT */
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
        : QWidget( parent, name, fl )
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    ModulesView = new QListView( this );
    int colnum = ModulesView->addColumn( tr( "Module" ) );
    colnum = ModulesView->addColumn( tr( "Size" ) );
    ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ModulesView->addColumn( tr( "Use#" ) );
    ModulesView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ModulesView->addColumn( tr( "Used by" ) );
    ModulesView->setAllColumnsShowFocus( TRUE );
    layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 );
    QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
    // Test if we have /sbin/modinfo, and if so, allow module detail window
    if ( QFile::exists( "/sbin/modinfo" ) )
    {
        QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
-        connect( ModulesView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
+        connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
-                 this, SLOT( viewModules( QListViewItem * ) ) );
+                 this, SLOT( viewModules(QListViewItem*) ) );
    }
    CommandCB = new QComboBox( FALSE, this );
    CommandCB->insertItem( "modprobe -r" );
    CommandCB->insertItem( "rmmod" );
    // I can't think of other useful commands yet. Anyone?
    layout->addWidget( CommandCB, 1, 0 );
    QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command to module selected above." ) );
    QPushButton *btn = new QPushButton( this );
    btn->setMinimumSize( QSize( 50, 24 ) );
    btn->setMaximumSize( QSize( 50, 24 ) );
    btn->setText( tr( "Send" ) );
    connect( btn, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
    layout->addWidget( btn, 1, 1 );
    QWhatsThis::add( btn, tr( "Click here to send the selected command to the module selected above." ) );
    QTimer *t = new QTimer( this );
    connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
    t->start( 5000 );
    updateData();
    ModulesDtl = new Detail();
    QWhatsThis::add( ModulesDtl->detailView, tr( "This area shows detailed information about this module." ) );
 }
 ModulesInfo::~ModulesInfo()
 {}
 void ModulesInfo::updateData()
 {
    char modname[64];
    char usage[200];
    int modsize, usecount;
    QString selectedmod;
    QListViewItem *curritem = ModulesView->currentItem();
    if ( curritem )
    {
        selectedmod = curritem->text( 0 );
    }
    ModulesView->clear();
    FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
    if ( procfile )
    {
        QListViewItem *newitem;
        QListViewItem *selecteditem = 0x0;
        while ( true )
        {
            modname[0] = '\0';
            usage[0] = '\0';
            int success = fscanf( procfile, "%s%d%d%[^\n]", modname, &modsize, &usecount, usage );
            if ( success == EOF )
                break;
            QString qmodname = QString( modname );
            QString qmodsize = QString::number( modsize ).rightJustify( 6, ' ' );
            QString qusecount = QString::number( usecount ).rightJustify( 2, ' ' );
            QString qusage = QString( usage );
            newitem = new QListViewItem( ModulesView, qmodname, qmodsize, qusecount, qusage );
            if ( qmodname == selectedmod )
            {
                selecteditem = newitem;
            }
        }
        ModulesView->setCurrentItem( selecteditem );
        fclose( procfile );
    }
 }
 void ModulesInfo::slotSendClicked()
 {
    if ( !ModulesView->currentItem() )
    {
        return;
    }
    QString capstr = tr( "You really want to execute %1 for this module?" ).arg( CommandCB->currentText() );
    QString modname = ModulesView->currentItem()->text( 0 );
    if ( QMessageBox::warning( this, modname, capstr,
                               QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
    {
        QString command = "/sbin/";
        command.append( CommandCB->currentText() );
        command.append( " " );
        command.append( modname );
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index 2a90b0f..69b4ab5 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -1,151 +1,151 @@
 /**********************************************************************
 ** ProcessInfo
 **
 ** Display process information
 **
 ** Copyright (C) 2002, Dan Williams
 **                    williamsdr@acm.org
 **                    http://draknor.net
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **********************************************************************/
 #include "processinfo.h"
 #include "detail.h"
 /* OPIE */
 #include <qpe/qpeapplication.h>
 /* QT */
 #include <qdir.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 /* STD */
 #include <sys/types.h>
 #include <signal.h>
 ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
        : QWidget( parent, name, fl )
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 4 );
    layout->setMargin( 4 );
    ProcessView = new QListView( this, "ProcessView" );
    int colnum = ProcessView->addColumn( tr( "PID" ) );
    ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
    colnum = ProcessView->addColumn( tr( "Command" ),96 );
    colnum = ProcessView->addColumn( tr( "Status" ) );
    colnum = ProcessView->addColumn( tr( "Time" ) );
    ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
    ProcessView->setAllColumnsShowFocus( TRUE );
    QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
-    connect( ProcessView, SIGNAL( rightButtonPressed( QListViewItem *, const QPoint &, int ) ),
+    connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
-             this, SLOT( viewProcess( QListViewItem * ) ) );
+             this, SLOT( viewProcess(QListViewItem*) ) );
    layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 );
    QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) );
    SignalCB = new QComboBox( FALSE, this, "SignalCB" );
    SignalCB->insertItem( " 1: SIGHUP" );
    SignalCB->insertItem( " 2: SIGINT" );
    SignalCB->insertItem( " 3: SIGQUIT" );
    SignalCB->insertItem( " 5: SIGTRAP" );
    SignalCB->insertItem( " 6: SIGABRT" );
    SignalCB->insertItem( " 9: SIGKILL" );
    SignalCB->insertItem( "14: SIGALRM" );
    SignalCB->insertItem( "15: SIGTERM" );
    SignalCB->insertItem( "18: SIGCONT" );
    SignalCB->insertItem( "19: SIGSTOP" );
    layout->addWidget( SignalCB, 1, 0 );
    QWhatsThis::add( SignalCB, tr( "Select a signal here and then click the Send button to the right to send to this process." ) );
    SendButton = new QPushButton( this, "SendButton" );
    SendButton->setMinimumSize( QSize( 50, 24 ) );
    SendButton->setMaximumSize( QSize( 50, 24 ) );
    SendButton->setText( tr( "Send" ) );
    connect( SendButton, SIGNAL( clicked() ), this, SLOT( slotSendClicked() ) );
    layout->addWidget( SendButton, 1, 1 );
    QWhatsThis::add( SendButton, tr( "Click here to send the selected signal to this process." ) );
    QTimer *t = new QTimer( this );
    connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
    t->start( 5000 );
    updateData();
    ProcessDtl = new Detail();
    QWhatsThis::add( ProcessDtl->detailView, tr( "This area shows detailed information about this process." ) );
 }
 ProcessInfo::~ProcessInfo()
 {}
 void ProcessInfo::updateData()
 {
    int pid, ppid, pgrp, session, tty, tpgid, utime, stime, cutime, cstime, counter, priority, starttime,
    signal, blocked, sigignore, sigcatch;
    uint flags, minflt, cminflt, majflt, cmajflt, timeout, itrealvalue, vsize, rss, rlim, startcode,
    endcode, startstack, kstkesp, kstkeip, wchan;
    char state;
    char comm[64];
    QString selectedpid;
    QListViewItem *curritem = ProcessView->currentItem();
    if ( curritem )
    {
        selectedpid = curritem->text( 0 );
    }
    ProcessView->clear();
    QListViewItem *newitem;
    QListViewItem *selecteditem = 0x0;
    QDir *procdir = new QDir("/proc", 0, QDir::Name, QDir::Dirs);
    QFileInfoList *proclist = new QFileInfoList(*(procdir->entryInfoList()));
    if ( proclist )
    {
        QFileInfoListIterator it(*proclist);
        QFileInfo *f;
        while ( ( f = it.current() ) != 0 )
        {
            ++it;
            QString processnum = f->fileName();
            if ( processnum >= "1" && processnum <= "99999" )
            {
                FILE *procfile = fopen( ( QString ) ( "/proc/" + processnum + "/stat"), "r");
                if ( procfile )
                {
                    fscanf( procfile,
                            "%d %s %c %d %d %d %d %d %u %u %u %u %u %d %d %d %d %d %d %u %u %d %u %u %u %u %u %u %u %u %d %d %d %d %u",
                            &pid, comm, &state, &ppid, &pgrp, &session,&tty, &tpgid, &flags, &minflt, &cminflt,
                            &majflt, &cmajflt, &utime, &stime, &cutime, &cstime, &counter, &priority, &timeout,
                            &itrealvalue, &starttime, &vsize, &rss, &rlim, &startcode, &endcode, &startstack,
                            &kstkesp, &kstkeip, &signal, &blocked, &sigignore, &sigcatch, &wchan );
                    processnum = processnum.rightJustify( 5, ' ' );
                    QString processcmd = QString( comm ).replace( QRegExp( "[()]" ), "" );
                    QString processstatus = QChar(state);
                    QString processtime = QString::number( ( utime + stime ) / 100 );
                    processtime = processtime.rightJustify( 9, ' ' );
                    fclose( procfile );
                    newitem = new QListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
                    if ( processnum == selectedpid )
                    {
                        selecteditem = newitem;
                    }
                }
            }
        }
        ProcessView->setCurrentItem( selecteditem );