Make use of ODP

37 files changed, 115 insertions, 68 deletions

diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp
index d2babb4..da21cef 100644
--- a/noncore/settings/aqpkg/installdlgimpl.cpp
+++ b/noncore/settings/aqpkg/installdlgimpl.cpp
@@ -1,428 +1,429 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdio.h>
 
 #include <opie2/ofiledialog.h>
 
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 #endif
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qdialog.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpushbutton.h>
 
 #include "datamgr.h"
 #include "destination.h"
 #include "instoptionsimpl.h"
 #include "installdlgimpl.h"
 #include "ipkg.h"
 #include "utils.h"
 #include "global.h"
 
+using namespace Opie::Ui;
 enum {
     MAXLINES = 100,
 };
 
 InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
     init( TRUE );
 
     pIpkg = 0;
     upgradePackages = false;
     dataMgr = dataManager;
 
     QString defaultDest = "root";
 #ifdef QWS
     Config cfg( "aqpkg" );
     cfg.setGroup( "settings" );
     defaultDest = cfg.readEntry( "dest", "root" );
 
     // Grab flags - Turn MAKE_LINKS on by default (if no flags found)
     flags = cfg.readNumEntry( "installFlags", 0 );
     infoLevel = cfg.readNumEntry( "infoLevel", 1 );
 #else
     flags = 0;
 #endif
 
     // Output text is read only
     output->setReadOnly( true );
 //    QFont f( "helvetica" );
 //    f.setPointSize( 10 );
 //    output->setFont( f );
 
 
     // setup destination data
     int defIndex = 0;
     int i;
     QListIterator<Destination> dit( dataMgr->getDestinationList() );
     for ( i = 0; dit.current(); ++dit, ++i )
     {
         destination->insertItem( dit.current()->getDestinationName() );
         if ( dit.current()->getDestinationName() == defaultDest )
             defIndex = i;
     }
 
     destination->setCurrentItem( defIndex );
 
     QListIterator<InstallData> it( packageList );
     // setup package data
     QString remove = tr( "Remove\n" );
     QString install = tr( "Install\n" );
     QString upgrade = tr( "Upgrade\n" );
     for ( ; it.current(); ++it )
     {
         InstallData *item = it.current();
         InstallData *newitem = new InstallData();
 
         newitem->option = item->option;
         newitem->packageName = item->packageName;
         newitem->destination = item->destination;
         newitem->recreateLinks = item->recreateLinks;
         packages.append( newitem );
 
         if ( item->option == "I" )
         {
             install.append( QString( "   %1\n" ).arg( item->packageName ) );
         }
         else if ( item->option == "D" )
         {
             remove.append( QString( "   %1\n" ).arg( item->packageName ) );
         }
         else if ( item->option == "U" || item->option == "R" )
         {
             QString type;
             if ( item->option == "R" )
                 type = tr( "(ReInstall)" );
             else
                 type = tr( "(Upgrade)" );
             upgrade.append( QString( "   %1 %2\n" ).arg( item->packageName ).arg( type ) );
         }
     }
 
     output->setText( QString( "%1\n%2\n%3\n" ).arg( remove ).arg( install ).arg( upgrade ) );
 
     displayAvailableSpace( destination->currentText() );
 }
 
 InstallDlgImpl::InstallDlgImpl( Ipkg *ipkg, QString initialText, const char *title )
     : QWidget( 0, 0, 0 )
 {
     setCaption( title );
     init( FALSE );
     pIpkg = ipkg;
     output->setText( initialText );
 }
 
 
 InstallDlgImpl::~InstallDlgImpl()
 {
     if ( pIpkg )
         delete pIpkg;
 }
 
 void InstallDlgImpl :: init( bool displayextrainfo )
 {
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 4 );
     layout->setMargin( 4 );
 
     if ( displayextrainfo )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
         layout->addWidget( label, 0, 0 );
         destination = new QComboBox( FALSE, this );
         layout->addWidget( destination, 0, 1 );
         connect( destination, SIGNAL( highlighted(const QString&) ),
                 this, SLOT( displayAvailableSpace(const QString&) ) );
 
         QLabel *label2 = new QLabel( tr( "Space Avail" ), this );
         layout->addWidget( label2, 1, 0 );
         txtAvailableSpace = new QLabel( "", this );
         layout->addWidget( txtAvailableSpace, 1, 1 );
     }
     else
     {
         destination = 0x0;
         txtAvailableSpace = 0x0;
     }
 
     QGroupBox *GroupBox2 = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
     GroupBox2->layout()->setSpacing( 0 );
     GroupBox2->layout()->setMargin( 4 );
 
     QVBoxLayout *GroupBox2Layout = new QVBoxLayout( GroupBox2->layout() );
     output = new QMultiLineEdit( GroupBox2 );
     GroupBox2Layout->addWidget( output );
     layout->addMultiCellWidget( GroupBox2, 2, 2, 0, 1 );
 
     btnInstall = new QPushButton( Resource::loadPixmap( "aqpkg/apply" ), tr( "Start" ), this );
     layout->addWidget( btnInstall, 3, 0 );
     connect( btnInstall, SIGNAL( clicked() ), this, SLOT( installSelected() ) );
 
     btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( btnOptions, 3, 1 );
     connect( btnOptions, SIGNAL( clicked() ), this, SLOT( optionsSelected() ) );
 }
 
 void InstallDlgImpl :: optionsSelected()
 {
     if ( btnOptions->text() == tr( "Options" ) )
     {
         InstallOptionsDlgImpl opt( flags, infoLevel, this, "Option", true );
         if ( opt.exec() == QDialog::Accepted )
         {
             // set options selected from dialog
             flags = opt.getFlags();
             infoLevel = opt.getInfoLevel();
 
 #ifdef QWS
             Config cfg( "aqpkg" );
             cfg.setGroup( "settings" );
             cfg.writeEntry( "installFlags", flags );
             cfg.writeEntry( "infoLevel", infoLevel );
 #endif
         }
     }
     else // Save output
     {
         QMap<QString, QStringList> map;
         map.insert( tr( "All" ), QStringList() );
         QStringList text;
         text << "text/*";
         map.insert(tr( "Text" ), text );
         text << "*";
         map.insert( tr( "All" ), text );
 
-        QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+        QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
         if( !filename.isEmpty() )
         {
             QString currentFileName = QFileInfo( filename ).fileName();
             DocLnk doc;
             doc.setType( "text/plain" );
             doc.setFile( filename );
             doc.setName( currentFileName );
             FileManager fm;
             fm.saveFile( doc, output->text() );
         }
     }
 }
 
 void InstallDlgImpl :: installSelected()
 {
     if ( btnInstall->text() == tr( "Abort" ) )
     {
         if ( pIpkg )
         {
             displayText( tr( "\n**** User Clicked ABORT ***" ) );
             pIpkg->abort();
             displayText( tr( "**** Process Aborted ****" ) );
         }
 
         btnInstall->setText( tr( "Close" ) );
         btnInstall->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
     }
     else if ( btnInstall->text() == tr( "Close" ) )
     {
         emit reloadData( this );
         return;
     }
 
     // Disable buttons
     btnOptions->setEnabled( false );
 //    btnInstall->setEnabled( false );
 
     btnInstall->setText( tr( "Abort" ) );
     btnInstall->setIconSet( Resource::loadPixmap( "close" ) );
 
     if ( pIpkg )
     {
         output->setText( "" );
         connect( pIpkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
         connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
         pIpkg->runIpkg();
     }
     else
     {
         output->setText( "" );
         Destination *d = dataMgr->getDestination( destination->currentText() );
         QString dest = d->getDestinationName();
         QString destDir = d->getDestinationPath();
         int instFlags = flags;
         if ( d->linkToRoot() )
             instFlags |= MAKE_LINKS;
 
 #ifdef QWS
         // Save settings
         Config cfg( "aqpkg" );
         cfg.setGroup( "settings" );
         cfg.writeEntry( "dest", dest );
 #endif
 
         pIpkg = new Ipkg;
         connect( pIpkg, SIGNAL(outputText(const QString&)), this, SLOT(displayText(const QString&)));
         connect( pIpkg, SIGNAL(ipkgFinished()), this, SLOT(ipkgFinished()));
 
         firstPackage = TRUE;
         ipkgFinished();
 
         // First run through the remove list, then the install list then the upgrade list
 /*
         pIpkg->setOption( "remove" );
         QListIterator<InstallData> it( removeList );
         InstallData *idata;
         for ( ; it.current(); ++it )
         {
             idata = it.current();
             pIpkg->setDestination( idata->destination->getDestinationName() );
             pIpkg->setDestinationDir( idata->destination->getDestinationPath() );
             pIpkg->setPackage( idata->packageName );
 
             int tmpFlags = flags;
             if ( idata->destination->linkToRoot() )
                 tmpFlags |= MAKE_LINKS;
 
             pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
         pIpkg->setOption( "install" );
         pIpkg->setDestination( dest );
         pIpkg->setDestinationDir( destDir );
         pIpkg->setFlags( instFlags, infoLevel );
         QListIterator<InstallData> it2( installList );
         for ( ; it2.current(); ++it2 )
         {
             pIpkg->setPackage( it2.current()->packageName );
             pIpkg->runIpkg();
         }
 
         flags |= FORCE_REINSTALL;
         QListIterator<InstallData> it3( updateList );
         for ( ; it3.current() ; ++it3 )
         {
             idata = it3.current();
             if ( idata->option == "R" )
                 pIpkg->setOption( "reinstall" );
             else
                 pIpkg->setOption( "upgrade" );
             pIpkg->setDestination( idata->destination->getDestinationName() );
             pIpkg->setDestinationDir( idata->destination->getDestinationPath() );
             pIpkg->setPackage( idata->packageName );
 
             int tmpFlags = flags;
             if ( idata->destination->linkToRoot() && idata->recreateLinks )
                 tmpFlags |= MAKE_LINKS;
             pIpkg->setFlags( tmpFlags, infoLevel );
             pIpkg->runIpkg();
         }
 
         delete pIpkg;
         pIpkg = 0;
 */
     }
 }
 
 
 void InstallDlgImpl :: displayText(const QString &text )
 {
     QString newtext = QString( "%1\n%2" ).arg( output->text() ).arg( text );
 
     /* Set a max line count for the QMultiLineEdit, as users have reported
      * performance issues when line count gets extreme.
      */
     if(output->numLines() >= MAXLINES)
         output->removeLine(0);
     output->setText( newtext );
     output->setCursorPosition( output->numLines(), 0 );
 }
 
 
 void InstallDlgImpl :: displayAvailableSpace( const QString &text )
 {
     Destination *d = dataMgr->getDestination( text );
     QString destDir = d->getDestinationPath();
 
     long blockSize = 0;
     long totalBlocks = 0;
     long availBlocks = 0;
     QString space;
     if ( Utils::getStorageSpace( (const char *)destDir, &blockSize, &totalBlocks, &availBlocks ) )
     {
         long mult = blockSize / 1024;
         long div = 1024 / blockSize;
 
         if ( !mult ) mult = 1;
         if ( !div ) div = 1;
         long avail = availBlocks * mult / div;
 
         space = tr( "%1 Kb" ).arg( avail );
     }
     else
         space = tr( "Unknown" );
 
     if ( txtAvailableSpace )
         txtAvailableSpace->setText( space );
 }
 
 void InstallDlgImpl :: ipkgFinished()
 {
     InstallData *item;
     if ( firstPackage )
         item = packages.first();
     else
     {
         // Create symlinks if necessary before moving on to next package
         pIpkg->createSymLinks();
 
         item = packages.next();
     }
 
     firstPackage = FALSE;
     if ( item )
     {
         pIpkg->setPackage( item->packageName );
         int tmpFlags = flags;
 
         if ( item->option == "I" )
         {
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp
index 866afed..0091a3b 100644
--- a/noncore/settings/aqpkg/ipkg.cpp
+++ b/noncore/settings/aqpkg/ipkg.cpp
@@ -1,489 +1,490 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/oprocess.h>
 
 #ifdef QWS
 #include <qpe/qpeapplication.h>
 #else
 #include <qapplication.h>
 #endif
 #include <qdir.h>
 #include <qfile.h>
 #include <qtextstream.h>
 
 #include "utils.h"
 #include "ipkg.h"
 #include "global.h"
 
+using namespace Opie::Core;
 Ipkg :: Ipkg()
 {
     proc = 0;
 }
 
 Ipkg :: ~Ipkg()
 {
 }
 
 // Option is what we are going to do - install, upgrade, download, reinstall
 // package is the package name to install - either a fully qualified path and ipk
 //   file (if stored locally) or just the name of the package (for a network package)
 // packageName is the package name - (for a network package this will be the same as
 //    package parameter)
 // dest is the destination alias (from ipk.conf)
 // destDir is the dir that the destination alias points to (used to link to root)
 // flags is the ipkg options flags
 // dir is the directory to run ipkg in (defaults to "")
 void Ipkg :: runIpkg()
 {
     error = false;
     QStringList commands;
 
     QDir::setCurrent( "/tmp" );
 
     if ( runtimeDir != "" )
     {
         commands << "cd ";
         commands << runtimeDir;
         commands << ";";
     }
     commands << "ipkg" << "-V" << QString::number( infoLevel ) << "-force-defaults";
 
     // only set the destination for an install operation
     if ( option == "install" )
         commands << "-dest" << destination;
 
 
     if ( option != "update" && option != "download" )
     {
         if ( flags & FORCE_DEPENDS )
             commands << "-force-depends";
         if ( flags & FORCE_REINSTALL  )
             commands << "-force-reinstall";
         if ( flags & FORCE_REMOVE )
             commands << "-force-removal-of-essential-packages";
         if ( flags & FORCE_OVERWRITE )
             commands << "-force-overwrite";
         if ( infoLevel == 3 )
             commands << "-verbose_wget";
 
         // Handle make links
         // Rules - If make links is switched on, create links to root
         // if destDir is NOT /
         if ( flags & MAKE_LINKS )
         {
             // If destDir == / turn off make links as package is being insalled
             // to root already.
             if ( destDir == "/" )
                 flags ^= MAKE_LINKS;
         }
     }
 
 #ifdef X86
     commands << "-f";
     commands << IPKG_CONF;
 #endif
 
 
     if ( option == "reinstall" )
         commands << "install";
     else
         commands << option;
     if ( package != "" )
         commands << package;
 
 
     if ( package != "" )
         emit outputText( tr( "Dealing with package %1" ).arg( package) );
 
     qApp->processEvents();
 
     // If we are removing, reinstalling or upgrading packages and make links option is selected
     // create the links
     if ( option == "remove" || option == "reinstall" || option == "upgrade" )
     {
         createLinks = false;
         if ( flags & MAKE_LINKS )
         {
             emit outputText( tr( "Removing symbolic links...\n" ) );
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
             emit outputText( QString( " " ) );
         }
     }
 
     // Execute command
     dependantPackages = new QList<QString>;
     dependantPackages->setAutoDelete( true );
 
     executeIpkgCommand( commands, option );
 
 }
 
 void Ipkg :: createSymLinks()
 {
     if ( option == "install" || option == "reinstall" || option == "upgrade" )
     {
         // If we are not removing packages and make links option is selected
         // create the links
         createLinks = true;
         if ( flags & MAKE_LINKS )
         {
             emit outputText( " " );
             emit outputText( tr( "Creating symbolic links for %1." ).arg( package) );
 
             linkPackage( Utils::getPackageNameFromIpkFilename( package ), destination, destDir );
 
             // link dependant packages that were installed with this release
             QString *pkg;
             for ( pkg = dependantPackages->first(); pkg != 0; pkg = dependantPackages->next() )
             {
                 if ( *pkg == package )
                     continue;
                 emit outputText( " " );
                 emit outputText( tr( "Creating symbolic links for %1" ).arg( *pkg ) );
                 linkPackage( Utils::getPackageNameFromIpkFilename( *pkg ), destination, destDir );
             }
         }
     }
 
     delete dependantPackages;
 
     emit outputText( tr("Finished") );
     emit outputText( "" );
 }
 
 void Ipkg :: removeStatusEntry()
 {
     QString statusFile = destDir;
     if ( statusFile.right( 1 ) != "/" )
         statusFile.append( "/" );
     statusFile.append( "usr/lib/ipkg/status" );
     QString outStatusFile = statusFile;
     outStatusFile.append( ".tmp" );
 
     emit outputText( "" );
     emit outputText( tr("Removing status entry...") );
     QString tempstr = tr("status file - ");
     tempstr.append( statusFile );
     emit outputText( tempstr );
     tempstr = tr("package - ");
     tempstr.append( package );
     emit outputText( tempstr );
 
     QFile readFile( statusFile );
     QFile writeFile( outStatusFile );
 
     if ( !readFile.open( IO_ReadOnly ) )
     {
         tempstr = tr("Couldn't open status file - ");
         tempstr.append( statusFile );
         emit outputText( tempstr );
         return;
     }
 
     if ( !writeFile.open( IO_WriteOnly ) )
     {
         tempstr = tr("Couldn't create tempory status file - ");
         tempstr.append( outStatusFile );
         emit outputText( tempstr );
         return;
     }
 
     int i = 0;
 
     QTextStream readStream( &readFile );
     QTextStream writeStream( &writeFile );
     QString line;
 
     char k[21];
     char v[1001];
     QString key;
     QString value;
 
     while ( !readStream.atEnd() )
     {
         //read new line
         line = readStream.readLine();
 
         if ( line.contains( ":", TRUE ) )
         {
             //grep key and value from line
             k[0] = '\0';
             v[0] = '\0';
             sscanf( line, "%[^:]: %[^\n]", k, v );
             key = k;
             value = v;
             key = key.stripWhiteSpace();
             value = value.stripWhiteSpace();
         } else {
             key = "";
             value = "";
         }
 
         if ( key == "Package" && value == package )
         {
             //skip lines from the deleted package
             while ( ( !readStream.atEnd() ) && ( line.stripWhiteSpace() != "" ) )
             {
                 line = readStream.readLine();
             }
         } else {
 
             //write other lines into the tempfile
             writeStream << line << "\n";
 
             // Improve UI responsiveness
             i++;
             if ( ( i % 50 ) == 0 )
                 qApp->processEvents();
         }
     }
 
     readFile.close();
     writeFile.close();
 
     // Remove old status file and put tmp stats file in its place
     remove( statusFile );
     rename( outStatusFile, statusFile );
  }
 
 int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
 {
     // If one is already running - should never be but just to be safe
     if ( proc )
     {
         delete proc;
         proc = 0;
     }
 
     // OK we're gonna use OProcess to run this thing
     proc = new OProcess();
     aborted = false;
 
 
     // Connect up our slots
-    connect(proc, SIGNAL(processExited(OProcess*)),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processFinished()));
 
-    connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStdout(OProcess*,char*,int)));
 
-    connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStderr(OProcess*,char*,int)));
 
     for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
     {
          *proc << (*it).latin1();
     }
 
     // Start the process going
     finished = false;
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All))
     {
         emit outputText( tr("Couldn't start ipkg process" ) );
     }
 }
 
 void Ipkg::commandStdout(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr = lineStr.left( buflen );
     emit outputText( lineStr );
 
     // check if we are installing dependant packages
     if ( option == "install" || option == "reinstall" )
     {
         // Need to keep track of any dependant packages that get installed
         // so that we can create links to them as necessary
         if ( lineStr.startsWith( "Installing " ) )
         {
             int start = lineStr.find( " " ) + 1;
             int end = lineStr.find( " ", start );
             QString *package = new QString( lineStr.mid( start, end-start ) );
             dependantPackages->append( package );
         }
     }
     else if ( option == "remove" && !( flags & FORCE_DEPENDS ) &&
               lineStr.find( "is depended upon by packages:" ) != -1 )
     {
         // Ipkg should send this to STDERR, but doesn't - so trap here
         error = true;
     }
 
     buffer[0] = '\0';
 }
 
 void Ipkg::commandStderr(OProcess*, char *buffer, int buflen)
 {
     QString lineStr = buffer;
     if ( lineStr[buflen-1] == '\n' )
         buflen --;
     lineStr=lineStr.left( buflen );
     emit outputText( lineStr );
     buffer[0] = '\0';
     error = true;
 }
 
 void Ipkg::processFinished()
 {
     // Finally, if we are removing a package, remove its entry from the <destdir>/usr/lib/ipkg/status file
     // to workaround an ipkg bug which stops reinstall to a different location
 
     if ( !error && option == "remove" )
         removeStatusEntry();
 
     delete proc;
     proc = 0;
     finished = true;
 
     emit ipkgFinished();
 }
 
 
 void Ipkg :: abort()
 {
     if ( proc )
     {
         proc->kill();
         aborted = true;
     }
 }
 
 void Ipkg :: linkPackage( const QString &packFileName, const QString &dest, const QString &destDir )
 {
     if ( dest == "root" || dest == "/" )
         return;
 
     qApp->processEvents();
     QStringList *fileList = getList( packFileName, destDir );
     qApp->processEvents();
     processFileList( fileList, destDir );
     delete fileList;
 }
 
 QStringList* Ipkg :: getList( const QString &packageFilename, const QString &destDir )
 {
     QString packageFileDir = destDir;
     packageFileDir.append( "/usr/lib/ipkg/info/" );
     packageFileDir.append( packageFilename );
     packageFileDir.append( ".list" );
     QFile f( packageFileDir );
 
     if ( !f.open(IO_ReadOnly) )
     {
         // Couldn't open from dest, try from /
         f.close();
 
         packageFileDir = "/usr/lib/ipkg/info/";
         packageFileDir.append( packageFilename );
         packageFileDir.append( ".list" );
         f.setName( packageFileDir );
         if ( ! f.open(IO_ReadOnly) )
         {
             QString tempstr = tr("Could not open :");
             tempstr.append( packageFileDir );
             emit outputText( tempstr );
             return (QStringList*)0;
         }
     }
     QStringList *fileList = new QStringList();
     QTextStream t( &f );
     while ( !t.eof() )
         *fileList += t.readLine();
 
     f.close();
     return fileList;
 }
 
 void Ipkg :: processFileList( const QStringList *fileList, const QString &destDir )
 {
     if ( !fileList || fileList->isEmpty() )
         return;
 
     QString baseDir = ROOT;
 
     if ( createLinks == true )
     {
         for ( uint i=0; i < fileList->count(); i++ )
         {
             processLinkDir( (*fileList)[i], baseDir, destDir );
             qApp->processEvents();
         }
     }
     else
     {
         for ( int i = fileList->count()-1; i >= 0 ; i-- )
         {
             processLinkDir( (*fileList)[i], baseDir, destDir );
             qApp->processEvents();
         }
     }
 }
 
 void Ipkg :: processLinkDir( const QString &file, const QString &destDir, const QString &baseDir )
 {
 
     QString sourceFile = baseDir;
     sourceFile.append( file );
 
     QString linkFile = destDir;
     if ( file.startsWith( "/" ) && destDir.right( 1 ) == "/" )
     {
         linkFile.append( file.mid( 1 ) );
     }
     else
     {
         linkFile.append( file );
     }
     QString text;
     if ( createLinks )
     {
         // If this file is a directory (ends with a /) and it doesn't exist,
         // we need to create it
         if ( file.right(1) == "/" )
         {
             QFileInfo f( linkFile );
             if ( !f.exists() )
             {
                 QString tempstr = tr("Creating directory ");
                 tempstr.append( linkFile );
                 emit outputText( tempstr );
                 QDir d;
                 d.mkdir( linkFile, true );
             }
 //            else
 //                emit outputText( QString( "Directory " ) + linkFile + " already exists" );
 
         }
         else
         {
             int rc = symlink( sourceFile, linkFile );
             text = ( rc == 0 ? tr( "Linked %1 to %2" ) : tr( "Failed to link %1 to %2" ) ).
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h
index f892038..e216d17 100644
--- a/noncore/settings/aqpkg/ipkg.h
+++ b/noncore/settings/aqpkg/ipkg.h
@@ -1,104 +1,104 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef IPKG_H
 #define IPKG_H
 
 
 /**
   *@author Andy Qua
   */
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qlist.h>
 
 #define FORCE_DEPENDS                           0x0001
 #define FORCE_REMOVE                            0x0002
 #define FORCE_REINSTALL                         0x0004
 #define FORCE_OVERWRITE                         0x0008
 #define MAKE_LINKS                              0x0010
 #define VERBOSE_WGET                            0x0020
 
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
 
 class Ipkg : public QObject
 {
     Q_OBJECT
 public:
     Ipkg();
     ~Ipkg();
     void runIpkg();
     void createSymLinks();
 
     void setOption( const char *opt )               { option = opt; }
     void setPackage( const char *pkg )              { package = pkg; }
     void setDestination( const char *dest )         { destination = dest; }
     void setDestinationDir( const char *dir )       { destDir = dir; }
     void setFlags( int fl, int il )                 { flags = fl; infoLevel = il; }
     void setRuntimeDirectory( const char *dir )     { runtimeDir = dir; }
 
 signals:
     void outputText( const QString &text );
     void ipkgFinished();
 
 public slots:
-    void commandStdout(OProcess*, char *buffer, int buflen);
-    void commandStderr(OProcess*, char *buffer, int buflen);
+    void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen);
+    void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen);
     void processFinished();
     void abort();
 
 
 private:
     bool createLinks;
     bool aborted;
     bool error;
     QString option;
     QString package;
     QString destination;
     QString destDir;
     QString runtimeDir;
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
     int flags;
     int infoLevel;
     bool finished;
 
     QList<QString> *dependantPackages;
 
     int executeIpkgCommand( QStringList &cmd, const QString option );
     void removeStatusEntry();
     void linkPackage( const QString &packFileName, const QString &dest, const QString &destDir );
     QStringList* getList( const QString &packageFilename, const QString &destDir );
     void processFileList( const QStringList *fileList, const QString &destDir );
     void processLinkDir( const QString &file, const QString &baseDir, const QString &destDir );
 
 };
 
 #endif
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp
index b391714..d27479c 100644
--- a/noncore/settings/aqpkg/main.cpp
+++ b/noncore/settings/aqpkg/main.cpp
@@ -1,38 +1,39 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwin.h"
 
 #include <opie2/oapplicationfactory.h>
 
 /* be less intrusive for translation -zecke */
 extern QString LOCAL_SERVER;
 extern QString LOCAL_IPKGS;
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index b9dbb6e..2f35617 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -1,258 +1,260 @@
 /*
                              This file is part of the OPIE Project
 
                =.            Copyright (c)  2002 Andy Qua <andy.qua@blueyonder.co.uk>
              .=l.                                Dan Williams <drw@handhelds.org>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "settingsimpl.h"
 #include "global.h"
 
 /* OPIE */
 #include <opie2/otabwidget.h>
 #ifdef QWS
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #endif
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
 /* STD */
 #include <fstream>
 #include <algorithm>
 using namespace std;
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
         : QDialog( parent, name, modal, fl )
 {
     setCaption( tr( "Configuration" ) );
 
     // Setup layout to make everything pretty
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     // Setup tabs for all info
-    Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this );
+    OTabWidget *tabwidget = new OTabWidget( this );
     layout->addWidget( tabwidget );
 
     tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
     tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
     tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
     tabwidget->setCurrentTab( tr( "Servers" ) );
 
     dataMgr = dataManager;
     setupData();
     changed = false;
     newserver = false;
     newdestination = false;
 }
 
 SettingsImpl :: ~SettingsImpl()
 {
 }
 
 bool SettingsImpl :: showDlg()
 {
     QPEApplication::execDialog( this );
     if ( changed )
         dataMgr->writeOutIpkgConf();
 
     return changed;
 }
 
 QWidget *SettingsImpl :: initServerTab()
 {
     QWidget *control = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( control );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
 
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
 
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     servers = new QListBox( container );
     servers->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( servers, SIGNAL( highlighted(int) ), this, SLOT( editServer(int) ) );
     layout->addMultiCellWidget( servers, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( newServer() ) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( removeServer() ) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
 
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
     grplayout->addWidget( label, 0, 0 );
     servername = new QLineEdit( grpbox );
     grplayout->addWidget( servername, 0, 1 );
 
     label = new QLabel( tr( "Address:" ), grpbox );
     grplayout->addWidget( label, 1, 0 );
     serverurl = new QLineEdit( grpbox );
     grplayout->addWidget( serverurl, 1, 1 );
 
     active = new QCheckBox( tr( "Active Server" ), grpbox );
     grplayout->addMultiCellWidget( active, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL( clicked() ), this, SLOT( changeServerDetails() ) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 
     return control;
 }
 
 QWidget *SettingsImpl :: initDestinationTab()
 {
     QWidget *control = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( control );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
 
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
 
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     destinations = new QListBox( container );
     destinations->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( destinations, SIGNAL( highlighted(int) ), this, SLOT( editDestination(int) ) );
     layout->addMultiCellWidget( destinations, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( newDestination() ) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
     connect( btn, SIGNAL( clicked() ), this, SLOT( removeDestination() ) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Destination" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
 
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
     grplayout->addWidget( label, 0, 0 );
     destinationname = new QLineEdit( grpbox );
     grplayout->addWidget( destinationname, 0, 1 );
 
     label = new QLabel( tr( "Location:" ), grpbox );
     grplayout->addWidget( label, 1, 0 );
     destinationurl = new QLineEdit( grpbox );
     grplayout->addWidget( destinationurl, 1, 1 );
 
     linkToRoot = new QCheckBox( tr( "Link to root" ), grpbox );
     grplayout->addMultiCellWidget( linkToRoot, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL( clicked() ), this, SLOT( changeDestinationDetails() ) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 
     return control;
 }
 
 QWidget *SettingsImpl :: initProxyTab()
 {
     QWidget *control = new QWidget( this );
 
     QVBoxLayout *vb = new QVBoxLayout( control );
 
     QScrollView *sv = new QScrollView( control );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
 
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
 
     QGridLayout *layout = new QGridLayout( container );
     layout->setSpacing( 2 );
     layout->setMargin( 4 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 0, 0, 0, 1 );
     QVBoxLayout *grplayout = new QVBoxLayout( grpbox->layout() );
     txtHttpProxy = new QLineEdit( grpbox );
     grplayout->addWidget( txtHttpProxy );
     chkHttpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
     grplayout->addWidget( chkHttpProxyEnabled );
 
     grpbox = new QGroupBox( 0, Qt::Vertical, tr( "FTP Proxy" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 1, 1, 0, 1 );
     grplayout = new QVBoxLayout( grpbox->layout() );
     txtFtpProxy = new QLineEdit( grpbox );
     grplayout->addWidget( txtFtpProxy );
     chkFtpProxyEnabled = new QCheckBox( tr( "Enabled" ), grpbox );
     grplayout->addWidget( chkFtpProxyEnabled );
 
     QLabel *label = new QLabel( tr( "Username:" ), container );
     layout->addWidget( label, 2, 0 );
     txtUsername = new QLineEdit( container );
     layout->addWidget( txtUsername, 2, 1 );
 
     label = new QLabel( tr( "Password:" ), container );
     layout->addWidget( label, 3, 0 );
     txtPassword = new QLineEdit( container );
     layout->addWidget( txtPassword, 3, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), container );
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp
index c254865..6246fd5 100644
--- a/noncore/settings/backup/main.cpp
+++ b/noncore/settings/backup/main.cpp
@@ -1,8 +1,9 @@
 #include "backuprestore.h"
 #include "qnetworkprotocol.h"
 #include <qpe/qpeapplication.h>
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> )
 
diff --git a/noncore/settings/doctab/main.cpp b/noncore/settings/doctab/main.cpp
index 13591e0..75d9fcb 100644
--- a/noncore/settings/doctab/main.cpp
+++ b/noncore/settings/doctab/main.cpp
@@ -1,25 +1,26 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "doctab.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<DocTabSettings> )
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp
index 17f7433..ec8366e 100644
--- a/noncore/settings/language/main.cpp
+++ b/noncore/settings/language/main.cpp
@@ -1,25 +1,26 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "settings.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> )
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp
index 8261490..5d188a9 100644
--- a/noncore/settings/mediummount/main.cpp
+++ b/noncore/settings/mediummount/main.cpp
@@ -1,8 +1,9 @@
 #include "mediumwidget.h"
 #include "mediumglobal.h"
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> )
 
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp
index 4a2d17c..dbcdc17 100644
--- a/noncore/settings/netsystemtime/main.cpp
+++ b/noncore/settings/netsystemtime/main.cpp
@@ -1,33 +1,34 @@
 /*
                              This file is part of the OPIE Project
                =.
              .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index c995d6e..ba96f33 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -1,385 +1,387 @@
 /*
                              This file is part of the OPIE Project
                =.
              .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwindow.h"
 #include "timetabwidget.h"
 #include "formattabwidget.h"
 #include "settingstabwidget.h"
 #include "ntptabwidget.h"
 #include "predicttabwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/datebookdb.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 
 #if ( defined Q_WS_QWS || defined(_WS_QWS_) ) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qsocket.h>
 #include <qstring.h>
 #include <qtimer.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
 MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
     : QDialog( 0x0, 0x0, TRUE, 0 )
 {
     setCaption( tr( "SystemTime" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setMargin( 2 );
     layout->setSpacing( 4 );
 
     // Create main tabbed control
     mainWidget = new OTabWidget( this );
 
     // Default object pointers to null
     ntpProcess = 0x0;
     ntpTab = 0x0;
 
     // Add tab widgets
     mainWidget->addTab( timeTab = new TimeTabWidget( mainWidget ), "netsystemtime/DateTime", tr( "Time" ) );
     mainWidget->addTab( formatTab = new FormatTabWidget( mainWidget ), "netsystemtime/formattab", tr( "Format" ) );
     mainWidget->addTab( settingsTab = new SettingsTabWidget( mainWidget ), "SettingsIcon", tr( "Settings" ) );
     mainWidget->addTab( predictTab = new PredictTabWidget( mainWidget ), "netsystemtime/predicttab", tr( "Predict" ) );
     Config config( "ntp" );
     config.setGroup( "settings" );
     slotDisplayNTPTab( config.readBoolEntry( "displayNtpTab", FALSE ) );
     slotDisplayPredictTab( config.readBoolEntry( "displayPredictTab", FALSE ) );
 
     mainWidget->setCurrentTab( tr( "Time" ) );
     layout->addWidget( mainWidget );
 
     connect( qApp, SIGNAL(appMessage(const QCString&,const QByteArray&)),
         this, SLOT(slotQCopReceive(const QCString&,const QByteArray&)) );
 
 
     // Create NTP socket
     ntpSock = new QSocket( this );
     connect( ntpSock, SIGNAL(error(int)),SLOT(slotCheckNtp(int)) );
     slotProbeNTPServer();
 
     // Create timer for automatic time lookups
     ntpTimer = new QTimer( this );
 
     // Connect everything together
     connect( timeTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
     connect( timeTab, SIGNAL(tzChanged(const QString&)), predictTab, SLOT(slotTZChanged(const QString&)) );
     connect( timeTab, SIGNAL(getPredictedTime()), predictTab, SLOT(slotSetPredictedTime()) );
     connect( formatTab, SIGNAL(show12HourTime(int)), timeTab, SLOT(slotUse12HourTime(int)) );
     connect( formatTab, SIGNAL(dateFormatChanged(const DateFormat&)),
              timeTab, SLOT(slotDateFormatChanged(const DateFormat&)) );
     connect( formatTab, SIGNAL(weekStartChanged(int)), timeTab, SLOT(slotWeekStartChanged(int)) );
     connect( settingsTab, SIGNAL(ntpDelayChanged(int)), this, SLOT(slotNTPDelayChanged(int)) );
     connect( settingsTab, SIGNAL(displayNTPTab(bool)), this, SLOT(slotDisplayNTPTab(bool)) );
     connect( settingsTab, SIGNAL(displayPredictTab(bool)), this, SLOT(slotDisplayPredictTab(bool)) );
     connect( predictTab, SIGNAL(setTime(const QDateTime&)), this, SLOT(slotSetTime(const QDateTime&)) );
 
     // Do initial time server check
     slotNTPDelayChanged( config.readNumEntry( "ntpRefreshFreq", 1440 ) );
     slotCheckNtp( -1 );
 
     // Display app
     //showMaximized();
     (void)new QPEDialogListener(this);
 }
 
 MainWindow::~MainWindow()
 {
     if ( ntpProcess )
         delete ntpProcess;
 }
 
 void MainWindow::accept()
 {
     // Turn off the screensaver (Note: needs to be encased in { } so that it deconstructs and sends)
     {
         QCopEnvelope disableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
         disableScreenSaver << 0 << 0 << 0;
     }
 
     // Update the systemtime
     timeTab->saveSettings( TRUE );
 
     // Save format options
     formatTab->saveSettings( TRUE );
 
     // Save settings options
     settingsTab->saveSettings();
 
     // Since time has changed quickly load in the DateBookDB to allow the alarm server to get a better
     // grip on itself (example re-trigger alarms for when we travel back in time).
     DateBookDB db;
 
     // Turn back on the screensaver
     QCopEnvelope enableScreenSaver( "QPE/System", "setScreenSaverIntervals(int,int,int)" );
     enableScreenSaver << -1 << -1 << -1;
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::reject()
 {
     // Reset time settings
     timeTab->saveSettings( FALSE );
 
     // Send notifications but do not save settings
     formatTab->saveSettings( FALSE );
 
     // Exit app
     qApp->quit();
 }
 
 void MainWindow::runNTP()
 {
     if ( !ntpDelayElapsed() && ntpInteractive )
     {
         QString msg = tr( "You asked for a delay of %1 minutes, but only %2 minutes elapsed since last lookup.<br>Continue?" ).arg( QString::number( ntpDelay ) ).arg( QString::number( _lookupDiff / 60 ) );
 
         switch (
             QMessageBox::warning( this, tr( "Continue?" ), msg, QMessageBox::Yes, QMessageBox::No )
             )
         {
             case QMessageBox::Yes: break;
             case QMessageBox::No:  return;
             default: return;
         }
     }
 
     QString srv = settingsTab->ntpServer();
 
     // Send information to time server tab if enabled
     if ( ntpTabEnabled )
     {
         ntpTab->setStartTime( QDateTime::currentDateTime().toString() );
         QString output = tr( "Running:\nntpdate " );
         output.append( srv );
         ntpTab->addNtpOutput( output );
     }
 
     if ( !ntpProcess )
     {
         ntpProcess = new OProcess();
-        connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
+        connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
                  this, SLOT(slotNtpOutput(OProcess*,char*,int)) );
-        connect( ntpProcess, SIGNAL(processExited(OProcess*)),
+        connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)),
                  this, SLOT(slotNtpFinished(OProcess*)) );
     }
 
     else
         ntpProcess->clearArguments();
 
     *ntpProcess << "ntpdate"  << srv;
     bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput );
     if ( !ret )
     {
         QMessageBox::critical( this, tr( "Error" ), tr( "Error while getting time from network." ) );
         if ( ntpTabEnabled )
             ntpTab->addNtpOutput( tr( "Error while executing ntpdate" ) );
     }
 }
 
 bool MainWindow::ntpDelayElapsed()
 {
     // Determine if time elapsed is greater than time delay
     Config config( "ntp" );
     config.setGroup( "lookups" );
     _lookupDiff = TimeConversion::toUTC( QDateTime::currentDateTime() ) - config.readNumEntry( "time", 0 );
     if ( _lookupDiff < 0 )
         return true;
     return ( _lookupDiff - ( ntpDelay * 60) ) > 0;
 }
 
 void MainWindow::slotSetTime( const QDateTime &dt )
 {
     timeTab->setDateTime( dt );
 }
 
 void MainWindow::slotQCopReceive( const QCString &msg, const QByteArray & )
 {
     if ( msg == "ntpLookup(QString)" )
     {
         ntpInteractive = false;
         runNTP();
     }
     if ( msg == "setPredictedTime(QString)" )
     {
         //setPredictTime();
     }
 }
 
 void MainWindow::slotDisplayNTPTab( bool display )
 {
     ntpTabEnabled = display;
 
     // Create widget if it hasn't needed
     if ( display && !ntpTab )
     {
         ntpTab = new NTPTabWidget( mainWidget );
         connect( ntpTab, SIGNAL(getNTPTime()), this, SLOT(slotGetNTPTime()) );
     }
 
     // Display/hide tab
     display ? mainWidget->addTab( ntpTab, "netsystemtime/ntptab", tr( "Time Server" ) )
             : mainWidget->removePage( ntpTab );
 }
 
 void MainWindow::slotDisplayPredictTab( bool display )
 {
     predictTabEnabled = display;
 
     // Create widget if it hasn't needed
     if ( display && !predictTab )
     {
     }
     // Display/hide tab
     display ? mainWidget->addTab( predictTab, "netsystemtime/predicttab", tr( "Predict" ) )
             : mainWidget->removePage( predictTab );
 }
 
 void MainWindow::slotGetNTPTime()
 {
     ntpInteractive = TRUE;
     runNTP();
 }
 
 void MainWindow::slotTimerGetNTPTime()
 {
     ntpInteractive = FALSE;
     runNTP();
 }
 
 void MainWindow::slotProbeNTPServer()
 {
     ntpSock->connectToHost( settingsTab->ntpServer(), 123 );
 }
 
 void MainWindow::slotNtpOutput( OProcess *, char *buffer, int buflen )
 {
     QString output = QString( buffer ).left( buflen );
     ntpOutput.append( output );
 
     if ( ntpTabEnabled )
         ntpTab->addNtpOutput( output );
 }
 
 void MainWindow::slotNtpFinished( OProcess *p )
 {
     QString output;
     QDateTime dt = QDateTime::currentDateTime();
 
     //  Verify run was successful
     if ( p->exitStatus() != 0 || !p->normalExit() )
     {
         if ( isVisible() && ntpInteractive )
         {
             output = tr( "Error while getting time from\n server: " );
             output.append( settingsTab->ntpServer() );
             QMessageBox::critical(this, tr( "Error" ), output );
         }
     //      slotCheckNtp(-1);
         return;
     }
 
     // Set controls on time tab to new time value
     timeTab->setDateTime( dt );
 
     // Write out lookup information
     Config config( "ntp" );
     config.setGroup( "lookups" );
     int lastLookup = config.readNumEntry( "time", 0 );
     int lookupCount = config.readNumEntry( "count", 0 );
     bool lastNtp = config.readBoolEntry( "lastNtp", FALSE );
     int time = TimeConversion::toUTC( QDateTime::currentDateTime() );
     config.writeEntry( "time", time );
 
     // Calculate new time/time shift
     QString _offset = "offset";
     QString _sec = "sec";
     QRegExp _reOffset = QRegExp( _offset );
     QRegExp _reEndOffset = QRegExp( _sec );
     int posOffset = _reOffset.match(  ntpOutput );
     int posEndOffset = _reEndOffset.match(  ntpOutput, posOffset );
     posOffset += _offset.length() + 1;
     QString diff =  ntpOutput.mid( posOffset, posEndOffset - posOffset - 1 );
 
     float timeShift = diff.toFloat();
     if ( timeShift == 0.0 )
         return;
     int secsSinceLast = time - lastLookup;
     output = tr( "%1 seconds").arg(QString::number( timeShift ));
 
     // Display information on time server tab
     if ( ntpTabEnabled )
     {
         ntpTab->setTimeShift( output );
         ntpTab->setNewTime( dt.toString() );
     }
 
     if ( lastNtp && lastLookup > 0 && secsSinceLast > 60 * ntpDelay )
     {
         QString grpname = QString( "lookup_" ).append( QString::number( lookupCount ) );
         config.setGroup( grpname );
         lookupCount++;
         predictTab->setShiftPerSec( timeShift / secsSinceLast );
         config.writeEntry( "secsSinceLast", secsSinceLast );
         config.writeEntry( "timeShift", QString::number( timeShift ) );
         config.setGroup( "lookups" );
         config.writeEntry( "count", lookupCount );
         config.writeEntry( "lastNtp", TRUE );
     }
 }
 
 void MainWindow::slotNTPDelayChanged( int delay )
 {
     ntpTimer->changeInterval( delay * 1000 * 60 );
     ntpDelay = delay;
 }
 
 void MainWindow::slotCheckNtp( int i )
 {
     if ( i == 0 )
     {
         if ( ntpDelayElapsed() )
         {
             runNTP();
             disconnect( ntpTimer, SIGNAL(timeout()), this, SLOT(slotProbeNTPServer()) );
             connect( ntpTimer, SIGNAL(timeout()), SLOT(slotTimerGetNTPTime()) );
         }
         else
         {
             disconnect(ntpTimer, SIGNAL(timeout()), this, SLOT(slotTimerGetNTPTime()) );
             connect(ntpTimer, SIGNAL(timeout()), SLOT(slotProbeNTPServer()) );
         }
     }
     else
     {
         predictTab->slotPredictTime();
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h
index d4a9713..8701803 100644
--- a/noncore/settings/netsystemtime/mainwindow.h
+++ b/noncore/settings/netsystemtime/mainwindow.h
@@ -1,99 +1,98 @@
 /*
                              This file is part of the OPIE Project
                =.
              .=l.            Copyright (c)  2002 OPIE team <opie@handhelds.org?>
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qdialog.h>
 
 #include <opie2/oprocess.h>
 #include <opie2/otabwidget.h>
 
 class TimeTabWidget;
 class FormatTabWidget;
 class SettingsTabWidget;
 class NTPTabWidget;
 class PredictTabWidget;
 
-using Opie::OTabWidget;
 
 class QDateTime;
 class QSocket;
 class QTimer;
 
 class MainWindow : public QDialog
 {
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0,  bool modal = FALSE,WFlags f = 0);
     ~MainWindow();
     static QString appName() { return QString::fromLatin1("systemtime"); }
 
 protected:
     void accept();
     void reject();
 
 private:
-    OTabWidget *mainWidget;
+    Opie::Ui::OTabWidget *mainWidget;
 
     TimeTabWidget     *timeTab;
     FormatTabWidget   *formatTab;
     SettingsTabWidget *settingsTab;
     NTPTabWidget      *ntpTab;
     PredictTabWidget  *predictTab;
 
     bool ntpTabEnabled;
     bool predictTabEnabled;
 
-    OProcess *ntpProcess;
+    Opie::Core::OProcess *ntpProcess;
     QTimer   *ntpTimer;
     QSocket  *ntpSock;
     int       ntpDelay;
     bool      ntpInteractive;
     QString   ntpOutput;
     int       _lookupDiff;
 
     void runNTP();
     bool ntpDelayElapsed();
 
 private slots:
     void slotSetTime( const QDateTime & );
     void slotQCopReceive( const QCString &, const QByteArray & );
     void slotDisplayNTPTab( bool );
     void slotDisplayPredictTab( bool );
     void slotGetNTPTime();
     void slotTimerGetNTPTime();
     void slotProbeNTPServer();
-    void slotNtpOutput( OProcess *, char *, int );
-    void slotNtpFinished( OProcess* );
+    void slotNtpOutput( Opie::Core::OProcess *, char *, int );
+    void slotNtpFinished( Opie::Core::OProcess* );
     void slotNTPDelayChanged( int );
     void slotCheckNtp( int );
 };
 
 #endif
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 05340e4..7c2f85c 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -1,206 +1,208 @@
 #include "interfacesetupimp.h"
 #include "interface.h"
 
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 
 #include <qmessagebox.h>
 
 #include <opie2/oprocess.h>
 
 #ifdef QWS
 #include <opie2/owait.h>
 #include <qpe/global.h>
 #include <qapplication.h>
 #endif
 
 #define DNSSCRIPT "changedns"
 
 /**
  * Constuctor.  Set up the connection. A profile must be set.
  */
+using namespace Opie::Ui;
+using namespace Opie::Core;
 InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
   if (j == 0) {
     delInterfaces = true;
     interfaces = new Interfaces;
   }
 }
 
 /**
  * Destructor
  */
 InterfaceSetupImp::~InterfaceSetupImp(){
   if(delInterfaces) {
     delete interfaces;
   }
 }
 
 /**
  * Save the current settings, then write out the interfaces file and close.
  */
 bool InterfaceSetupImp::saveChanges(){
   bool error;
   QString iface = interfaces->getInterfaceName(error);
   qDebug("InterfaceSetupImp::saveChanges saves interface %s", iface.latin1() );
   if(!saveSettings())
     return false;
 
   interfaces->write();
 
   if (interface->getStatus()) {
     QString ifup;
     ifup += "ifdown ";
     ifup += iface;
     ifup += "; ifup ";
     ifup += iface;
     ifup += ";";
 
     OProcess restart;
     restart << "sh";
     restart << "-c";
     restart << ifup;
 
     OWait *owait = new OWait();
     Global::statusMessage( tr( "Restarting interface" ) );
 
     owait->show();
     qApp->processEvents();
 
     if (!restart.start(OProcess::Block, OProcess::NoCommunication) ) {
       qWarning("unstable to spawn ifdown/ifup");
     }
 
     owait->hide();
     delete owait;
 
     interface->refresh();
   }
   return true;
 }
 
 /**
  * Save the settings for the current Interface.
  * @return bool true if successful, false otherwise
  */
 bool InterfaceSetupImp::saveSettings(){
   // eh can't really do anything about it other then return. :-D
   if(!interfaces->isInterfaceSet())
     return true;
 
   bool error = false;
   // Loopback case
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
     return true;
   }
 
   if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
    QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
    return false;
   }
   // DHCP
   if(dhcpCheckBox->isChecked()) {
     interfaces->setInterfaceMethod(INTERFACES_METHOD_DHCP);
     interfaces->removeInterfaceOption("address");
     interfaces->removeInterfaceOption("netmask");
     interfaces->removeInterfaceOption("gateway");
     interfaces->removeInterfaceOption("up "DNSSCRIPT" -a ");
     interfaces->removeInterfaceOption("down "DNSSCRIPT" -r ");
   } else{
     interfaces->setInterfaceMethod("static");
     interfaces->setInterfaceOption("address", ipAddressEdit->text());
     interfaces->setInterfaceOption("netmask", subnetMaskEdit->text());
     interfaces->setInterfaceOption("gateway", gatewayEdit->text());
     if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
       QString dns = firstDNSLineEdit->text() + " " + secondDNSLineEdit->text();
       interfaces->setInterfaceOption("up "DNSSCRIPT" -a ", dns);
       interfaces->setInterfaceOption("down "DNSSCRIPT" -r ", dns);
     }else{
         interfaces->removeInterfaceOption("up "DNSSCRIPT" -a ");
         interfaces->removeInterfaceOption("down "DNSSCRIPT" -r");
     }
   }
 
   // IP Information
   interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
   return true;
 }
 
 /**
  * The Profile has changed.
  * @param QString profile the new profile.
  */
 void InterfaceSetupImp::setProfile(const QString &profile){
    /*
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
     staticGroupBox->hide();
     dhcpCheckBox->hide();
     leaseTime->hide();
     leaseHoursLabel->hide();
   }
   */
 
   QString newInterfaceName = interface->getInterfaceName();
   if(profile.length() > 0)
     newInterfaceName += "_" + profile;
   // See if we have to make a interface.
   if(!interfaces->setInterface(newInterfaceName)){
     // Add making for this new interface if need too
     if(profile != ""){
       interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName);
       if(!interfaces->setMapping(interface->getInterfaceName())){
         interfaces->addMapping(interface->getInterfaceName());
         if(!interfaces->setMapping(interface->getInterfaceName())){
       qDebug("InterfaceSetupImp: Added Mapping, but still can't setInterface.");
           return;
     }
       }
       interfaces->setMap("map", newInterfaceName);
       interfaces->setScript("getprofile.sh");
     }
     else{
       interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP);
       if(!interfaces->setInterface(newInterfaceName)){
         qDebug("InterfaceSetupImp: Added interface, but still can't setInterface.");
         return;
       }
     }
   }
 
   // We must have a valid interface to get this far so read some settings.
 
   // DHCP
   bool error = false;
   if(interfaces->getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
     dhcpCheckBox->setChecked(true);
   else
     dhcpCheckBox->setChecked(false);
 
   // IP Information
   autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
   QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
   qDebug("dns >%s<",dns.latin1());
   if(dns.contains(" ")){
     firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
     secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
   }else firstDNSLineEdit->setText(dns);
 
   ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
   subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
   if (subnetMaskEdit->text().isEmpty())
       subnetMaskEdit->setText( "255.255.255.0" );
   gatewayEdit->setText(interfaces->getInterfaceOption("gateway", error));
 
 
 
   qWarning("InterfaceSetupImp::setProfile(%s)\n", profile.latin1());
   qWarning("InterfaceSetupImp::setProfile: iface is %s\n", interfaces->getInterfaceName(error).latin1());
 
 }
 
 // interfacesetup.cpp
 
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp
index bc11ab4..e4153c3 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/main.cpp
@@ -1,6 +1,7 @@
 #include "mainwindowimp.h"
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
 
 
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 5db2d6b..281629c 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,12 +1,12 @@
 CONFIG   = qt warn_on debug quick-app
 HEADERS   = mainwindowimp.h addconnectionimp.h defaultmodule.h  module.h
 SOURCES   = main.cpp mainwindowimp.cpp addconnectionimp.cpp
-INCLUDEPATH += $(OPIEDIR)/include interfaces/
+INCLUDEPATH += $(OPIEDIR)/include interfaces/ .
 DEPENDPATH  += $(OPIEDIR)/include interfaces/ wlan/ ppp/
 LIBS        += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
 INTERFACES = mainwindow.ui addconnection.ui
 TARGET    = networksettings
 
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 95f4abe..80a9927 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -1,219 +1,220 @@
 #include "wlanimp.h"
 #include "interfacesetupimp.h"
 
 #include <qfile.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 
 #ifdef QWS
  #include <opie2/oprocess.h>
 #else
  #define OProcess KProcess
  #include <kprocess.h>
 #endif
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 
 /**
  * Constructor, read in the wireless.opts file for parsing later.
  */
+using namespace Opie::Core;
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Read in the config file.
   QString wlanFile = WIRELESS_OPTS;
   QFile file(wlanFile);
   if (file.open(IO_ReadOnly)){
     QTextStream stream( &file );
     QString line = "";
     while ( !stream.eof() ) {
       line += stream.readLine();
       line += "\n";
     }
     file.close();
     settingsFileText = QStringList::split("\n", line, true);
     parseSettingFile();
   }
   else
     qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
   connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
 }
 
 void WLANImp::typeChanged(int mod){
   networkChannel->setEnabled(mod);
   channelLabel->setEnabled(mod);
 }
 
 /**
  * Change the profile for both wireless settings and network settings.
  */
 void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
   parseSettingFile();
 }
 
 /**
  * Parses the settings file that was read in and gets any setting from it.
  */
 void WLANImp::parseSettingFile(){
   bool foundCase = false;
   bool found = false;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
     if((foundCase && line.contains("esac")) ||
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#'))
       found = true;
 
     if(line.contains(";;"))
       found = false;
     if(found){
       // write out scheme
       if(line.contains("ESSID=")){
         QString id = line.mid(line.find("ESSID=")+6, line.length());
         if(id == "any"){
           essAny->setChecked(false);
         }else{
           essAny->setChecked(true);
       essSpecificLineEdit->setText(id);
     }
       }
       if(line.contains("MODE=")){
         QString mode = line.mid(line.find("MODE=")+5, line.length());
         if(mode == "Managed"){
           networkType->setCurrentItem(0);
       channelLabel->setEnabled(false);
       networkChannel->setEnabled(false);
     }
     else{
       networkType->setCurrentItem(1);
           networkChannel->setEnabled(true);
       channelLabel->setEnabled(true);
     }
       }
       if(line.contains("#KEY0="))
         keyLineEdit0->setText(line.mid(6, line.length()));
       if(line.contains("#KEY1="))
         keyLineEdit1->setText(line.mid(6, line.length()));
       if(line.contains("#KEY2="))
         keyLineEdit2->setText(line.mid(6, line.length()));
       if(line.contains("#KEY3="))
         keyLineEdit3->setText(line.mid(6, line.length()));
 
       if(line.contains("KEY=")){
         wepEnabled->setChecked(true);
         QString key;
     if(line.right(5) == (" open")){
       key = line.mid(4, line.length()-5);
       authOpen->setChecked(true);
       authShared->setChecked(false);
     }
     else{
       authOpen->setChecked(false);
       authShared->setChecked(true);
       key = line.mid(4, line.length());
     }
         if(key == keyLineEdit0->text()) keyRadio0->setChecked(true);
     if(key == keyLineEdit1->text()) keyRadio1->setChecked(true);
     if(key == keyLineEdit2->text()) keyRadio2->setChecked(true);
     if(key == keyLineEdit3->text()) keyRadio3->setChecked(true);
       }
       if(line.contains("CHANNEL=")){
         networkChannel->setValue(line.mid(line.find("CHANNEL=")+8, line.length()).toInt());
       }
     }
   }
 }
 
 /**
  * Saves settings to the wireless.opts file using the current profile
  */
 void WLANImp::changeAndSaveSettingFile(){
   QString wlanFile = WIRELESS_OPTS;
   QFile::remove(wlanFile);
   QFile file(wlanFile);
 
   if (!file.open(IO_ReadWrite)){
     qDebug(QString("WLANImp::changeAndSaveSettingFile(): Can't open file: %1 for writing.").arg(wlanFile).latin1());
     return;
   }
 
   QTextStream stream( &file );
   bool foundCase = false;
   bool found = false;
   bool output = true;
   for ( QStringList::Iterator it = settingsFileText.begin(); it != settingsFileText.end(); ++it ) {
     QString line = (*it).simplifyWhiteSpace();
     if(line.contains("case"))
       foundCase = true;
     // See if we found our scheme to write or the sceme couldn't be found
     if((foundCase && line.contains("esac") && !found) ||
    (foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
       // write out scheme
       found = true;
       output = false;
 
       if(!line.contains("esac"))
         stream << line << "\n";
       if(!essAny->isChecked() == true){
         stream << "\tESSID=any\n";
     stream << "\tMODE=Managed\n";
       }
       else{
         stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
         stream << "\tMODE=" << ( networkType->currentItem() == 0  ? "Managed" : "ad-hoc") << '\n';
         stream << "\tCHANNEL=" << networkChannel->value() << "\n";
       }
 
       stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
       stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
       stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
       stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
 
       if(wepEnabled->isChecked()){
         stream << "\tKEY=\"";
         if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
         if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
         if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
         if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
     if(authOpen->isChecked())
       stream << " open";
     else
       stream << " restricted";
     stream << "\"\n";
       }
       stream << "\tRATE=auto\n";
       if(line.contains("esac"))
         stream << line << "\n";
     }
     if(line.contains(";;"))
       output = true;
     if(output && (*it).length() )
       stream << (*it) << '\n';
   }
   file.close();
 }
 
 /**
  * Check to see if the current config is valid
  * Save wireless.opts, save interfaces
  */
 void WLANImp::accept(){
   if(wepEnabled->isChecked()){
     if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
       QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
       return;
     }
   }
 
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index dd1db28..eeebe7f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -1,236 +1,238 @@
 #include "wlanimp2.h"
 #include "keyedit.h"
 #include "interfacesetupimp.h"
 
 #include "../interfaces/interface.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
 
 #include <qapplication.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qdialog.h>
 #include <qtextstream.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qspinbox.h>
 #include <qradiobutton.h>
 #include <qpushbutton.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qvbox.h>
 #include <qprogressbar.h>
 
 #ifdef QWS
  #include <qpe/resource.h>
  #include <opie2/oprocess.h>
  #include <opie2/onetwork.h>
  #include <opie2/opcap.h>
 #else
  #define OProcess KProcess
  #include <kprocess.h>
 #endif
 
 #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
 #define PREUP "/etc/network/if-pre-up.d/wireless-tools"
 
 /**
  * Constructor, read in the wireless.opts file for parsing later.
  */
+using namespace Opie::Net;
+using namespace Opie::Core;
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") {
   interfaces = new Interfaces();
   interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
   tabWidget->insertTab(interfaceSetup, "TCP/IP");
 
   // Check sanity - the existance of the wireless-tools if-pre-up script
   QFile file(QString(PREUP));
   if (file.exists()) {
     qWarning(QString("WLANImp: Unable to open /etc/network/if-pre-up.d/wireless-tools"));
   }
 
   connect( rescanButton, SIGNAL( clicked() ), this, SLOT( rescanNeighbourhood() ) );
   connect( netView, SIGNAL( clicked(QListViewItem*) ), this, SLOT( selectNetwork(QListViewItem*) ) );
   netView->setColumnAlignment( col_chn, AlignCenter );
   netView->setItemMargin( 3 );
   netView->setAllColumnsShowFocus( true );
 
 }
 
 WLANImp::~WLANImp() {
 //FIXME:  delete interfaces;
 }
 
 /**
  * Change the profile for both wireless settings and network settings.
  */
 void WLANImp::setProfile(const QString &profile){
   interfaceSetup->setProfile(profile);
   parseOpts();
 }
 
 void WLANImp::parseOpts() {
   bool error;
   QString opt;
 
   if (! interfaces->isInterfaceSet())
     return;
 
 
   opt = interfaces->getInterfaceOption("wireless_essid", error);
   if(opt == "any" || opt == "off" || opt.isNull()){
     essid->setEditText("any");
   } else {
     essid->setEditText(opt);
   }
 
   opt = interfaces->getInterfaceOption("wireless_mode", error).simplifyWhiteSpace();
 
   for ( int i = 0; i < mode->count(); i++)
       if ( mode->text( i ) == opt ) mode->setCurrentItem( i );
 
   opt = interfaces->getInterfaceOption("wireless_ap", error).simplifyWhiteSpace();
   if (! opt.isNull()) {
     specifyAp->setChecked(true);
     macEdit->setText(opt);
   }
 
   opt = interfaces->getInterfaceOption("wireless_channel", error).simplifyWhiteSpace();
   if (! opt.isNull()) {
     specifyChan->setChecked(true);
     networkChannel->setValue(opt.toInt());
   }
 
   opt = interfaces->getInterfaceOption("wireless_key", error).simplifyWhiteSpace();
   if (opt.isNull())
     opt = interfaces->getInterfaceOption("wireless_enc", error).simplifyWhiteSpace();
   parseKeyStr(opt);
 }
 
 void WLANImp::parseKeyStr(QString keystr) {
   int loc = 0;
   int index = 1;
   QString key;
   QStringList keys = QStringList::split(QRegExp("\\s+"), keystr);
   int enc = -1; // encryption state
 
   for (QStringList::Iterator it = keys.begin(); it != keys.end(); ++it) {
     if ((*it).left(3) == "off") {
       // encryption disabled
       enc = 0;
     } else if ((*it).left(2) == "on") {
       // encryption enabled
       enc = 1;
     } else if ((*it).left(4) == "open") {
       // open mode, accept non encrypted packets
       acceptNonEnc->setChecked(true);
     } else if ((*it).left(10) == "restricted") {
       // restricted mode, only accept encrypted packets
       rejectNonEnc->setChecked(true);
     } else if ((*it).left(3) == "key") {
       // new set of options
     } else if ((*it).left(1) == "[") {
       index = (*it).mid(1, 1).toInt();
       // switch current key to index
       switch (index) {
         case 1:
           keyRadio0->setChecked(true);
       break;
         case 2:
           keyRadio1->setChecked(true);
       break;
         case 3:
           keyRadio2->setChecked(true);
       break;
         case 4:
           keyRadio3->setChecked(true);
       break;
       }
     } else {
       // key
       key = (*it);
     }
     if (! key.isNull()) {
       if (enc == -1)
         enc = 1;
       QStringList::Iterator next = ++it;
       if (it == keys.end()) {
         break;
       }
       if ((*(next)).left(1) == "[") {
         // set key at index
         index = (*(next)).mid(1, 1).toInt();
       } else {
         index = 1;
       }
       switch (index) {
           case 1:
             keyLineEdit0->setText(key);
         break;
           case 2:
             keyLineEdit1->setText(key);
         break;
           case 3:
             keyLineEdit2->setText(key);
         break;
           case 4:
             keyLineEdit3->setText(key);
         break;
       }
       key = QString::null;
     }
   }
   if (enc == 1) {
     wepEnabled->setChecked(true);
   } else {
     wepEnabled->setChecked(false);
   }
 }
 
 /**
  * Check to see if the current config is valid
  * Save interfaces
  */
 void WLANImp::accept() {
   if (wepEnabled->isChecked()) {
     if ((keyRadio0->isChecked() && keyLineEdit0->text().isEmpty()) ||
         (keyRadio1->isChecked() && keyLineEdit1->text().isEmpty()) ||
         (keyRadio2->isChecked() && keyLineEdit2->text().isEmpty()) ||
         (keyRadio3->isChecked() && keyLineEdit3->text().isEmpty())) {
       QMessageBox::information(this, "Error", "Please enter a WEP key.", QMessageBox::Ok);
       return;
     }
   }
 
   if (essid->currentText().isEmpty()) {
     QMessageBox::information(this, "Error", "Please select/enter an ESSID.", QMessageBox::Ok);
     return;
   }
 
   if (specifyAp->isChecked() && macEdit->text().isEmpty()) {
     QMessageBox::information(this, "Error", "Please enter the MAC address of the Access Point.", QMessageBox::Ok);
     return;
   }
 
   // Try to save the interfaces settings.
   writeOpts();
 
   // Close out the dialog
 // FIXME:  QDialog::accept();
 }
 
 void WLANImp::writeOpts() {
     // eh can't really do anything about it other then return. :-D
     if(!interfaces->isInterfaceSet()){
         QMessageBox::warning(0,"Inface not set","should not happen!!!");
         return;
     }
     bool error = false;
 
     qDebug("setting wlan interface %s", interfaces->getInterfaceName( error ).latin1() );
 
     if (error)  QMessageBox::warning(0,"Inface not set","should not happen!!!");
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.h b/noncore/settings/networksettings/wlan/wlanimp2.h
index a777203..c3d1eee 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.h
+++ b/noncore/settings/networksettings/wlan/wlanimp2.h
@@ -1,52 +1,52 @@
 #ifndef WLANIMP_H
 #define WLANIMP_H
 
 #include "wlan.h"
 #include "interfaces.h"
 #include <qstringlist.h>
 #include <opie2/onetutils.h>
 
 class InterfaceSetupImp;
 class Interface;
 class Config;
-class OPacket;
+namespace Opie {namespace Net {class OPacket;}}
 class QListViewItem;
 
 const int col_mode= 0;
 const int col_ssid = 1;
 const int col_chn = 2;
 const int col_mac = 3;
 
 class WLANImp : public WLAN {
   Q_OBJECT
 
 public:
   WLANImp( QWidget* parent = 0, const char* name = 0, Interface *i=0, bool modal = FALSE, WFlags fl = 0 );
   ~WLANImp();
   void setProfile(const QString &profile);
 
 public slots:
   void rescanNeighbourhood();
   void selectNetwork( QListViewItem* );
 
 protected:
   void accept();
 
 private:
   void parseOpts();
   void writeOpts();
 
   void parseKeyStr(QString keystr);
 
-  void handlePacket( OPacket* );
-  void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac );
+  void handlePacket( Opie::Net::OPacket* );
+  void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const Opie::Net::OMacAddress& mac );
 
   InterfaceSetupImp *interfaceSetup;
   Interfaces *interfaces;
   Interface  *interface;
 
   QString currentProfile;
 };
 
 #endif
 
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index aedd972..4a55c10 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -1,301 +1,302 @@
 /*
                             This file is part of the OPIE Project
 
                =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
              .=l.
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "installdlg.h"
 
 #include <sys/vfs.h>
 
 #include <qapplication.h>
 #include <qcombobox.h>
 #include <qfileinfo.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmap.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 
 #include <opie2/ofiledialog.h>
 
 #include "opackagemanager.h"
 
+using namespace Opie::Ui;
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
                         OPackage::Command command1, QStringList *packages1,
                         OPackage::Command command2, QStringList *packages2,
                         OPackage::Command command3, QStringList *packages3 )
     : QWidget( 0x0 )
     , m_packman( pm )
     , m_numCommands( 0 )
     , m_currCommand( 0 )
 {
     // Save command/package list information
     if ( command1 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command1;
         m_packages[ m_numCommands ] = packages1;
         ++m_numCommands;
     }
     if ( command2 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command2;
         m_packages[ m_numCommands ] = packages2;
         ++m_numCommands;
     }
     if ( command3 != OPackage::NotDefined )
     {
         m_command[ m_numCommands ] = command3;
         m_packages[ m_numCommands ] = packages3;
         ++m_numCommands;
     }
 
     // Initialize UI
     if ( parent )
         parent->setCaption( caption );
 
     QGridLayout *layout = new QGridLayout( this, 4, 2, 2, 4 );
 
     if ( showDestInfo )
     {
         QLabel *label = new QLabel( tr( "Destination" ), this );
         layout->addWidget( label, 0, 0 );
         m_destination = new QComboBox( this );
         m_destination->insertStringList( *(m_packman->destinations()) );
         layout->addWidget( m_destination, 0, 1 );
         connect( m_destination, SIGNAL(highlighted(const QString&)),
                 this, SLOT(slotDisplayAvailSpace(const QString&)) );
 
         label = new QLabel( tr( "Space Avail" ), this );
         layout->addWidget( label, 1, 0 );
         m_availSpace = new QLabel( this );
         layout->addWidget( m_availSpace, 1, 1 );
 
         // TODO - select correct destination
         slotDisplayAvailSpace( m_destination->currentText() );
     }
     else
     {
         m_destination = 0x0;
         m_availSpace = 0x0;
     }
 
     QGroupBox *groupBox = new QGroupBox( 0, Qt::Vertical, tr( "Output" ), this );
     groupBox->layout()->setSpacing( 0 );
     groupBox->layout()->setMargin( 4 );
 
     QVBoxLayout *groupBoxLayout = new QVBoxLayout( groupBox->layout() );
     m_output = new QMultiLineEdit( groupBox );
     m_output->setReadOnly( true );
     groupBoxLayout->addWidget( m_output );
     layout->addMultiCellWidget( groupBox, 2, 2, 0, 1 );
 
     m_btnStart = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ), tr( "Start" ), this );
     layout->addWidget( m_btnStart, 3, 0 );
     connect( m_btnStart, SIGNAL(clicked()), this, SLOT(slotBtnStart()) );
 
     m_btnOptions = new QPushButton( Resource::loadPixmap( "SettingsIcon" ), tr( "Options" ), this );
     layout->addWidget( m_btnOptions, 3, 1 );
     connect( m_btnOptions, SIGNAL( clicked() ), this, SLOT(slotBtnOptions()) );
 
     // Display packages being acted upon in output widget
     for( int i = 0; i < m_numCommands; i++ )
     {
         if ( m_packages[ i ] )
         {
             QString lineStr = tr( "Packages to " );
 
             switch( m_command[ i ] )
             {
                 case OPackage::Install : lineStr.append( tr( "install" ) );
                     break;
                 case OPackage::Remove : lineStr.append( tr( "remove" ) );
                     break;
                 case OPackage::Upgrade : lineStr.append( tr( "upgrade" ) );
                     break;
                 case OPackage::Download : lineStr.append( tr( "download" ) );
                     break;
                 default :
                     break;
             };
             lineStr.append( ":\n" );
 
             for ( QStringList::Iterator it = m_packages[ i ]->begin(); it != m_packages[ i ]->end(); ++it )
             {
                 lineStr.append( QString( "\t%1\n" ).arg( ( *it ) ) );
             }
 
             m_output->append( lineStr );
         }
     }
 
     m_output->append( tr( "Press the start button to begin.\n" ) );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 
 }
 
 InstallDlg::~InstallDlg()
 {
     for( int i = 0; i < m_numCommands; i++ )
     {
         if ( m_packages[ i ] )
             delete m_packages[ i ];
     }
 }
 
 void InstallDlg::slotDisplayAvailSpace( const QString &destination )
 {
     // If available space is not displayed, exit
     if ( !m_availSpace )
         return;
 
     QString space = tr( "Unknown" );
 
     // Get destination
     OConfItem *dest = m_packman->findConfItem( OConfItem::Destination, destination );
 
     if ( dest )
     {
         // Calculate available space
         struct statfs fs;
         if ( !statfs( dest->value(), &fs ) )
         {
             long mult = fs.f_bsize / 1024;
             long div = 1024 / fs.f_bsize;
 
             if ( !mult ) mult = 1;
             if ( !div ) div = 1;
             long avail = fs.f_bavail * mult / div;
 
             space = tr( "%1 Kb" ).arg( avail );
         }
     }
 
     // Display available space
     m_availSpace->setText( space );
 }
 
 void InstallDlg::slotBtnStart()
 {
     QString btnText = m_btnStart->text();
     if ( btnText == tr( "Abort" ) )
     {
         // Prevent unexecuted commands from executing
         m_currCommand = 999;
 
         // Allow user to close dialog
         m_btnStart->setText( tr( "Close" ) );
         m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
         return;
     }
     else if ( btnText == tr( "Close" ) )
     {
         // TODO - force reload of package data
         emit closeInstallDlg();
         return;
     }
 
     // Start was clicked, start executing
     m_btnOptions->setEnabled( false );
     if ( m_numCommands > 1 )
     {
         m_btnStart->setText( tr( "Abort" ) );
         m_btnStart->setIconSet( Resource::loadPixmap( "close" ) );
     }
     else
     {
         m_btnStart->setEnabled( false );
     }
 
     QString dest;
     if ( m_destination )
         dest = m_destination->currentText();
 
     for ( m_currCommand = 0; m_currCommand < m_numCommands; m_currCommand++ )
     {
         // Execute next command
         m_packman->executeCommand( m_command[ m_currCommand ], m_packages[ m_currCommand ], dest,
                                    this, SLOT(slotOutput(char*)), true );
     }
 
     // All commands executed, allow user to close dialog
     m_btnStart->setEnabled( true );
     m_btnStart->setText( tr( "Close" ) );
     m_btnStart->setIconSet( Resource::loadPixmap( "enter" ) );
 
     m_btnOptions->setEnabled( true );
     m_btnOptions->setText( tr( "Save output" ) );
     m_btnOptions->setIconSet( Resource::loadPixmap( "save" ) );
 }
 
 void InstallDlg::slotBtnOptions()
 {
     QString btnText = m_btnOptions->text();
     if ( btnText == tr( "Options" ) )
     {
         // Display configuration dialog (only options tab is enabled)
         m_packman->configureDlg( true );
         return;
     }
 
     // Save output was clicked
     QMap<QString, QStringList> map;
     map.insert( tr( "All" ), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert(tr( "Text" ), text );
     text << "*";
     map.insert( tr( "All" ), text );
 
-    QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+    QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
     if( !filename.isEmpty() )
     {
         QString currentFileName = QFileInfo( filename ).fileName();
         DocLnk doc;
         doc.setType( "text/plain" );
         doc.setFile( filename );
         doc.setName( currentFileName );
         FileManager fm;
         fm.saveFile( doc, m_output->text() );
     }
 }
 
 void InstallDlg::slotOutput( char *msg )
 {
     // Allow processing of other events
     qApp->processEvents();
 
     QString lineStr = msg;
     if ( lineStr[lineStr.length()-1] == '\n' )
         lineStr.truncate( lineStr.length() - 1 );
     m_output->append( lineStr );
     m_output->setCursorPosition( m_output->numLines(), 0 );
 }
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index 18ed644..c050e1a 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -1,34 +1,35 @@
 /*
                             This file is part of the OPIE Project
 
                =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
              .=l.
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 84c6de4..592de3e 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -1,236 +1,237 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2003 Dan Williams <drw@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "oipkgconfigdlg.h"
 
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 #include <qscrollview.h>
 
 #include <qpe/resource.h>
 
+using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
     : QDialog( parent, QString::null, true )
     , m_ipkg( ipkg )
     , m_configs( 0x0 )
     , m_installOptions( installOptions )
     , m_serverNew( false )
     , m_serverCurrent( -1 )
     , m_destNew( false )
     , m_destCurrent( -1 )
     , m_layout( this, 2, 4 )
     , m_tabWidget( this )
 {
     setCaption( tr( "Configuration" ) );
 
     // Initialize configuration widgets
     if ( !installOptions )
     {
         initServerWidget();
         initDestinationWidget();
         initProxyWidget();
     }
     initOptionsWidget();
 
     // Load configuration information
     initData();
 
     // Setup tabs for all info
     m_layout.addWidget( &m_tabWidget );
     if ( !m_installOptions )
     {
         m_tabWidget.addTab( m_serverWidget, "packagemanager/servertab", tr( "Servers" ) );
         m_tabWidget.addTab( m_destWidget, "packagemanager/desttab", tr( "Destinations" ) );
         m_tabWidget.addTab( m_proxyWidget, "packagemanager/proxytab", tr( "Proxies" ) );
         m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
         m_tabWidget.setCurrentTab( tr( "Servers" ) );
     }
     else
     {
         m_tabWidget.addTab( m_optionsWidget, "exec", tr( "Options" ) );
     }
 
     //showMaximized();
 }
 
 void OIpkgConfigDlg::accept()
 {
     // Save server, destination and proxy configuration
     if ( !m_installOptions )
         m_ipkg->setConfigItems( m_configs );
 
     // Save options configuration
     int options = 0;
     if ( m_optForceDepends->isChecked() )
         options |= FORCE_DEPENDS;
     if ( m_optForceReinstall->isChecked() )
         options |= FORCE_REINSTALL;
     if ( m_optForceRemove->isChecked() )
         options |= FORCE_REMOVE;
     if ( m_optForceOverwrite->isChecked() )
         options |= FORCE_OVERWRITE;
     m_ipkg->setIpkgExecOptions( options );
     m_ipkg->setIpkgExecVerbosity( m_optVerboseIpkg->currentItem() );
 
     QDialog::accept();
 }
 
 void OIpkgConfigDlg::reject()
 {
     if ( m_configs )
         delete m_configs;
 }
 
 void OIpkgConfigDlg::initServerWidget()
 {
     m_serverWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_serverWidget );
     QScrollView *sv = new QScrollView( m_serverWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 );
 
     m_serverList = new QListBox( container );
     m_serverList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_serverList, SIGNAL(highlighted(int)), this, SLOT(slotServerEdit(int)) );
     layout->addMultiCellWidget( m_serverList, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerNew()) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerDelete()) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
 
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
     grplayout->addWidget( label, 0, 0 );
     m_serverName = new QLineEdit( grpbox );
     grplayout->addWidget( m_serverName, 0, 1 );
 
     label = new QLabel( tr( "Address:" ), grpbox );
     grplayout->addWidget( label, 1, 0 );
     m_serverLocation = new QLineEdit( grpbox );
     grplayout->addWidget( m_serverLocation, 1, 1 );
 
     m_serverActive = new QCheckBox( tr( "Active Server" ), grpbox );
     grplayout->addMultiCellWidget( m_serverActive, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotServerUpdate()) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 }
 
 void OIpkgConfigDlg::initDestinationWidget()
 {
     m_destWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_destWidget );
     QScrollView *sv = new QScrollView( m_destWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 3, 2, 2, 4 );
 
     m_destList = new QListBox( container );
     m_destList->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Preferred ) );
     connect( m_destList, SIGNAL(highlighted(int)), this, SLOT(slotDestEdit(int)) );
     layout->addMultiCellWidget( m_destList, 0, 0, 0, 1 );
 
     QPushButton *btn = new QPushButton( Resource::loadPixmap( "new" ), tr( "New" ), container );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestNew()) );
     layout->addWidget( btn, 1, 0 );
 
     btn = new QPushButton( Resource::loadPixmap( "trash" ), tr( "Delete" ), container );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestDelete()) );
     layout->addWidget( btn, 1, 1 );
 
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "Server" ), container );
     grpbox->layout()->setSpacing( 2 );
     grpbox->layout()->setMargin( 4 );
     layout->addMultiCellWidget( grpbox, 2, 2, 0, 1 );
 
     QGridLayout *grplayout = new QGridLayout( grpbox->layout() );
 
     QLabel *label = new QLabel( tr( "Name:" ), grpbox );
     grplayout->addWidget( label, 0, 0 );
     m_destName = new QLineEdit( grpbox );
     grplayout->addWidget( m_destName, 0, 1 );
 
     label = new QLabel( tr( "Address:" ), grpbox );
     grplayout->addWidget( label, 1, 0 );
     m_destLocation = new QLineEdit( grpbox );
     grplayout->addWidget( m_destLocation, 1, 1 );
 
     m_destActive = new QCheckBox( tr( "Active Server" ), grpbox );
     grplayout->addMultiCellWidget( m_destActive, 2, 2, 0, 1 );
 
     btn = new QPushButton( Resource::loadPixmap( "edit" ), tr( "Update" ), grpbox );
     connect( btn, SIGNAL(clicked()), this, SLOT(slotDestUpdate()) );
     grplayout->addMultiCellWidget( btn, 3, 3, 0, 1 );
 }
 
 void OIpkgConfigDlg::initProxyWidget()
 {
     m_proxyWidget = new QWidget( this );
 
     // Initialize UI
     QVBoxLayout *vb = new QVBoxLayout( m_proxyWidget );
     QScrollView *sv = new QScrollView( m_proxyWidget );
     vb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
     QGridLayout *layout = new QGridLayout( container, 4, 2, 2, 4 );
 
     // HTTP proxy server configuration
     QGroupBox *grpbox = new QGroupBox( 0, Qt::Vertical, tr( "HTTP Proxy" ), container );
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 88e020a..0aba898 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -1,131 +1,131 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2003 Dan Williams <drw@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
 #ifndef OIPKGCONFIGDLG_H
 #define OIPKGCONFIGDLG_H
 
 #include <qdialog.h>
 #include <qlayout.h>
 
 #include <opie2/otabwidget.h>
 
 #include "oipkg.h"
 
 class QCheckBox;
 class QComboBox;
 class QLineEdit;
 class QListBox;
 
 class OIpkgConfigDlg : public QDialog
 {
     Q_OBJECT
 
 public:
     OIpkgConfigDlg( OIpkg *ipkg = 0x0, bool installOptions = false, QWidget *parent = 0x0 );
 
 protected slots:
     void accept();
     void reject();
 
 private:
     OIpkg         *m_ipkg;    // Pointer to Ipkg class for retrieving/saving configuration options
     OConfItemList *m_configs; // Local list of configuration items
 
     bool           m_installOptions; // If true, will only display the Options tab
 
     // Server cached information
     bool           m_serverNew;      // Indicates if server information is for a new server
     int            m_serverCurrent;  // Index of currently selected server in m_serverList
     QString        m_serverCurrName; // Name of currently selected server in m_serverList
 
     // Destination cached information
     bool           m_destNew;      // Indicates if destination information is for a new destination
     int            m_destCurrent;  // Index of currently selected destination in m_destList
     QString        m_destCurrName; // Name of currently selected destination in m_destList
 
     // UI controls
     QVBoxLayout  m_layout;        // Main dialog layout control
-    OTabWidget   m_tabWidget;     // Main tab widget control
+    Opie::Ui::OTabWidget   m_tabWidget;     // Main tab widget control
     QWidget     *m_serverWidget;  // Widget containing server configuration controls
     QWidget     *m_destWidget;    // Widget containing destination configuration controls
     QWidget     *m_proxyWidget;   // Widget containing proxy configuration controls
     QWidget     *m_optionsWidget; // Widget containing ipkg execution configuration controls
 
     // Server configuration UI controls
     QListBox   *m_serverList;     // Server list selection
     QLineEdit  *m_serverName;     // Server name edit box
     QLineEdit  *m_serverLocation; // Server location URL edit box
     QCheckBox  *m_serverActive;   // Activate server check box
 
     // Destination configuration UI controls
     QListBox   *m_destList;     // Destination list selection
     QLineEdit  *m_destName;     // Destination name edit box
     QLineEdit  *m_destLocation; // Destination location URL edit box
     QCheckBox  *m_destActive;   // Activate destination check box
 
     // Proxy server configuration UI controls
     QLineEdit *m_proxyHttpServer;  // HTTP proxy server URL edit box
     QCheckBox *m_proxyHttpActive;  // Activate HTTP proxy check box
     QLineEdit *m_proxyFtpServer;   // FTP proxy server edit box
     QCheckBox *m_proxyFtpActive;   // Activate FTP proxy check box
     QLineEdit *m_proxyUsername;    // Proxy server username edit box
     QLineEdit *m_proxyPassword;    // Proxy server password edit box
 
     // Options configuration UI controls
     QCheckBox *m_optForceDepends;   // Force depends ipkg option checkbox
     QCheckBox *m_optForceReinstall; // Force reinstall ipkg option checkbox
     QCheckBox *m_optForceRemove;    // Force remove ipkg option checkbox
     QCheckBox *m_optForceOverwrite; // Force overwrite ipkg option checkbox
     QComboBox *m_optVerboseIpkg;    // Ipkg verbosity option selection
 
     void initServerWidget();
     void initDestinationWidget();
     void initProxyWidget();
     void initOptionsWidget();
 
     void initData();
 
     OConfItem *findConfItem( OConfItem::Type type = OConfItem::NotDefined, const QString &name = 0x0 );
 
 private slots:
     void slotServerEdit( int index );
     void slotServerNew();
     void slotServerDelete();
     void slotServerUpdate();
 
     void slotDestEdit( int index );
     void slotDestNew();
     void slotDestDelete();
     void slotDestUpdate();
 };
 
 #endif
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 7abd17e..73d3de7 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -1,140 +1,141 @@
 /*
                             This file is part of the OPIE Project
 
                =.            Copyright (c)  2003 Dan Williams <drw@handhelds.org>
              .=l.
            .>+-=
  _;:,     .>    :=|.         This file is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This file is distributed in the hope that
      +  .  -:.       =       it will be useful, but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU General
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "packageinfodlg.h"
 #include "opackage.h"
 #include "opackagemanager.h"
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 
 #include <qpe/resource.h>
 
 #include <opie2/otabwidget.h>
 
+using namespace Opie::Ui;
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
     : QWidget( 0x0 )
     , m_packman( pm )
     , m_information( this )
     , m_files( this )
 {
     // Initialize UI
     if ( parent )
         parent->setCaption( package );
 
     QVBoxLayout *layout = new QVBoxLayout( this, 4, 2 );
 
     OTabWidget *tabWidget = new OTabWidget( this );
     layout->addWidget( tabWidget );
 
     // Information tab
     m_information.reparent( tabWidget, QPoint( 0, 0 ) );
     m_information.setReadOnly( true );
     tabWidget->addTab( &m_information, "UtilsIcon", tr( "Information" ) );
 
     // Retrive package information
     m_package = m_packman->findPackage( package );
     if ( !m_package )
     {
         m_information.setText( tr( "Unable to retrieve package information." ) );
         return;
     }
 
     // Display package information
     if ( !m_package->information().isNull() )
         m_information.setText( m_package->information() );
     else
     {
         // Package information is not cached, retrieve it
         QStringList list( package );
         m_packman->executeCommand( OPackage::Info, &list, QString::null, this, SLOT(slotInfo(char*)), true );
     }
 
     // Files tab (display only if package is installed)
     if ( !m_package->versionInstalled().isNull() )
     {
         QWidget *filesWidget = new QWidget( tabWidget );
         QVBoxLayout *filesLayout = new QVBoxLayout( filesWidget, 2, 2 );
         m_files.reparent( filesWidget, QPoint( 0, 0 ) );
         m_files.setReadOnly( true );
         filesLayout->addWidget( &m_files );
 
         QPushButton *btn = new QPushButton( Resource::loadPixmap( "packagemanager/apply" ),
                                             tr( "Retrieve file list" ), filesWidget );
         filesLayout->addWidget( btn );
         connect( btn, SIGNAL(clicked()), this, SLOT(slotBtnFileScan()) );
         tabWidget->addTab( filesWidget, "binary", tr( "File list" ) );
 
         tabWidget->setCurrentTab( tr( "Information" ) );
 
         // If file list is already cached, display
         if ( !m_package->files().isNull() )
             m_files.setText( m_package->files() );
     }
     else
         m_files.hide();
 }
 
 PackageInfoDlg::~PackageInfoDlg()
 {
     if ( !m_package )
         return;
 
     // Cache package information
     if ( !m_information.text().isNull() )
         m_package->setInformation( m_information.text() );
 
     // Cache package file list
     if ( !m_files.text().isNull() )
         m_package->setFiles( m_files.text() );
 }
 
 void PackageInfoDlg::slotBtnFileScan()
 {
     m_files.clear();
 
     QStringList list( m_package->name() );
     m_packman->executeCommand( OPackage::Files, &list, QString::null, this, SLOT(slotFiles(char*)), true );
 }
 
 void PackageInfoDlg::slotInfo( char *info )
 {
     m_information.append( info );
 }
 
 void PackageInfoDlg::slotFiles( char *filelist )
 {
     QString str = filelist;
 
     // Skip first line of output ("Package xxx is installed...")
     if ( str.startsWith( "Package " ) )
         str = str.right( str.length() - str.find( '\n' ) - 1 );
 
     m_files.append( str );
 }
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index 49497c3..946bb3a 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -1,28 +1,29 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "soundsettings.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
 
 
 
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index e76fd6b..31f6b85 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -1,293 +1,294 @@
 /*
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 #include "sshkeys.h"
 
 #include <qpe/qpeapplication.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlistview.h>
 #include <qcombobox.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 
+using namespace Opie::Core;
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
 
 SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
     : SSHKeysBase( parent, name, fl )
 {
     char *home = getenv("HOME");
     unsigned i;
 
     connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
     connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
     connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
 
-    connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
         this, SLOT(log_sshadd_output(OProcess*,char*,int)));
-    connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
         this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
-    connect(&addprocess, SIGNAL(processExited(OProcess*)),
+    connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)),
         this, SLOT(ssh_add_exited(OProcess*)));
 
     connect(KeyFileName, SIGNAL(textChanged(const QString&)),
         this, SLOT(add_text_changed(const QString&)));
 
     if (home) {
         for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) {
             char thiskeyname[32];
 
             thiskeyname[31] = 0;
             snprintf(thiskeyname, 31, "%s/.ssh/%s", home, keynames[i]);
             if (!access(thiskeyname, R_OK)) {
                 KeyFileName->insertItem(thiskeyname);
             }
         }
     }
 
     doRefreshListButton();
 }
 
 SSHKeysApp::~SSHKeysApp()
 {
 }
 
 void SSHKeysApp::doRefreshListButton()
 {
     OProcess sshadd_process;
     QListViewItem *t = KeyList->firstChild();
 
     while(t) {
         QListViewItem *next = t->nextSibling();
         KeyList->takeItem(t);
         delete(t);
         t = next;
     }
 
-    connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
         this, SLOT(get_list_keys_output(OProcess*,char*,int)));
-    connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
         this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 
     keystate = KeySize;
     incoming_keyname="";
     incoming_keysize="";
     incoming_keyfingerprint="";
 
 //    log_text("Running ssh-add -l");
     sshadd_process << "ssh-add" << "-l";
     bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
         return;
     }
     flush_sshadd_output();
     if (sshadd_process.exitStatus() == 2) {
         setEnabled(FALSE);
     }
 }
 
 void SSHKeysApp::get_list_keys_output(OProcess *proc, char *buffer, int buflen)
 {
     int i;
     (void) proc;
 
     for (i=0; i<buflen; i++) {
         switch(keystate) {
         case Noise:
         noise:
             if (buffer[i] == '\n') {
                 log_text(incoming_noise.local8Bit());
                 incoming_noise = "";
                 keystate = KeySize;
             } else {
                 incoming_noise += buffer[i];
             }
             break;
 
         case KeySize:
             if (isdigit(buffer[i])) {
                 incoming_keysize += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyFingerprint;
             } else {
                 incoming_keysize = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
         case KeyFingerprint:
             if (isxdigit(buffer[i]) || buffer[i] == ':') {
                 incoming_keyfingerprint += buffer[i];
             } else if (buffer[i] == ' ') {
                 keystate = KeyName;
             } else {
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
 
         case KeyName:
             if (buffer[i] == '\n') {
                 /* Wheee. Got one. */
                 KeyList->insertItem(new
                     QListViewItem(KeyList, incoming_keyname, incoming_keysize, incoming_keyfingerprint));
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_keyname = "";
                 keystate = KeySize;
             } else if (isprint(buffer[i])) {
                 incoming_keyname += buffer[i];
             } else {
                 incoming_keysize = "";
                 incoming_keyfingerprint = "";
                 incoming_noise = "";
                 keystate = Noise;
                 goto noise;
             }
             break;
         }
     }
 }
 
 void SSHKeysApp::flush_sshadd_output(void)
 {
     if (pending_stdout.length()) {
         log_text(pending_stdout.ascii());
     }
     pending_stdout = "";
 
     if (pending_stderr.length()) {
         log_text(pending_stderr.ascii());
     }
     pending_stderr = "";
 }
 
 void SSHKeysApp::log_sshadd_output(OProcess *proc, char *buffer, int buflen)
 {
     (void) proc;
 
     while (buflen) {
         if (*buffer == '\n') {
             log_text(pending_stdout);
             pending_stdout = "";
         } else {
             pending_stdout += *buffer;
         }
         buffer++;
         buflen--;
     }
 }
 
 void SSHKeysApp::log_sshadd_stderr(OProcess *proc, char *buffer, int buflen)
 {
     (void) proc;
 
     while (buflen) {
         if (*buffer == '\n') {
             log_text(pending_stderr);
             pending_stderr = "";
         } else {
             pending_stderr += *buffer;
         }
         buffer++;
         buflen--;
     }
 }
 
 void SSHKeysApp::ssh_add_exited(OProcess *proc)
 {
     (void)proc;
 
     doRefreshListButton();
     setEnabled(TRUE);
     if (proc->exitStatus() == 2) {
         setEnabled(FALSE);
     }
 }
 
 void SSHKeysApp::add_text_changed(const QString &text)
 {
     struct stat sbuf;
 
     if (!text.length() || (!access(text.ascii(), R_OK) &&
                 !stat(text.ascii(), &sbuf) &&
                    S_ISREG(sbuf.st_mode)))
         AddButton->setEnabled(TRUE);
     else
         AddButton->setEnabled(FALSE);
 }
 
 void SSHKeysApp::doAddButton()
 {
     addprocess.clearArguments();
 
     setEnabled(FALSE);
 
     if (KeyFileName->currentText().length()) {
         addprocess << "ssh-add" << "--" << KeyFileName->currentText();
 //        log_text(QString(tr("Running ssh-add -- ")) + KeyFileName->currentText());
     } else {
         addprocess << "ssh-add";
 //        log_text(tr("Running ssh-add"));
     }
     bool ret = addprocess.start(OProcess::NotifyOnExit, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
         doRefreshListButton();
         setEnabled(TRUE);
     }
     flush_sshadd_output();
 }
 
 void SSHKeysApp::log_text(const char *text)
 {
     TextOutput->append(text);
     TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE);
 }
 
 void SSHKeysApp::doRemoveAllButton()
 {
     OProcess sshadd_process;
 
-    connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
         this, SLOT(log_sshadd_output(OProcess*,char*,int)));
-    connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
         this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
 
 //    log_text(tr("Running ssh-add -D"));
     sshadd_process << "ssh-add" << "-D";
     bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
     if (!ret) {
         log_text(tr("Error running ssh-add"));
     }
     flush_sshadd_output();
     doRefreshListButton();
 }
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index 7483bbc..519f540 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -1,61 +1,61 @@
 /*
  *  ssh-agent key manipulation utility
  *
  *  (C) 2002 David Woodhouse <dwmw2@infradead.org>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
 
 #ifndef SSHKEYSAPP_H
 #define SSHKEYSAPP_H
 
 #include "sshkeysbase.h"
 
 #include <opie2/oprocess.h>
 
 class SSHKeysApp : public SSHKeysBase
 {
     Q_OBJECT
 
  public:
     SSHKeysApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~SSHKeysApp();
 
  private:
     void log_text(const char *text);
     void flush_sshadd_output(void);
 
     enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
     QString incoming_keyname;
     QString incoming_keysize;
     QString incoming_keyfingerprint;
     QString incoming_noise;
-    OProcess addprocess;
+    Opie::Core::OProcess addprocess;
     QString pending_stdout;
     QString pending_stderr;
 
  private slots:
     void doAddButton();
     void doRefreshListButton();
     void doRemoveAllButton();
-    void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
-    void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
-    void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
-    void ssh_add_exited(OProcess *proc);
+    void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
+    void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
+    void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen);
+    void ssh_add_exited(Opie::Core::OProcess *proc);
     void add_text_changed(const QString &text);
 };
 #endif
 
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 3c2c15f..2a52b00 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -1,477 +1,480 @@
 /**********************************************************************
 ** BenchmarkInfo
 **
 ** A benchmark for Qt/Embedded
 **
 ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
 ** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
 **
 ** 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 "benchmarkinfo.h"
 
 /* OPIE */
 #include <opie2/ostorageinfo.h>
 #include <opie2/olistview.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpedecoration_qws.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 /* QT */
 #include <qclipboard.h>
 #include <qcolor.h>
 #include <qcombobox.h>
 #include <qdirectpainter_qws.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qfiledialog.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpainter.h>
 #include <qpushbutton.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 /* STD */
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #if defined (__GNUC__) && (__GNUC__ < 3)
 extern double round(double);
 #endif
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
 extern "C"
+
 {
     void BenchFFT( void );
     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 OListView( this );
     QWhatsThis::add( tests->viewport(), tr( "This area shows the available tests, the results for which the tests "
                                 "have been performed, and comparison values for one selected device. "
                                 "Use the checkboxes to define which tests you want to perform." ) );
     tests->setMargin( 0 );
     tests->addColumn( tr( "Tests" ) );
     tests->addColumn( tr( "Results" ) );
     tests->addColumn( tr( "Comparison" ) );
     tests->setShowSortIndicator( true );
 
     test_alu = new OCheckListItem( tests, tr( "1. Integer Arithmetic  " ), OCheckListItem::CheckBox );
     test_fpu = new OCheckListItem( tests, tr( "2. Floating Point Unit  " ), OCheckListItem::CheckBox );
     test_txt = new OCheckListItem( tests, tr( "3. Text Rendering  " ), OCheckListItem::CheckBox );
     test_gfx = new OCheckListItem( tests, tr( "4. Gfx Rendering  " ), OCheckListItem::CheckBox );
     test_ram = new OCheckListItem( tests, tr( "5. RAM Performance  " ), OCheckListItem::CheckBox );
     test_sd = new OCheckListItem( tests, tr( "6. SD Card Performance  " ), OCheckListItem::CheckBox );
     test_cf = new OCheckListItem( tests, tr( "7. CF Card Performance  " ), OCheckListItem::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 );
     QWhatsThis::add( startButton, tr( "Click here to perform the selected tests." ) );
     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 );
         QWhatsThis::add( machineCombo, tr( "Choose a model to compare your results with." ) );
 
         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) ) );
     }
 
     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_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++) );   
+    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" );
 
     int w = QApplication::desktop()->width();
     int h = QApplication::desktop()->height();
 
     srand( time( NULL ) );
 
     BenchmarkPaintWidget bpw;
 
     int loops = 0;
-    
+
     while ( t.elapsed() < stop )
     {
         int k = rand() % 9;
         int s = rand() % 100;
         bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
         bpw.p.setFont( QFont( "Vera", s ) );
         bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
         ++loops;
     }
-    
+
     return loops * text.length();
 }
 
 int BenchmarkInfo::gfxRendering( int seconds )
 {
     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 };
 
     int w = QApplication::desktop()->width();
     int h = QApplication::desktop()->height();
 
     srand( time( NULL ) );
 
     BenchmarkPaintWidget bpw;
 
     QTime t;
     t.start();
     int stop = t.elapsed() + seconds*1000;
     int loops = 0;
-    
+
     while ( t.elapsed() < stop )
     {
         int k = rand() % 9;
         bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
         bpw.p.drawLine( rand()%w, rand()%h, rand()%w, rand()%h );
         ++loops;
     }
 
     t.restart();
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
     {
         int k = rand() % 9;
         bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
         bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 );
         ++loops;
     }
 
     QBrush br1;
     br1.setStyle( SolidPattern );
     t.restart();
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
     {
         int k = rand() % 9;
         br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
         bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 );
         ++loops;
     }
 
     QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
     t.restart();
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
     {
         bpw.p.drawPixmap( rand()%w, rand()%h, p );
         ++loops;
     }
 
     return loops;
-    
+
 }
 
 void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
 {
     QTime time;
     time.start();
     if ( writeFile( fname ) &&
             readFile( fname ) )
     {
         QFile::remove( fname );
         item->setText( 1, QString( "%1 kb/sec" ).arg( QString::number( 1024.0 / ( time.elapsed() / 1000.0 ) ) ) );
         item->setOn( false );
     }
     else
     {
         item->setText( 1, tr( "error" ) );
     }
 }
 
 char FileBuf[ BUFF_SIZE + 1 ];
 
 bool BenchmarkInfo::writeFile( const QString& w_path )
 {
     int i;
     int k;
     int n;
     int pos;
     int len;
     char *data = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; // 62
 
 
     // /*------------------------------------
     int w_len;
 
     QFile writeFile( w_path );
     srand( time( NULL ) );
 
     for ( n = 0 ; n < 20 ; n++ )
     {
         if ( ! writeFile.open( IO_WriteOnly ) )
         {
             writeFile.close();
             writeFile.remove();
             return ( false );
         }
         // ------------------------------------------ sequential write
         for ( k = 0 ; k < 256 ; k++ )
         {
             n = rand() % 30;
             memcpy( &FileBuf[ k * 32 ], &data[ n ], 32 );
         }
 
         for ( i = 0 ; i < FILE_SIZE / BUFF_SIZE ; i++ )
         {
             w_len = writeFile.writeBlock( FileBuf, BUFF_SIZE );
             if ( w_len != BUFF_SIZE )
             {
                 writeFile.close();
                 writeFile.remove();
                 return ( false );
             }
             writeFile.flush();
         }
         // ------------------------------------------ random write
         for ( i = 0 ; i < 400 ; i++ )
         {
             len = rand() % 90 + 4000;
             for ( k = 0 ; k < 128 ; k++ )
             {
                 n = rand() % 30;
                 memcpy( &FileBuf[ k * 8 ], &data[ n ], 32 );
             }
             pos = rand() % ( FILE_SIZE - BUFF_SIZE );
 
             writeFile.at( pos );
             w_len = writeFile.writeBlock( FileBuf, len );
             if ( w_len != len )
             {
                 writeFile.close();
                 writeFile.remove();
                 return ( false );
             }
             writeFile.flush();
         }
         writeFile.close();
     }
     return ( true );
 
 }
 
 
 bool BenchmarkInfo::readFile( const QString& r_path )
 {
     int i;
     int k;
     int len;
     int pos;
     int r_len;
 
     QFile readFile( r_path );
     srand( time( NULL ) );
 
     for ( k = 0 ; k < 200 ; k++ )
     {
         if ( ! readFile.open( IO_ReadOnly ) )
         {
             readFile.remove();
             return ( false );
         }
         // ------------------------------------------ sequential read
         readFile.at( 0 );
         for ( i = 0 ; i < FILE_SIZE / BUFF_SIZE ; i++ )
         {
             readFile.at( i * BUFF_SIZE );
             r_len = readFile.readBlock( FileBuf, BUFF_SIZE );
             if ( r_len != BUFF_SIZE )
             {
                 readFile.close();
                 readFile.remove();
                 return ( false );
             }
         }
         // ------------------------------------------ random read
         for ( i = 0 ; i < 1000 ; i++ )
         {
             len = rand() % 120 + 8;
             pos = rand() % ( FILE_SIZE / BUFF_SIZE - BUFF_SIZE );
             readFile.at( pos );
             r_len = readFile.readBlock( FileBuf, len );
             if ( r_len != len )
             {
                 readFile.close();
                 readFile.remove();
                 return ( false );
             }
         }
         readFile.close();
     }
     return ( true );
 }
diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h
index c3d44ec..0a61134 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.h
+++ b/noncore/settings/sysinfo/benchmarkinfo.h
@@ -1,69 +1,69 @@
 /**********************************************************************
 ** BenchmarkInfo
 **
 ** A benchmark for Qt/Embedded
 **
 ** Copyright (C) 2004 Michael Lauer <mickey@vanille.de>
 ** Inspired by ZBench (C) 2002 Satoshi <af230533@im07.alpha-net.ne.jp>
 **
 ** 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 <qwidget.h>
 #include <qdialog.h>
 #include <qdict.h>
 #include <qstringlist.h>
 
 class QClipboard;
 class QComboBox;
-class OCheckListItem;
+namespace Opie {namespace Ui {class OCheckListItem;}}
 class QPushButton;
-class OListView;
+namespace Opie {namespace Ui {class OListView;}}
 
 class BenchmarkInfo : public QWidget
 {
     Q_OBJECT
 
 public:
     BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 );
     ~BenchmarkInfo();
 
-    OCheckListItem* test_alu;
-    OCheckListItem* test_fpu;
-    OCheckListItem* test_txt;
-    OCheckListItem* test_gfx;
-    OCheckListItem* test_ram;
-    OCheckListItem* test_sd;
-    OCheckListItem* test_cf;
+    Opie::Ui::OCheckListItem* test_alu;
+    Opie::Ui::OCheckListItem* test_fpu;
+    Opie::Ui::OCheckListItem* test_txt;
+    Opie::Ui::OCheckListItem* test_gfx;
+    Opie::Ui::OCheckListItem* test_ram;
+    Opie::Ui::OCheckListItem* test_sd;
+    Opie::Ui::OCheckListItem* test_cf;
 
     bool main_rd;
     bool main_wt;
     bool sd_rd;
     bool sd_wt;
     bool cf_rd;
     bool cf_wt;
 
     QClipboard* clb;
     QComboBox* machineCombo;
-    OListView* tests;
+    Opie::Ui::OListView* tests;
     QPushButton* startButton;
     QDict <QStringList> machines;
 
     int textRendering( int );
     int gfxRendering( int );
-    void performFileTest( const QString& fname, OCheckListItem* item );
+    void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item );
 
 private slots:
     bool writeFile( const QString& );
     bool readFile( const QString& );
     void run();
     void machineActivated( int );
 };
 
diff --git a/noncore/settings/sysinfo/main.cpp b/noncore/settings/sysinfo/main.cpp
index 3a7b1b1..8ebac20 100644
--- a/noncore/settings/sysinfo/main.cpp
+++ b/noncore/settings/sysinfo/main.cpp
@@ -1,26 +1,27 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "sysinfo.h"
 
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> )
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index dfe48e1..71cefcb 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -1,194 +1,200 @@
 /**********************************************************************
 ** 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 <opie2/olistview.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcombobox.h>
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
+using namespace Opie::Ui;
 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 OListView( 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(OListViewItem*,const QPoint&,int) ),
-                 this, SLOT( viewModules(OListViewItem*) ) );
+        connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
+                 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;
     OListViewItem *curritem = static_cast<OListViewItem*>( ModulesView->currentItem() );
     if ( curritem )
     {
         selectedmod = curritem->text( 0 );
     }
 
     ModulesView->clear();
 
     FILE *procfile = fopen( ( QString ) ( "/proc/modules"), "r");
 
     if ( procfile )
     {
         OListViewItem *newitem;
         OListViewItem *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 OListViewItem( 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\n%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 );
 
         FILE* stream = popen( command, "r" );
         if ( stream )
             pclose( stream );
     }
 
 }
 
+void ModulesInfo::viewModules( QListViewItem *module ) {
+    if ( !module )
+        return;
+    viewModules(  static_cast<OListViewItem*>( module ) );
+}
 void ModulesInfo::viewModules( OListViewItem *modules )
 {
     QString modname = modules->text( 0 );
     QString capstr = "Module: ";
     capstr.append( modname );
     ModulesDtl->setCaption( capstr );
     QString command = "/sbin/modinfo ";
     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;
             ModulesDtl->detailView->append( line );
         }
 
         pclose( modinfo );
     }
 
     QPEApplication::showWidget( ModulesDtl );
 }
 
diff --git a/noncore/settings/sysinfo/modulesinfo.h b/noncore/settings/sysinfo/modulesinfo.h
index 78dce73..b816b41 100644
--- a/noncore/settings/sysinfo/modulesinfo.h
+++ b/noncore/settings/sysinfo/modulesinfo.h
@@ -1,51 +1,53 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #ifndef MODULESINFO_H
 #define MODULESINFO_H
 
 #include <qwidget.h>
 
 class Detail;
 class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 
 class ModulesInfo : public QWidget
 {
     Q_OBJECT
 public:
     ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~ModulesInfo();
 
 private:
-	OListView* ModulesView;
+	Opie::Ui::OListView* ModulesView;
     QComboBox* CommandCB;
 
 	Detail* ModulesDtl;
 
 private slots:
     void updateData();
     void slotSendClicked();
-	void viewModules( OListViewItem * );
+    void viewModules( QListViewItem* );
+    void viewModules( Opie::Ui::OListViewItem * );
 };
 
 #endif
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index dd9a05d..e887267 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -1,206 +1,213 @@
 /**********************************************************************
 ** 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 <opie2/olistview.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qcombobox.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qtextview.h>
 #include <qtimer.h>
 #include <qwhatsthis.h>
 
 /* STD */
 #include <sys/types.h>
 #include <signal.h>
 
+using namespace Opie::Ui;
 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 OListView( 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(OListViewItem*,const QPoint&,int) ),
-             this, SLOT( viewProcess(OListViewItem*) ) );
+    connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
+             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;
     OListViewItem *curritem = static_cast<OListViewItem*>( ProcessView->currentItem() );
     if ( curritem )
     {
         selectedpid = curritem->text( 0 );
     }
 
     ProcessView->clear();
 
     OListViewItem *newitem;
     OListViewItem *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 OListViewItem( ProcessView, processnum, processcmd, processstatus, processtime );
                     if ( processnum == selectedpid )
                     {
                         selecteditem = newitem;
                     }
                 }
             }
         }
         ProcessView->setCurrentItem( selecteditem );
     }
 
     delete proclist;
     delete procdir;
 }
 
 void ProcessInfo::slotSendClicked()
 {
     OListViewItem *currprocess = static_cast<OListViewItem*>( 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 = static_cast<OListViewItem*>( ProcessView->currentItem() );
         if ( currprocess )
         {
             QString sigstr = SignalCB->currentText();
             sigstr.truncate(2);
             int sigid = sigstr.toUInt();
             kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
         }
     }
 
 }
 
+void ProcessInfo::viewProcess( QListViewItem* process ) {
+    if ( !process )
+        return;
+    viewProcess( static_cast<OListViewItem*>( process ) );
+}
+
 void ProcessInfo::viewProcess( OListViewItem *process )
 {
     QString pid= process->text( 0 ).stripWhiteSpace();
     QString command = process->text( 1 );
     ProcessDtl->setCaption( pid + " - " + command );
     FILE *statfile = fopen( ( QString ) ( "/proc/" + pid + "/status"), "r");
     if ( statfile )
     {
         char line[81];
         fgets( line, 81, statfile );
         ProcessDtl->detailView->setText( line );
         while ( fgets( line, 81, statfile ) )
         {
             ProcessDtl->detailView->append( line );
         }
         fclose( statfile );
     }
     QPEApplication::showWidget( ProcessDtl );
 }
diff --git a/noncore/settings/sysinfo/processinfo.h b/noncore/settings/sysinfo/processinfo.h
index 6e7acd5..0a1682b 100644
--- a/noncore/settings/sysinfo/processinfo.h
+++ b/noncore/settings/sysinfo/processinfo.h
@@ -1,50 +1,52 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 
 #ifndef PROCESSINFO_H
 #define PROCESSINFO_H
 
 #include <qwidget.h>
 
 class Detail;
 class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 
 class ProcessInfo : public QWidget
 {
     Q_OBJECT
 public:
     ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
     ~ProcessInfo();
 
 private:
-    OListView*   ProcessView;
+    Opie::Ui::OListView*   ProcessView;
     QComboBox*   SignalCB;
     QPushButton* SendButton;
 
 	Detail *ProcessDtl;
 
 private slots:
     void updateData();
     void slotSendClicked();
-    void viewProcess( OListViewItem * );
+    void viewProcess( QListViewItem* );
+    void viewProcess( Opie::Ui::OListViewItem * );
 };
 
 #endif
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index fda6352..4c58999 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -1,73 +1,74 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************
 **
 **  Enhancements by: Dan Williams, <williamsdr@acm.org>
 **
 **********************************************************************/
 
 #include "memory.h"
 #include "load.h"
 #include "storage.h"
 #include "processinfo.h"
 #include "modulesinfo.h"
 #include "benchmarkinfo.h"
 #include "versioninfo.h"
 #include "sysinfo.h"
 
 #include <opie2/otabwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 
+using namespace Opie::Ui;
 SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
     : QWidget( parent, name, WStyle_ContextHelp )
 {
     setIcon( Resource::loadPixmap( "system_icon" ) );
     setCaption( tr("System Info") );
 
     resize( 220, 180 );
 
     Config config( "qpe" );
     config.setGroup( "Appearance" );
     bool advanced = config.readBoolEntry( "Advanced", TRUE );
 
     QVBoxLayout *lay = new QVBoxLayout( this );
     OTabWidget *tab = new OTabWidget( this, "tabwidget", OTabWidget::Global );
     lay->addWidget( tab );
 
     tab->addTab( new MemoryInfo( tab ), "sysinfo/memorytabicon", tr("Memory") );
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
     tab->addTab( new FileSysInfo( tab ), "sysinfo/storagetabicon", tr("Storage") );
 #endif
     tab->addTab( new LoadInfo( tab ), "sysinfo/cputabicon", tr("CPU") );
     if ( advanced )
     {
         tab->addTab( new ProcessInfo( tab ), "sysinfo/processtabicon", tr("Process") );
         tab->addTab( new ModulesInfo( tab ), "sysinfo/moduletabicon", tr("Modules") );
     }
     tab->addTab( new BenchmarkInfo( tab ), "sysinfo/benchmarktabicon", tr( "Benchmark" ) );
     tab->addTab( new VersionInfo( tab ), "sysinfo/versiontabicon", tr("Version") );
 
     tab->setCurrentTab( tr( "Memory" ) );
 }
 
 
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 4bebd06..6764aa6 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -1,172 +1,172 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** 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.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "versioninfo.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <qpe/resource.h>
 #include <qpe/version.h>
 
 /* QT */
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qscrollview.h>
 #include <qtextstream.h>
 #include <qwhatsthis.h>
 
-using namespace Opie;
+using namespace Opie::Core;
 
 VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
     : QWidget( parent, name, f )
 {
     setMinimumSize( 200, 150 );
 
     QVBoxLayout *tmpvb = new QVBoxLayout( this );
     QScrollView *sv = new QScrollView( this );
     tmpvb->addWidget( sv, 0, 0 );
     sv->setResizePolicy( QScrollView::AutoOneFit );
     sv->setFrameStyle( QFrame::NoFrame );
     QWidget *container = new QWidget( sv->viewport() );
     sv->addChild( container );
 
     QVBoxLayout *vb = new QVBoxLayout( container, 3 );
 
     QString kernelVersionString;
     QFile file( "/proc/version" );
     if ( file.open( IO_ReadOnly ) )
     {
         QTextStream t( &file );
   QStringList strList;
 
   strList = QStringList::split(  " " , t.read(),  false );
 
         kernelVersionString = "<qt>" + tr( "<b>Linux Kernel</b><p>Version: " );
         kernelVersionString.append( strList[2] );
         kernelVersionString.append( "<br>" );
         kernelVersionString.append( tr( "Compiled by: " ) );
         kernelVersionString.append( strList[3] );
         kernelVersionString.append("</qt>");
         file.close();
     }
 
     QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " );
     palmtopVersionString.append( QPE_VERSION );
     palmtopVersionString.append( "<br>" );
 #ifdef QPE_VENDOR
     QString builder = QPE_VENDOR;
 #else
     QString builder = "Unknown";
 #endif
     palmtopVersionString.append( tr( "Compiled by: " ) );
     palmtopVersionString.append(  builder );
     palmtopVersionString.append( "<br>" );
     palmtopVersionString.append( tr( "Built on: " ) );
     palmtopVersionString.append( __DATE__  );
     palmtopVersionString.append( "</qt>" );
 
     QHBoxLayout *hb1 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
 
     QLabel *palmtopLogo = new QLabel( container );
     QImage logo1 = Resource::loadImage( "logo/opielogo" );
     logo1 = logo1.smoothScale( 50, 55 );
     QPixmap logo1Pixmap;
     logo1Pixmap.convertFromImage( logo1 );
     palmtopLogo->setPixmap( logo1Pixmap );
     palmtopLogo->setFixedSize( 60, 60 );
     hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );
 
     QLabel *palmtopVersion = new QLabel( container );
     palmtopVersion->setText( palmtopVersionString  );
     hb1->addWidget( palmtopVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
 
     QHBoxLayout *hb2 = new QHBoxLayout( vb );
     hb1->setSpacing( 2 );
 
     QLabel *linuxLogo = new QLabel( container );
     QImage logo2 = Resource::loadImage( "logo/tux-logo" );
     logo2 = logo2.smoothScale( 55, 60 );
     QPixmap logo2Pixmap;
     logo2Pixmap.convertFromImage( logo2 );
     linuxLogo->setPixmap( logo2Pixmap );
     linuxLogo->setFixedSize( 60, 60 );
     hb2->addWidget( linuxLogo, 0, Qt::AlignTop + Qt::AlignLeft );
 
     QLabel *kernelVersion = new QLabel( container );
     kernelVersion->setText( kernelVersionString );
     hb2->addWidget( kernelVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
 
     QHBoxLayout *hb3 = new QHBoxLayout( vb );
     hb3->setSpacing( 2 );
 
     QLabel *palmtopLogo3 = new QLabel( container );
 
     OModel model = ODevice::inst()->model();
     QString modelPixmap = "sysinfo/";
     if ( model == Model_Zaurus_SLC7x0 )
         modelPixmap += "zaurusc700";
     else if ( model >= Model_Zaurus_SL5000 && model <= Model_Zaurus_SLB600 )
         modelPixmap += "zaurus5500";
     else if ( model >= Model_iPAQ_H31xx && model <= Model_iPAQ_H5xxx )
         modelPixmap += "ipaq3600";
     else if ( model >= Model_SIMpad_CL4 && model <= Model_SIMpad_TSinus )
         modelPixmap += "simpad";
     else
         modelPixmap += "pda";
 
     QImage logo3 = Resource::loadImage( modelPixmap );
 
     int width = logo3.width();
     int height = logo3.height();
     float aspect = float( height ) / width;
     logo3 = logo3.smoothScale( 50, 50.0 * aspect );
 
     QPixmap logo3Pixmap;
     logo3Pixmap.convertFromImage( logo3 );
     palmtopLogo3->setPixmap( logo3Pixmap );
     palmtopLogo3->setFixedSize( 60, 100 );
     hb3->addWidget( palmtopLogo3, 0, Qt::AlignTop + Qt::AlignLeft );
 
     QString systemString = "<qt><b>";
     systemString.append( ODevice::inst()->systemString() );
     systemString.append( "</b>" );
     systemString.append( tr( "<p>Version: " ) );
     systemString.append( ODevice::inst()->systemVersionString() );
     systemString.append( tr( "<br>Model: " ) );
     systemString.append( ODevice::inst()->modelString() );
     systemString.append( tr( "<br>Vendor: " ) );
     systemString.append( ODevice::inst()->vendorString() );
     systemString.append("</qt>");
 
     QLabel *systemVersion = new QLabel( container );
     systemVersion->setText( systemString );
     hb3->addWidget( systemVersion, 1, Qt::AlignTop + Qt::AlignLeft );
 
     QWhatsThis::add( this, tr( "This page shows the current versions of Opie, the Linux kernel and distribution running on this handheld device." ) );
 }
 
 VersionInfo::~VersionInfo()
 {
 }
 
diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index d7147d1..807d528 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -1,14 +1,15 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "usermanager.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index eb9a289..5854fe0 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -1,228 +1,229 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "userdialog.h"
 #include "passwd.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <qpe/qpeapplication.h>
 
 /* QT */
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 
 /* STD */
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <signal.h>
 
 
-using namespace Opie;
+using namespace Opie::Core;
 
 
 /**
  * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
  *
  */
+using namespace Opie::Ui;
 UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl)
 {
     vm=viewmode;
     QVBoxLayout *layout = new QVBoxLayout(this);
     myTabWidget=new QTabWidget(this,"User Tab Widget");
     layout->addWidget(myTabWidget);
     setupTab1();
     setupTab2();
 
     accounts->groupStringList.sort();
     // And also fill the listview & the combobox with all available groups.
     for( QStringList::Iterator it = accounts->groupStringList.begin(); it!=accounts->groupStringList.end(); ++it)
     {
         accounts->splitGroupEntry(*it);
         if(accounts->gr_name.find(QRegExp("^#"),0))
         {    // Skip commented lines.
             new QCheckListItem(groupsListView,accounts->gr_name,QCheckListItem::CheckBox);
             groupComboBox->insertItem(accounts->gr_name);
         }
     }
     QPEApplication::showDialog( this );
 }
 
 /**
  * Empty destructor.
  *
  */
 UserDialog::~UserDialog()
 {}
 
 /**
  *  Creates the first tab, all userinfo is here.
  *
  */
 void UserDialog::setupTab1()
 {
     QPixmap mypixmap;
     QWidget *tabpage = new QWidget(myTabWidget,"page1");
     QVBoxLayout *layout = new QVBoxLayout(tabpage);
     layout->setMargin(5);
 
     // Picture
     picturePushButton = new QPushButton(tabpage,"Label");
     picturePushButton->setMinimumSize(48,48);
     picturePushButton->setMaximumSize(48,48);
     picturePushButton->setPixmap(Resource::loadPixmap("usermanager/usericon"));    // Load default usericon.
     connect(picturePushButton,SIGNAL(clicked()),this,SLOT(clickedPicture()));    // Clicking the picture should invoke pictureselector.
 
     // Login
     QLabel *loginLabel=new QLabel(tabpage,"Login: ");
     loginLabel->setText("Login: ");
     loginLineEdit=new QLineEdit(tabpage,"Login: ");
 
     // UID
     QLabel *uidLabel=new QLabel(tabpage,"uid: ");
     uidLabel->setText("UserID: ");
     uidLineEdit=new QLineEdit(tabpage,"uid: ");
     uidLineEdit->setEnabled(false);
 
     // Username (gecos)
     QLabel *gecosLabel=new QLabel(tabpage,"gecos");
     gecosLabel->setText("Username: ");
     gecosLineEdit=new QLineEdit(tabpage,"gecos");
 
     // Password
     QLabel *passwordLabel=new QLabel(tabpage,"password");
     passwordLabel->setText("Password: ");
     passwordLineEdit=new QLineEdit(tabpage,"password");
     passwordLineEdit->setEchoMode(QLineEdit::Password);
 
     // Shell
     QLabel *shellLabel=new QLabel(tabpage,"shell");
     shellLabel->setText("Shell: ");
     shellComboBox=new QComboBox(tabpage,"shell");
     shellComboBox->setEditable(true);
     shellComboBox->insertItem("/bin/sh");
     shellComboBox->insertItem("/bin/ash");
     shellComboBox->insertItem("/bin/false");
 
     // Primary Group
     QLabel *groupLabel=new QLabel(tabpage,"group");
     groupLabel->setText("Primary group: ");
     groupComboBox=new QComboBox(tabpage,"PrimaryGroup");
 
     if(vm==VIEWMODE_NEW)
     {
         // Copy /etc/skel
         skelLabel=new QLabel(tabpage,"skel");
         skelLabel->setText("Copy /etc/skel: ");
         skelCheckBox=new QCheckBox(tabpage);
         skelCheckBox->setChecked(true);
     }
 
     // Widget layout
     QHBoxLayout *hlayout=new QHBoxLayout(-1,"hlayout");
     layout->addWidget(picturePushButton);
     layout->addSpacing(5);
     layout->addLayout(hlayout);
     QVBoxLayout *vlayout1=new QVBoxLayout(-1,"vlayout1");
     QVBoxLayout *vlayout2=new QVBoxLayout(-1,"vlayout2");
     // First column, labels
     vlayout1->addWidget(loginLabel);
     vlayout1->addSpacing(5);
     vlayout1->addWidget(uidLabel);
     vlayout1->addSpacing(5);
     vlayout1->addWidget(gecosLabel);
     vlayout1->addSpacing(5);
     vlayout1->addWidget(passwordLabel);
     vlayout1->addSpacing(5);
     vlayout1->addWidget(shellLabel);
     vlayout1->addSpacing(5);
     vlayout1->addWidget(groupLabel);
     if(vm==VIEWMODE_NEW)
     {
         vlayout1->addSpacing(5);
         vlayout1->addWidget(skelLabel);
     }
     // Second column, data
     vlayout2->addWidget(loginLineEdit);
     vlayout2->addSpacing(5);
     vlayout2->addWidget(uidLineEdit);
     vlayout2->addSpacing(5);
     vlayout2->addWidget(gecosLineEdit);
     vlayout2->addSpacing(5);
     vlayout2->addWidget(passwordLineEdit);
     vlayout2->addSpacing(5);
     vlayout2->addWidget(shellComboBox);
     vlayout2->addSpacing(5);
     vlayout2->addWidget(groupComboBox);
     if(vm==VIEWMODE_NEW)
     {
         vlayout2->addSpacing(5);
         vlayout2->addWidget(skelCheckBox);
     }
     hlayout->addLayout(vlayout1);
     hlayout->addLayout(vlayout2);
 
     myTabWidget->addTab(tabpage,"User Info");
 }
 
 /**
  *  Creates the second tab containing additional groups for the user.
  *
  */
 void UserDialog::setupTab2()
 {
     QWidget *tabpage = new QWidget(myTabWidget,"page2");
     QVBoxLayout *layout = new QVBoxLayout(tabpage);
     layout->setMargin(5);
 
     // Additional groups
     groupsListView=new QListView(tabpage,"groups");
     groupsListView->addColumn("Additional groups");
     groupsListView->setColumnWidthMode(0,QListView::Maximum);
     groupsListView->setMultiSelection(false);
     groupsListView->setAllColumnsShowFocus(false);
 
     layout->addSpacing(5);
     // Grouplist
     layout->addWidget(groupsListView);
 
     myTabWidget->addTab(tabpage,"User Groups");
 }
 
 /**
  * Static function that creates the userinfo dialog.
  * The user will be prompted to add a user.
  *
  * @param uid This is a suggested available UID.
  * @param gid This is a suggested available GID.
  *
  * @return <code>true</code> if the user was successfully added, otherwise <code>false</code>.
  *
  */
 bool UserDialog::addUser(int uid, int gid)
 {
     QCheckListItem *temp;
     QFile ozTest;
     int oz=false;
     if(ODevice::inst()->system()==System_OpenZaurus) oz=true;
     // viewmode is a workaround for a bug in qte-2.3.4 that gives bus error on manipulating adduserDialog's widgets here.
     UserDialog *adduserDialog=new UserDialog(VIEWMODE_NEW);
     adduserDialog->setCaption(tr("Add User"));
     adduserDialog->userID=uid;    // Set next available UID as default uid.
     adduserDialog->groupID=gid;    // Set next available GID as default gid.
     // Insert default group into groupComboBox
     adduserDialog->groupComboBox->insertItem("<create new group>",0);
     adduserDialog->uidLineEdit->setText(QString::number(uid));
     // If we're running on OZ, add new users to some default groups.
     if(oz)
     {
         QListViewItemIterator iter( adduserDialog->groupsListView );