Diffstat (limited to 'noncore/settings/netsystemtime') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/netsystemtime/main.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/settings/netsystemtime/mainwindow.h | 9 |
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 | |||
@@ -30,4 +30,5 @@ | |||
30 | 30 | ||
31 | #include <opie2/oapplicationfactory.h> | 31 | #include <opie2/oapplicationfactory.h> |
32 | 32 | ||
33 | using namespace Opie::Core; | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 34 | 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 | |||
@@ -48,6 +48,8 @@ | |||
48 | #include <qstring.h> | 48 | #include <qstring.h> |
49 | #include <qtimer.h> | 49 | #include <qtimer.h> |
50 | 50 | ||
51 | using namespace Opie::Ui; | ||
52 | using namespace Opie::Core; | ||
51 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) | 53 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
52 | : QDialog( 0x0, 0x0, TRUE, 0 ) | 54 | : QDialog( 0x0, 0x0, TRUE, 0 ) |
53 | { | 55 | { |
@@ -188,9 +190,9 @@ void MainWindow::runNTP() | |||
188 | if ( !ntpProcess ) | 190 | if ( !ntpProcess ) |
189 | { | 191 | { |
190 | ntpProcess = new OProcess(); | 192 | ntpProcess = new OProcess(); |
191 | connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), | 193 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
192 | this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); | 194 | this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); |
193 | connect( ntpProcess, SIGNAL(processExited(OProcess*)), | 195 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), |
194 | this, SLOT(slotNtpFinished(OProcess*)) ); | 196 | this, SLOT(slotNtpFinished(OProcess*)) ); |
195 | } | 197 | } |
196 | 198 | ||
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 | |||
@@ -40,7 +40,6 @@ class SettingsTabWidget; | |||
40 | class NTPTabWidget; | 40 | class NTPTabWidget; |
41 | class PredictTabWidget; | 41 | class PredictTabWidget; |
42 | 42 | ||
43 | using Opie::OTabWidget; | ||
44 | 43 | ||
45 | class QDateTime; | 44 | class QDateTime; |
46 | class QSocket; | 45 | class QSocket; |
@@ -60,7 +59,7 @@ protected: | |||
60 | void reject(); | 59 | void reject(); |
61 | 60 | ||
62 | private: | 61 | private: |
63 | OTabWidget *mainWidget; | 62 | Opie::Ui::OTabWidget *mainWidget; |
64 | 63 | ||
65 | TimeTabWidget *timeTab; | 64 | TimeTabWidget *timeTab; |
66 | FormatTabWidget *formatTab; | 65 | FormatTabWidget *formatTab; |
@@ -71,7 +70,7 @@ private: | |||
71 | bool ntpTabEnabled; | 70 | bool ntpTabEnabled; |
72 | bool predictTabEnabled; | 71 | bool predictTabEnabled; |
73 | 72 | ||
74 | OProcess *ntpProcess; | 73 | Opie::Core::OProcess *ntpProcess; |
75 | QTimer *ntpTimer; | 74 | QTimer *ntpTimer; |
76 | QSocket *ntpSock; | 75 | QSocket *ntpSock; |
77 | int ntpDelay; | 76 | int ntpDelay; |
@@ -90,8 +89,8 @@ private slots: | |||
90 | void slotGetNTPTime(); | 89 | void slotGetNTPTime(); |
91 | void slotTimerGetNTPTime(); | 90 | void slotTimerGetNTPTime(); |
92 | void slotProbeNTPServer(); | 91 | void slotProbeNTPServer(); |
93 | void slotNtpOutput( OProcess *, char *, int ); | 92 | void slotNtpOutput( Opie::Core::OProcess *, char *, int ); |
94 | void slotNtpFinished( OProcess* ); | 93 | void slotNtpFinished( Opie::Core::OProcess* ); |
95 | void slotNTPDelayChanged( int ); | 94 | void slotNTPDelayChanged( int ); |
96 | void slotCheckNtp( int ); | 95 | void slotCheckNtp( int ); |
97 | }; | 96 | }; |