author | zecke <zecke> | 2004-03-14 15:12:59 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:12:59 (UTC) |
commit | a104a921518d4427bf3dc9edd2c968133420607c (patch) (unidiff) | |
tree | 005a054e766250891039f9adf4bacf3d6f0486f0 | |
parent | 8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (diff) | |
download | opie-a104a921518d4427bf3dc9edd2c968133420607c.zip opie-a104a921518d4427bf3dc9edd2c968133420607c.tar.gz opie-a104a921518d4427bf3dc9edd2c968133420607c.tar.bz2 |
ODP changes
9 files changed, 21 insertions, 14 deletions
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp index 3aa978c..c3ee546 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp +++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp | |||
@@ -27,4 +27,6 @@ | |||
27 | #include <qlayout.h> | 27 | #include <qlayout.h> |
28 | 28 | ||
29 | using namespace Opie::Core; | ||
30 | using namespace Opie::Ui; | ||
29 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) | 31 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) |
30 | : QWidget( parent, name ) | 32 | : QWidget( parent, name ) |
@@ -62,6 +64,6 @@ void FortunePluginWidget::getFortune() { | |||
62 | *fortuneProcess << "fortune"; | 64 | *fortuneProcess << "fortune"; |
63 | 65 | ||
64 | connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*,char*,int) ), | 66 | connect(fortuneProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
65 | this, SLOT(slotStdOut(OProcess*,char*,int) ) ); | 67 | this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int) ) ); |
66 | 68 | ||
67 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 69 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.h b/noncore/todayplugins/fortune/fortunepluginwidget.h index abb7bed..1b71430 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.h +++ b/noncore/todayplugins/fortune/fortunepluginwidget.h | |||
@@ -34,11 +34,11 @@ public: | |||
34 | 34 | ||
35 | private: | 35 | private: |
36 | OTicker *fortune; | 36 | Opie::Ui::OTicker *fortune; |
37 | OProcess *fortuneProcess; | 37 | Opie::Core::OProcess *fortuneProcess; |
38 | 38 | ||
39 | void getFortune(); | 39 | void getFortune(); |
40 | 40 | ||
41 | private slots: | 41 | private slots: |
42 | void slotStdOut( OProcess*, char*, int ); | 42 | void slotStdOut( Opie::Core::OProcess*, char*, int ); |
43 | }; | 43 | }; |
44 | 44 | ||
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index b3fa708..ce35256 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -12,4 +12,6 @@ | |||
12 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
13 | #include <qstringlist.h> | 13 | #include <qstringlist.h> |
14 | using namespace Opie::Core; | ||
15 | using namespace Opie::Core; | ||
14 | #include <qmainwindow.h> | 16 | #include <qmainwindow.h> |
15 | #include "helpwindow.h" | 17 | #include "helpwindow.h" |
@@ -61,5 +63,5 @@ void InputDialog::doLookup() { | |||
61 | proc<<"-O"<< tempHtml<< url; | 63 | proc<<"-O"<< tempHtml<< url; |
62 | 64 | ||
63 | connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); | 65 | connect( &proc, SIGNAL( processExited(Opie::Core::OProcess*)),this, SLOT( showBrowser(Opie::Core::OProcess*))); |
64 | proc.start( OProcess::NotifyOnExit); | 66 | proc.start( OProcess::NotifyOnExit); |
65 | */ | 67 | */ |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.h b/noncore/todayplugins/stockticker/stockticker/inputDialog.h index a1c00bd..d7ff94c 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.h +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.h | |||
@@ -23,5 +23,5 @@ private: | |||
23 | private slots: | 23 | private slots: |
24 | void doLookup(); | 24 | void doLookup(); |
25 | void showBrowser(OProcess*); | 25 | void showBrowser(Opie::Core::OProcess*); |
26 | protected slots: | 26 | protected slots: |
27 | 27 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index 51113ba..aaeb5ee 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -21,4 +21,6 @@ | |||
21 | #include <qlayout.h> | 21 | #include <qlayout.h> |
22 | 22 | ||
23 | using namespace Opie::Ui; | ||
24 | using namespace Opie::Ui; | ||
23 | extern "C" { | 25 | extern "C" { |
24 | #include "libstocks/stocks.h" | 26 | #include "libstocks/stocks.h" |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h index 8a8fbf8..727e289 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h | |||
@@ -24,6 +24,6 @@ | |||
24 | #include <qlineedit.h> | 24 | #include <qlineedit.h> |
25 | 25 | ||
26 | #include <opie/oclickablelabel.h> | 26 | #include <opie2/oclickablelabel.h> |
27 | #include <opie/oticker.h> | 27 | #include <opie2/oticker.h> |
28 | 28 | ||
29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktimerpluginwidget.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktimerpluginwidget.h index d7b6047..667d9c9 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktimerpluginwidget.h +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktimerpluginwidget.h | |||
@@ -22,5 +22,5 @@ | |||
22 | #include <qwidget.h> | 22 | #include <qwidget.h> |
23 | 23 | ||
24 | #include <opie/oclickablelabel.h> | 24 | #include <opie2/oclickablelabel.h> |
25 | 25 | ||
26 | class MailPluginWidget : public QWidget { | 26 | class MailPluginWidget : public QWidget { |
@@ -37,5 +37,5 @@ protected slots: | |||
37 | 37 | ||
38 | private: | 38 | private: |
39 | OClickableLabel *mailLabel; | 39 | Opie::Ui::OClickableLabel *mailLabel; |
40 | void readConfig(); | 40 | void readConfig(); |
41 | void getInfo(); | 41 | void getInfo(); |
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.cpp b/noncore/todayplugins/weather/weatherpluginwidget.cpp index ad99a43..8e00c36 100644 --- a/noncore/todayplugins/weather/weatherpluginwidget.cpp +++ b/noncore/todayplugins/weather/weatherpluginwidget.cpp | |||
@@ -41,4 +41,5 @@ | |||
41 | #include "weatherpluginwidget.h" | 41 | #include "weatherpluginwidget.h" |
42 | 42 | ||
43 | using namespace Opie::Core; | ||
43 | WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) | 44 | WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) |
44 | : QWidget( parent, name ) | 45 | : QWidget( parent, name ) |
@@ -106,5 +107,5 @@ void WeatherPluginWidget::retreiveData() | |||
106 | 107 | ||
107 | *proc << "wget" << "-q" << remoteFile << "-O" << localFile; | 108 | *proc << "wget" << "-q" << remoteFile << "-O" << localFile; |
108 | connect( proc, SIGNAL( processExited(OProcess*) ), this, SLOT( dataRetrieved(OProcess*) ) ); | 109 | connect( proc, SIGNAL( processExited(Opie::Core::OProcess*) ), this, SLOT( dataRetrieved(Opie::Core::OProcess*) ) ); |
109 | proc->start(); | 110 | proc->start(); |
110 | } | 111 | } |
diff --git a/noncore/todayplugins/weather/weatherpluginwidget.h b/noncore/todayplugins/weather/weatherpluginwidget.h index d2bbd8b..93d0f59 100644 --- a/noncore/todayplugins/weather/weatherpluginwidget.h +++ b/noncore/todayplugins/weather/weatherpluginwidget.h | |||
@@ -33,5 +33,5 @@ | |||
33 | #include <qwidget.h> | 33 | #include <qwidget.h> |
34 | 34 | ||
35 | class OProcess; | 35 | namespace Opie {namespace Core {class Opie::Core::OProcess;}} |
36 | class QLabel; | 36 | class QLabel; |
37 | class QTimer; | 37 | class QTimer; |
@@ -66,5 +66,5 @@ class WeatherPluginWidget : public QWidget { | |||
66 | 66 | ||
67 | private slots: | 67 | private slots: |
68 | void dataRetrieved( OProcess * ); | 68 | void dataRetrieved( Opie::Core::OProcess * ); |
69 | }; | 69 | }; |
70 | 70 | ||