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
@@ -26,6 +26,8 @@
 #include <qobject.h>
 #include <qlayout.h>
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
 FortunePluginWidget::FortunePluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent, name )
 {
@@ -61,8 +63,8 @@ void FortunePluginWidget::getFortune() {
 	fortuneProcess = new OProcess();
 	*fortuneProcess << "fortune";
 
-	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) ) );
 
 	if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
 		qWarning("could not start :(");
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
@@ -33,13 +33,13 @@ public:
 	~FortunePluginWidget();
 
 private:
-	OTicker *fortune;
-	OProcess *fortuneProcess;
+	Opie::Ui::OTicker *fortune;
+	Opie::Core::OProcess *fortuneProcess;
 
 	void getFortune();
 
 private slots:
-	void slotStdOut( OProcess*, char*, int );
+	void slotStdOut( Opie::Core::OProcess*, char*, int );
 };
 
 #endif
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
@@ -11,6 +11,8 @@
 #include <qlayout.h>
 #include <qpe/config.h>
 #include <qstringlist.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
 #include <qmainwindow.h>
 #include "helpwindow.h"
 
@@ -60,7 +62,7 @@ void InputDialog::doLookup() {
       proc << "/usr/bin/wget";
       proc<<"-O"<< tempHtml<< url;
 
-      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);
 */
      system(cmd.latin1());
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
@@ -22,7 +22,7 @@ private:
     QLineEdit* LineEdit1;
 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
@@ -20,6 +20,8 @@
 
   #include <qlayout.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 extern "C" {
   #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
@@ -23,8 +23,8 @@
 #include <qwidget.h>
 #include <qlineedit.h>
 
-#include <opie/oclickablelabel.h>
-#include <opie/oticker.h>
+#include <opie2/oclickablelabel.h>
+#include <opie2/oticker.h>
 
 #include <sys/types.h>
 #include <sys/uio.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
@@ -21,7 +21,7 @@
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
 
 class MailPluginWidget : public QWidget {
 
@@ -36,7 +36,7 @@ protected slots:
     void startMail();
 
 private:
-    OClickableLabel *mailLabel;
+    Opie::Ui::OClickableLabel *mailLabel;
     void readConfig();
     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
@@ -40,6 +40,7 @@
 
 #include "weatherpluginwidget.h"
 
+using namespace Opie::Core;
 WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent,  name )
 {
@@ -105,7 +106,7 @@ void WeatherPluginWidget::retreiveData()
 	OProcess *proc = new OProcess;
 
 	*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
@@ -32,7 +32,7 @@
 #include <qstring.h>
 #include <qwidget.h>
 
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 class QLabel;
 class QTimer;
 
@@ -65,7 +65,7 @@ class WeatherPluginWidget : public QWidget {
 		void getIcon( const QString & );
 
 	private slots:
-		void dataRetrieved( OProcess * );
+		void dataRetrieved( Opie::Core::OProcess * );
 };
 
 #endif