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 @@ -28,2 +28,4 @@ +using namespace Opie::Core; +using namespace Opie::Ui; FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) @@ -63,4 +65,4 @@ void FortunePluginWidget::getFortune() { - connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*,char*,int) ), - this, SLOT(slotStdOut(OProcess*,char*,int) ) ); + connect(fortuneProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), + this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int) ) ); 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 @@ -35,4 +35,4 @@ public: private: - OTicker *fortune; - OProcess *fortuneProcess; + Opie::Ui::OTicker *fortune; + Opie::Core::OProcess *fortuneProcess; @@ -41,3 +41,3 @@ private: private slots: - void slotStdOut( OProcess*, char*, int ); + void slotStdOut( Opie::Core::OProcess*, char*, int ); }; 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 @@ -13,2 +13,4 @@ #include <qstringlist.h> +using namespace Opie::Core; +using namespace Opie::Core; #include <qmainwindow.h> @@ -62,3 +64,3 @@ void InputDialog::doLookup() { - connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); + connect( &proc, SIGNAL( processExited(Opie::Core::OProcess*)),this, SLOT( showBrowser(Opie::Core::OProcess*))); proc.start( OProcess::NotifyOnExit); 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 @@ -24,3 +24,3 @@ private slots: void doLookup(); - void showBrowser(OProcess*); + void showBrowser(Opie::Core::OProcess*); protected slots: 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 @@ -22,2 +22,4 @@ +using namespace Opie::Ui; +using namespace Opie::Ui; extern "C" { 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 @@ -25,4 +25,4 @@ -#include <opie/oclickablelabel.h> -#include <opie/oticker.h> +#include <opie2/oclickablelabel.h> +#include <opie2/oticker.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 @@ -23,3 +23,3 @@ -#include <opie/oclickablelabel.h> +#include <opie2/oclickablelabel.h> @@ -38,3 +38,3 @@ protected slots: private: - OClickableLabel *mailLabel; + Opie::Ui::OClickableLabel *mailLabel; void readConfig(); 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 @@ -42,2 +42,3 @@ +using namespace Opie::Core; WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) @@ -107,3 +108,3 @@ void WeatherPluginWidget::retreiveData() *proc << "wget" << "-q" << remoteFile << "-O" << localFile; - connect( proc, SIGNAL( processExited(OProcess*) ), this, SLOT( dataRetrieved(OProcess*) ) ); + connect( proc, SIGNAL( processExited(Opie::Core::OProcess*) ), this, SLOT( dataRetrieved(Opie::Core::OProcess*) ) ); proc->start(); 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 @@ -34,3 +34,3 @@ -class OProcess; +namespace Opie {namespace Core {class Opie::Core::OProcess;}} class QLabel; @@ -67,3 +67,3 @@ class WeatherPluginWidget : public QWidget { private slots: - void dataRetrieved( OProcess * ); + void dataRetrieved( Opie::Core::OProcess * ); }; |