2 files changed, 84 insertions, 80 deletions

diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index 566b179..9cb8ad2 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -19,19 +19,21 @@
 **
 **********************************************************************/
 
+#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>
 
-#include "modulesinfo.h"
-#include "detail.h"
-
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
+        : QWidget( parent, name, fl )
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
@@ -47,14 +49,14 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     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 ) ),
-                                 this, SLOT( viewModules( QListViewItem * ) ) );
-        }
+
+    // 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 ) ),
+                 this, SLOT( viewModules( QListViewItem * ) ) );
+    }
 
     CommandCB = new QComboBox( FALSE, this );
     CommandCB->insertItem( "modprobe -r" );
@@ -74,16 +76,15 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
     QTimer *t = new QTimer( this );
     connect( t, SIGNAL( timeout() ), this, SLOT( updateData() ) );
     t->start( 5000 );
-        
+
     updateData();
-        
-        ModulesDtl = new Detail();
+
+    ModulesDtl = new Detail();
     QWhatsThis::add( ModulesDtl->detailView, tr( "This area shows detailed information about this module." ) );
 }
 
 ModulesInfo::~ModulesInfo()
-{
-}
+{}
 
 void ModulesInfo::updateData()
 {
@@ -97,7 +98,7 @@ void ModulesInfo::updateData()
     {
         selectedmod = curritem->text( 0 );
     }
-    
+
     ModulesView->clear();
 
     FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
@@ -106,7 +107,8 @@ void ModulesInfo::updateData()
     {
         QListViewItem *newitem;
         QListViewItem *selecteditem = 0x0;
-        while ( true ) {
+        while ( true )
+        {
             modname[0] = '\0';
             usage[0] = '\0';
             int success = fscanf( procfile, "%s%d%d%[^\n]", modname, &modsize, &usecount, usage );
@@ -133,22 +135,22 @@ void ModulesInfo::updateData()
 
 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 ( !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 )
+                               QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
     {
-                QString command = "/sbin/";
-                command.append( CommandCB->currentText() );
-                command.append( " " );
-                command.append( modname );
+        QString command = "/sbin/";
+        command.append( CommandCB->currentText() );
+        command.append( " " );
+        command.append( modname );
 
         FILE* stream = popen( command, "r" );
         if ( stream )
@@ -159,30 +161,30 @@ void ModulesInfo::slotSendClicked()
 
 void ModulesInfo::viewModules( QListViewItem *modules )
 {
-    QString modname = modules->text( 0 );   
-        QString capstr = "Module: ";
-        capstr.append( modname );
+    QString modname = modules->text( 0 );
+    QString capstr = "Module: ";
+    capstr.append( modname );
     ModulesDtl->setCaption( capstr );
     QString command = "/sbin/modinfo ";
-        command.append( modname );
+    command.append( modname );
     FILE* modinfo = popen( command, "r" );
-    
+
     if ( modinfo )
     {
         char line[200];
         ModulesDtl->detailView->setText( " Details:\n------------\n" );
-        
+
         while( true )
-        {        
+        {
             int success = fscanf( modinfo, "%[^\n]\n", line );
             if ( success == EOF )
-                break;         
+                break;
             ModulesDtl->detailView->append( line );
         }
-        
+
         pclose( modinfo );
     }
 
-    ModulesDtl->showMaximized();
+    QPEApplication::showWidget( ModulesDtl );
 }
 
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index af0fe26..2a90b0f 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -17,22 +17,25 @@
 **
 **********************************************************************/
 
+#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>
 
-#include "processinfo.h"
-#include "detail.h"
-
 ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
-    : QWidget( parent, name, fl )
+        : QWidget( parent, name, fl )
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
@@ -49,10 +52,10 @@ ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
     ProcessView->setAllColumnsShowFocus( TRUE );
     QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
     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" );
@@ -86,15 +89,14 @@ ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
 }
 
 ProcessInfo::~ProcessInfo()
-{
-}
+{}
 
 void ProcessInfo::updateData()
 {
     int pid, ppid, pgrp, session, tty, tpgid, utime, stime, cutime, cstime, counter, priority, starttime,
-       signal, blocked, sigignore, sigcatch;
+    signal, blocked, sigignore, sigcatch;
     uint flags, minflt, cminflt, majflt, cmajflt, timeout, itrealvalue, vsize, rss, rlim, startcode,
-         endcode, startstack, kstkesp, kstkeip, wchan;
+    endcode, startstack, kstkesp, kstkeip, wchan;
     char state;
     char comm[64];
 
@@ -104,7 +106,7 @@ void ProcessInfo::updateData()
     {
         selectedpid = curritem->text( 0 );
     }
-    
+
     ProcessView->clear();
 
     QListViewItem *newitem;
@@ -126,11 +128,11 @@ void ProcessInfo::updateData()
                 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 );
+                            "%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);
@@ -155,26 +157,26 @@ void ProcessInfo::updateData()
 
 void ProcessInfo::slotSendClicked()
 {
-        QListViewItem *currprocess = ProcessView->currentItem();
-        if ( !currprocess )
-        {
-                return;
-        }
-        
-        QString capstr = tr( "Really want to send %1\nto this process?" ).arg( SignalCB->currentText() );
-
-        
-        if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
-                 QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
-        {
-                currprocess = ProcessView->currentItem();
-                if ( currprocess )
-                {
-                        QString sigstr = SignalCB->currentText();
-                        sigstr.truncate(2);
-                        int sigid = sigstr.toUInt();
-                        kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
-                }
+    QListViewItem *currprocess = ProcessView->currentItem();
+    if ( !currprocess )
+    {
+        return;
+    }
+
+    QString capstr = tr( "Really want to send %1\nto this process?" ).arg( SignalCB->currentText() );
+
+
+    if ( QMessageBox::warning( this, currprocess->text( 1 ), capstr,
+                               QMessageBox::Yes | QMessageBox::Default, QMessageBox::No | QMessageBox::Escape ) == QMessageBox::Yes )
+    {
+        currprocess = ProcessView->currentItem();
+        if ( currprocess )
+        {
+            QString sigstr = SignalCB->currentText();
+            sigstr.truncate(2);
+            int sigid = sigstr.toUInt();
+            kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
+        }
     }
 
 }
@@ -196,5 +198,5 @@ void ProcessInfo::viewProcess( QListViewItem *process )
         }
         fclose( statfile );
     }
-    ProcessDtl->showMaximized();
+    QPEApplication::showWidget( ProcessDtl );
 }