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
@@ -58,4 +58,5 @@
 #include "global.h"
+using namespace Opie::Ui;
 enum {
    MAXLINES = 100,
@@ -234,5 +235,5 @@ void InstallDlgImpl :: optionsSelected()
        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() )
        {
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
@@ -43,4 +43,5 @@
 #include "global.h"
+using namespace Opie::Core;
 Ipkg :: Ipkg()
 {
@@ -289,11 +290,11 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
    // 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)));
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
@@ -48,5 +48,5 @@
 #define VERBOSE_WGET                            0x0020
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
 class Ipkg : public QObject
@@ -71,6 +71,6 @@ signals:
 public slots:
-    void commandStdout(OProcess*, char *buffer, int buflen);
+    void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen);
-    void commandStderr(OProcess*, char *buffer, int buflen);
+    void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen);
    void processFinished();
    void abort();
@@ -86,5 +86,5 @@ private:
    QString destDir;
    QString runtimeDir;
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
    int flags;
    int infoLevel;
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
@@ -36,3 +36,4 @@ 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
@@ -53,4 +53,6 @@
 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 )
@@ -64,5 +66,5 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
    // Setup tabs for all info
-    Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this );
+    OTabWidget *tabwidget = new OTabWidget( this );
    layout->addWidget( tabwidget );
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
@@ -5,4 +5,5 @@
+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
@@ -23,3 +23,4 @@
 #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
@@ -23,3 +23,4 @@
 #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
@@ -5,4 +5,5 @@
 #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
@@ -31,3 +31,4 @@
 #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
@@ -49,4 +49,6 @@
 #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 )
@@ -189,7 +191,7 @@ void MainWindow::runNTP()
    {
        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*)) );
    }
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
@@ -41,5 +41,4 @@ class NTPTabWidget;
 class PredictTabWidget;
-using Opie::OTabWidget;
 class QDateTime;
@@ -61,5 +60,5 @@ protected:
 private:
-    OTabWidget *mainWidget;
+    Opie::Ui::OTabWidget *mainWidget;
    TimeTabWidget     *timeTab;
@@ -72,5 +71,5 @@ private:
    bool predictTabEnabled;
-    OProcess *ntpProcess;
+    Opie::Core::OProcess *ntpProcess;
    QTimer   *ntpTimer;
    QSocket  *ntpSock;
@@ -91,6 +90,6 @@ private slots:
    void slotTimerGetNTPTime();
    void slotProbeNTPServer();
-    void slotNtpOutput( OProcess *, char *, int );
+    void slotNtpOutput( Opie::Core::OProcess *, char *, int );
-    void slotNtpFinished( OProcess* );
+    void slotNtpFinished( Opie::Core::OProcess* );
    void slotNTPDelayChanged( int );
    void slotCheckNtp( int );
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
@@ -23,4 +23,6 @@
 * 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) {
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
@@ -2,4 +2,5 @@
 #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
@@ -2,5 +2,5 @@ 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
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
@@ -26,4 +26,5 @@
 * 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);
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
@@ -43,4 +43,6 @@
 * 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();
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
@@ -10,5 +10,5 @@ class InterfaceSetupImp;
 class Interface;
 class Config;
-class OPacket;
+namespace Opie {namespace Net {class OPacket;}}
 class QListViewItem;
@@ -39,6 +39,6 @@ private:
  void parseKeyStr(QString keystr);
-  void handlePacket( OPacket* );
+  void handlePacket( Opie::Net::OPacket* );
-  void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac );
+  void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const Opie::Net::OMacAddress& mac );
  InterfaceSetupImp *interfaceSetup;
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
@@ -50,4 +50,5 @@
 #include "opackagemanager.h"
+using namespace Opie::Ui;
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
                        OPackage::Command command1, QStringList *packages1,
@@ -276,5 +277,5 @@ void InstallDlg::slotBtnOptions()
    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() )
    {
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
@@ -32,3 +32,4 @@
 #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
@@ -43,4 +43,5 @@
 #include <qpe/resource.h>
+using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
    : QDialog( parent, QString::null, true )
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
@@ -75,5 +75,5 @@ private:
    // 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
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
@@ -39,4 +39,5 @@
 #include <opie2/otabwidget.h>
+using namespace Opie::Ui;
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
    : QWidget( 0x0 )
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
@@ -23,4 +23,5 @@
 #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
@@ -34,4 +34,5 @@
 #include <ctype.h>
+using namespace Opie::Core;
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
@@ -46,9 +47,9 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
    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*)));
@@ -87,7 +88,7 @@ void SSHKeysApp::doRefreshListButton()
    }
-    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)));
@@ -278,7 +279,7 @@ 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)));
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
@@ -44,5 +44,5 @@ class SSHKeysApp : public SSHKeysBase
    QString incoming_keyfingerprint;
    QString incoming_noise;
-    OProcess addprocess;
+    Opie::Core::OProcess addprocess;
    QString pending_stdout;
    QString pending_stderr;
@@ -52,8 +52,8 @@ class SSHKeysApp : public SSHKeysBase
    void doRefreshListButton();
    void doRemoveAllButton();
-    void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
+    void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
-    void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
+    void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
-    void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
+    void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen);
-    void ssh_add_exited(OProcess *proc);
+    void ssh_add_exited(Opie::Core::OProcess *proc);
    void add_text_changed(const QString &text);
 };
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
@@ -52,5 +52,8 @@ extern double round(double);
 #endif
+using namespace Opie::Ui;
+using namespace Opie::Core;
 extern "C"
 {
    void BenchFFT( void );
@@ -176,10 +179,10 @@ void BenchmarkInfo::machineActivated( int index )
    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++) );
 }
@@ -260,5 +263,5 @@ int BenchmarkInfo::textRendering( int seconds )
    int loops = 0;
-    
    while ( t.elapsed() < stop )
    {
@@ -270,5 +273,5 @@ int BenchmarkInfo::textRendering( int seconds )
        ++loops;
    }
-    
    return loops * text.length();
 }
@@ -291,5 +294,5 @@ int BenchmarkInfo::gfxRendering( int seconds )
    int stop = t.elapsed() + seconds*1000;
    int loops = 0;
-    
    while ( t.elapsed() < stop )
    {
@@ -302,5 +305,5 @@ int BenchmarkInfo::gfxRendering( int seconds )
    t.restart();
    stop = t.elapsed() + seconds*1000;
-    
    while ( t.elapsed() < stop )
    {
@@ -315,5 +318,5 @@ int BenchmarkInfo::gfxRendering( int seconds )
    t.restart();
    stop = t.elapsed() + seconds*1000;
-    
    while ( t.elapsed() < stop )
    {
@@ -327,5 +330,5 @@ int BenchmarkInfo::gfxRendering( int seconds )
    t.restart();
    stop = t.elapsed() + seconds*1000;
-    
    while ( t.elapsed() < stop )
    {
@@ -335,5 +338,5 @@ int BenchmarkInfo::gfxRendering( int seconds )
    return loops;
-    
 }
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
@@ -24,7 +24,7 @@
 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
@@ -36,11 +36,11 @@ public:
    ~BenchmarkInfo();
-    OCheckListItem* test_alu;
+    Opie::Ui::OCheckListItem* test_alu;
-    OCheckListItem* test_fpu;
+    Opie::Ui::OCheckListItem* test_fpu;
-    OCheckListItem* test_txt;
+    Opie::Ui::OCheckListItem* test_txt;
-    OCheckListItem* test_gfx;
+    Opie::Ui::OCheckListItem* test_gfx;
-    OCheckListItem* test_ram;
+    Opie::Ui::OCheckListItem* test_ram;
-    OCheckListItem* test_sd;
+    Opie::Ui::OCheckListItem* test_sd;
-    OCheckListItem* test_cf;
+    Opie::Ui::OCheckListItem* test_cf;
    bool main_rd;
@@ -53,5 +53,5 @@ public:
    QClipboard* clb;
    QComboBox* machineCombo;
-    OListView* tests;
+    Opie::Ui::OListView* tests;
    QPushButton* startButton;
    QDict <QStringList> machines;
@@ -59,5 +59,5 @@ public:
    int textRendering( int );
    int gfxRendering( int );
-    void performFileTest( const QString& fname, OCheckListItem* item );
+    void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item );
 private slots:
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
@@ -24,3 +24,4 @@
+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
@@ -37,4 +37,5 @@
 #include <qwhatsthis.h>
+using namespace Opie::Ui;
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
        : QWidget( parent, name, fl )
@@ -59,6 +60,6 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
    {
        QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
-        connect( ModulesView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
+        connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
-                 this, SLOT( viewModules(OListViewItem*) ) );
+                 this, SLOT( viewModules(QListViewItem*) ) );
    }
@@ -164,4 +165,9 @@ void ModulesInfo::slotSendClicked()
 }
+void ModulesInfo::viewModules( QListViewItem *module ) {
+    if ( !module )
+        return;
+    viewModules(  static_cast<OListViewItem*>( module ) );
+}
 void ModulesInfo::viewModules( OListViewItem *modules )
 {
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
@@ -27,6 +27,7 @@
 class Detail;
 class QComboBox;
-class OListView;
+class QListViewItem;
-class OListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 class ModulesInfo : public QWidget
@@ -38,5 +39,5 @@ public:
 private:
-        OListView* ModulesView;
+        Opie::Ui::OListView* ModulesView;
    QComboBox* CommandCB;
@@ -46,5 +47,6 @@ private slots:
    void updateData();
    void slotSendClicked();
-        void viewModules( OListViewItem * );
+    void viewModules( QListViewItem* );
+    void viewModules( Opie::Ui::OListViewItem * );
 };
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
@@ -39,4 +39,5 @@
 #include <signal.h>
+using namespace Opie::Ui;
 ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
        : QWidget( parent, name, fl )
@@ -56,6 +57,6 @@ ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
    ProcessView->setAllColumnsShowFocus( TRUE );
    QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
-    connect( ProcessView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
+    connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
-             this, SLOT( viewProcess(OListViewItem*) ) );
+             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." ) );
@@ -186,4 +187,10 @@ void ProcessInfo::slotSendClicked()
 }
+void ProcessInfo::viewProcess( QListViewItem* process ) {
+    if ( !process )
+        return;
+    viewProcess( static_cast<OListViewItem*>( process ) );
+}
 void ProcessInfo::viewProcess( OListViewItem *process )
 {
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
@@ -25,6 +25,7 @@
 class Detail;
 class QComboBox;
-class OListView;
+class QListViewItem;
-class OListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 class ProcessInfo : public QWidget
@@ -36,5 +37,5 @@ public:
 private:
-    OListView*   ProcessView;
+    Opie::Ui::OListView*   ProcessView;
    QComboBox*   SignalCB;
    QPushButton* SendButton;
@@ -45,5 +46,6 @@ private slots:
    void updateData();
    void slotSendClicked();
-    void viewProcess( OListViewItem * );
+    void viewProcess( QListViewItem* );
+    void viewProcess( Opie::Ui::OListViewItem * );
 };
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
@@ -39,4 +39,5 @@
 #include <qlayout.h>
+using namespace Opie::Ui;
 SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
    : QWidget( parent, name, WStyle_ContextHelp )
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
@@ -34,5 +34,5 @@
 #include <qwhatsthis.h>
-using namespace Opie;
+using namespace Opie::Core;
 VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
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
@@ -12,3 +12,4 @@
 #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
@@ -28,5 +28,5 @@
-using namespace Opie;
+using namespace Opie::Core;
@@ -35,4 +35,5 @@ using namespace Opie;
 *
 */
+using namespace Opie::Ui;
 UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl)
 {