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
@@ -59,2 +59,3 @@
 
+using namespace Opie::Ui;
 enum {
@@ -235,3 +236,3 @@ void InstallDlgImpl :: optionsSelected()
 
-        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
@@ -44,2 +44,3 @@
 
+using namespace Opie::Core;
 Ipkg :: Ipkg()
@@ -290,9 +291,9 @@ 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
@@ -49,3 +49,3 @@
 
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
 
@@ -72,4 +72,4 @@ signals:
 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();
@@ -87,3 +87,3 @@ private:
     QString runtimeDir;
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
     int flags;
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
@@ -37,2 +37,3 @@ 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
@@ -54,2 +54,4 @@ using namespace std;
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
@@ -65,3 +67,3 @@ 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
@@ -6,2 +6,3 @@
 
+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
@@ -24,2 +24,3 @@
 
+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
@@ -24,2 +24,3 @@
 
+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
@@ -6,2 +6,3 @@
 
+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
@@ -32,2 +32,3 @@
 
+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
@@ -50,2 +50,4 @@
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
 MainWindow::MainWindow( QWidget *parent , const char *name,  bool modal, WFlags f )
@@ -190,5 +192,5 @@ 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
@@ -42,3 +42,2 @@ class PredictTabWidget;
 
-using Opie::OTabWidget;
 
@@ -62,3 +61,3 @@ protected:
 private:
-    OTabWidget *mainWidget;
+    Opie::Ui::OTabWidget *mainWidget;
 
@@ -73,3 +72,3 @@ private:
 
-    OProcess *ntpProcess;
+    Opie::Core::OProcess *ntpProcess;
     QTimer   *ntpTimer;
@@ -92,4 +91,4 @@ private slots:
     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 );
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
@@ -24,2 +24,4 @@
  */
+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){
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
@@ -3,2 +3,3 @@
 
+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
@@ -3,3 +3,3 @@ 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/
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
@@ -27,2 +27,3 @@
  */
+using namespace Opie::Core;
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
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
@@ -44,2 +44,4 @@
  */
+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("*") {
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
@@ -11,3 +11,3 @@ class Interface;
 class Config;
-class OPacket;
+namespace Opie {namespace Net {class OPacket;}}
 class QListViewItem;
@@ -40,4 +40,4 @@ private:
 
-  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 );
 
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
@@ -51,2 +51,3 @@
 
+using namespace Opie::Ui;
 InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
@@ -277,3 +278,3 @@ void InstallDlg::slotBtnOptions()
 
-    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
@@ -33,2 +33,3 @@
 
+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
@@ -44,2 +44,3 @@
 
+using namespace Opie::Ui;
 OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
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
@@ -76,3 +76,3 @@ private:
     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
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
@@ -40,2 +40,3 @@
 
+using namespace Opie::Ui;
 PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
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
@@ -24,2 +24,3 @@
 
+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
@@ -35,2 +35,3 @@
 
+using namespace Opie::Core;
 static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
@@ -47,7 +48,7 @@ SSHKeysApp::SSHKeysApp( QWidget* parent,  const char* name, WFlags fl )
 
-    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*)));
@@ -88,5 +89,5 @@ 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)));
@@ -279,5 +280,5 @@ void SSHKeysApp::doRemoveAllButton()
 
-    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
@@ -45,3 +45,3 @@ class SSHKeysApp : public SSHKeysBase
     QString incoming_noise;
-    OProcess addprocess;
+    Opie::Core::OProcess addprocess;
     QString pending_stdout;
@@ -53,6 +53,6 @@ class SSHKeysApp : public SSHKeysBase
     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);
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
@@ -53,3 +53,6 @@ extern double round(double);
 
+using namespace Opie::Ui;
+using namespace Opie::Core;
 extern "C"
+
 {
@@ -177,3 +180,3 @@ void BenchmarkInfo::machineActivated( int index )
     test_alu->setText( 2, *(it++) );
-    test_fpu->setText( 2, *(it++) );   
+    test_fpu->setText( 2, *(it++) );
     test_txt->setText( 2, *(it++) );
@@ -182,3 +185,3 @@ void BenchmarkInfo::machineActivated( int index )
     test_sd->setText( 2, *(it++) );
-    test_cf->setText( 2, *(it++) );   
+    test_cf->setText( 2, *(it++) );
 }
@@ -261,3 +264,3 @@ int BenchmarkInfo::textRendering( int seconds )
     int loops = 0;
-    
+
     while ( t.elapsed() < stop )
@@ -271,3 +274,3 @@ int BenchmarkInfo::textRendering( int seconds )
     }
-    
+
     return loops * text.length();
@@ -292,3 +295,3 @@ int BenchmarkInfo::gfxRendering( int seconds )
     int loops = 0;
-    
+
     while ( t.elapsed() < stop )
@@ -303,3 +306,3 @@ int BenchmarkInfo::gfxRendering( int seconds )
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
@@ -316,3 +319,3 @@ int BenchmarkInfo::gfxRendering( int seconds )
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
@@ -328,3 +331,3 @@ int BenchmarkInfo::gfxRendering( int seconds )
     stop = t.elapsed() + seconds*1000;
-    
+
     while ( t.elapsed() < stop )
@@ -336,3 +339,3 @@ 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
@@ -25,5 +25,5 @@ class QClipboard;
 class QComboBox;
-class OCheckListItem;
+namespace Opie {namespace Ui {class OCheckListItem;}}
 class QPushButton;
-class OListView;
+namespace Opie {namespace Ui {class OListView;}}
 
@@ -37,9 +37,9 @@ public:
 
-    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;
 
@@ -54,3 +54,3 @@ public:
     QComboBox* machineCombo;
-    OListView* tests;
+    Opie::Ui::OListView* tests;
     QPushButton* startButton;
@@ -60,3 +60,3 @@ public:
     int gfxRendering( int );
-    void performFileTest( const QString& fname, OCheckListItem* item );
+    void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item );
 
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
@@ -25,2 +25,3 @@
 
+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
@@ -38,2 +38,3 @@
 
+using namespace Opie::Ui;
 ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
@@ -60,4 +61,4 @@ ModulesInfo::ModulesInfo( QWidget* parent,  const char* name, WFlags fl )
         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*) ) );
     }
@@ -165,2 +166,7 @@ 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
@@ -28,4 +28,5 @@ class Detail;
 class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 
@@ -39,3 +40,3 @@ public:
 private:
-	OListView* ModulesView;
+	Opie::Ui::OListView* ModulesView;
     QComboBox* CommandCB;
@@ -47,3 +48,4 @@ private slots:
     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
@@ -40,2 +40,3 @@
 
+using namespace Opie::Ui;
 ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
@@ -57,4 +58,4 @@ ProcessInfo::ProcessInfo( QWidget* parent,  const char* name, WFlags fl )
     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 );
@@ -187,2 +188,8 @@ 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
@@ -26,4 +26,5 @@ class Detail;
 class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
 
@@ -37,3 +38,3 @@ public:
 private:
-    OListView*   ProcessView;
+    Opie::Ui::OListView*   ProcessView;
     QComboBox*   SignalCB;
@@ -46,3 +47,4 @@ private slots:
     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
@@ -40,2 +40,3 @@
 
+using namespace Opie::Ui;
 SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
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
@@ -35,3 +35,3 @@
 
-using namespace Opie;
+using namespace Opie::Core;
 
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
@@ -13,2 +13,3 @@
 
+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
@@ -29,3 +29,3 @@
 
-using namespace Opie;
+using namespace Opie::Core;
 
@@ -36,2 +36,3 @@ 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)