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
@@ -21,16 +21,18 @@
 
 #include <qvaluelist.h>
 #include <qtl.h>
 #include <qstring.h>
 #include <qscrollview.h>
 #include <qobject.h>
 #include <qlayout.h>
 
+using namespace Opie::Core;
+using namespace Opie::Ui;
 FortunePluginWidget::FortunePluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent, name )
 {
 
 	fortune = NULL;
 	getFortune();
 }
 
@@ -56,18 +58,18 @@ void FortunePluginWidget::getFortune() {
 //	fortune->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ) );
 
 	fortune->setText( QString("Obtaining fortune...") );
 	layoutFortune->addWidget( fortune );
 
 	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 :(");
 		fortune->setText( QString("Failed to obtain fortune.") );
 		delete fortuneProcess;
 		fortuneProcess = 0;
 	}
 
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
@@ -28,18 +28,18 @@ class FortunePluginWidget : public QWidget
 
 	Q_OBJECT
 
 public:
 	FortunePluginWidget( QWidget *parent,  const char *name );
 	~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
@@ -6,16 +6,18 @@
 #include <qlineedit.h>
 #include <qvariant.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpe/config.h>
 #include <qstringlist.h>
+using namespace Opie::Core;
+using namespace Opie::Core;
 #include <qmainwindow.h>
 #include "helpwindow.h"
 
 #include <stdlib.h>
 // #include <sys/stat.h>
 // #include <unistd.h>
 
 InputDialog::InputDialog( )
@@ -55,17 +57,17 @@ void InputDialog::doLookup() {
      qDebug(cmd);
 
 
 /*
       OProcess proc;
       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());
      HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup");
      StockLookup->setCaption("Symbol");
      StockLookup->showMaximized();
      StockLookup->show();
      LineEdit1->text();
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
@@ -17,14 +17,14 @@ class InputDialog : public  QMainWindow {
 public:
     InputDialog(  );
     ~InputDialog();
 
 private:
     QLineEdit* LineEdit1;
 private slots:
     void doLookup();
-    void showBrowser(OProcess*);
+    void showBrowser(Opie::Core::OProcess*);
 protected slots:
 
 };
 
 #endif // INPUTDIALOG_H
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
@@ -15,16 +15,18 @@
    ***************************************************************************/
 
   #include <opie2/oticker.h>
 
   #include <qpe/config.h>
 
   #include <qlayout.h>
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 extern "C" {
   #include "libstocks/stocks.h"
   }
 
   #include <pthread.h>
 
   #include "stocktickerpluginwidget.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
@@ -18,18 +18,18 @@
 #ifndef STOCKTICKERL_PLUGIN_WIDGET_H
 #define STOCKTICKERL_PLUGIN_WIDGET_H
 
 #include <qsocket.h>
 #include <qstring.h>
 #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>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.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
@@ -16,29 +16,29 @@
 
 
 #ifndef MAIL_PLUGIN_WIDGET_H
 #define MAIL_PLUGIN_WIDGET_H
 
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
 
 class MailPluginWidget : public QWidget {
 
     Q_OBJECT
 
 
 public:
     MailPluginWidget( QWidget *parent,  const char *name );
     ~MailPluginWidget();
 
 protected slots:
     void startMail();
 
 private:
-    OClickableLabel *mailLabel;
+    Opie::Ui::OClickableLabel *mailLabel;
     void readConfig();
     void getInfo();
 };
 
 #endif
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
@@ -35,16 +35,17 @@
 
 #include <opie2/oprocess.h>
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include "weatherpluginwidget.h"
 
+using namespace Opie::Core;
 WeatherPluginWidget::WeatherPluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent,  name )
 {
 	QHBoxLayout *layout = new QHBoxLayout( this );
 	layout->setAutoAdd( TRUE );
 	layout->setSpacing( 2 );
 
 	weatherIcon = new QLabel( this );
@@ -100,17 +101,17 @@ void WeatherPluginWidget::retreiveData()
 	if ( file.exists() )
 	{
 		file.remove();
 	}
 
 	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();
 }
 
 void WeatherPluginWidget::displayWeather()
 {
 	weatherData = QString::null;
 
 	QFile file( localFile );
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
@@ -27,17 +27,17 @@
 */
 
 #ifndef WEATHER_PLUGIN_WIDGET_H
 #define WEATHER_PLUGIN_WIDGET_H
 
 #include <qstring.h>
 #include <qwidget.h>
 
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 class QLabel;
 class QTimer;
 
 class WeatherPluginWidget : public QWidget {
 
     Q_OBJECT
 
 	public:
@@ -60,12 +60,12 @@ class WeatherPluginWidget : public QWidget {
 		void retreiveData();
 		void displayWeather();
 		void getTemp( const QString & );
 		void getWind( const QString & );
 		void getPressure( const QString & );
 		void getIcon( const QString & );
 
 	private slots:
-		void dataRetrieved( OProcess * );
+		void dataRetrieved( Opie::Core::OProcess * );
 };
 
 #endif