9 files changed, 55 insertions, 33 deletions

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;