Make use of ODP

3 files changed, 9 insertions, 7 deletions

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
@@ -27,7 +27,8 @@
 */
 
 #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
@@ -45,12 +45,14 @@
 #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 );
@@ -185,15 +187,15 @@ void MainWindow::runNTP()
         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();
 
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
@@ -37,13 +37,12 @@
 class TimeTabWidget;
 class FormatTabWidget;
 class SettingsTabWidget;
 class NTPTabWidget;
 class PredictTabWidget;
 
-using Opie::OTabWidget;
 
 class QDateTime;
 class QSocket;
 class QTimer;
 
 class MainWindow : public QDialog
@@ -57,24 +56,24 @@ public:
 
 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;
@@ -87,13 +86,13 @@ private slots:
     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