summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/fortune/fortunepluginwidget.cpp6
-rw-r--r--noncore/todayplugins/fortune/fortunepluginwidget.h6
-rw-r--r--noncore/todayplugins/stockticker/stockticker/inputDialog.cpp4
-rw-r--r--noncore/todayplugins/stockticker/stockticker/inputDialog.h2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.h4
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktimerpluginwidget.h4
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.cpp3
-rw-r--r--noncore/todayplugins/weather/weatherpluginwidget.h4
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 @@
26#include <qobject.h> 26#include <qobject.h>
27#include <qlayout.h> 27#include <qlayout.h>
28 28
29using namespace Opie::Core;
30using namespace Opie::Ui;
29FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) 31FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name )
30 : QWidget( parent, name ) 32 : QWidget( parent, name )
31{ 33{
@@ -61,8 +63,8 @@ void FortunePluginWidget::getFortune() {
61 fortuneProcess = new OProcess(); 63 fortuneProcess = new OProcess();
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) ) {
68 qWarning("could not start :("); 70 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:
33 ~FortunePluginWidget(); 33 ~FortunePluginWidget();
34 34
35private: 35private:
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
41private slots: 41private slots:
42 void slotStdOut( OProcess*, char*, int ); 42 void slotStdOut( Opie::Core::OProcess*, char*, int );
43}; 43};
44 44
45#endif 45#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 @@
11#include <qlayout.h> 11#include <qlayout.h>
12#include <qpe/config.h> 12#include <qpe/config.h>
13#include <qstringlist.h> 13#include <qstringlist.h>
14using namespace Opie::Core;
15using namespace Opie::Core;
14#include <qmainwindow.h> 16#include <qmainwindow.h>
15#include "helpwindow.h" 17#include "helpwindow.h"
16 18
@@ -60,7 +62,7 @@ void InputDialog::doLookup() {
60 proc << "/usr/bin/wget"; 62 proc << "/usr/bin/wget";
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*/
66 system(cmd.latin1()); 68 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:
22 QLineEdit* LineEdit1; 22 QLineEdit* LineEdit1;
23private slots: 23private slots:
24 void doLookup(); 24 void doLookup();
25 void showBrowser(OProcess*); 25 void showBrowser(Opie::Core::OProcess*);
26protected slots: 26protected slots:
27 27
28}; 28};
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 @@
20 20
21 #include <qlayout.h> 21 #include <qlayout.h>
22 22
23using namespace Opie::Ui;
24using namespace Opie::Ui;
23extern "C" { 25extern "C" {
24 #include "libstocks/stocks.h" 26 #include "libstocks/stocks.h"
25 } 27 }
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 @@
23#include <qwidget.h> 23#include <qwidget.h>
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>
30#include <sys/uio.h> 30#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 @@
21#include <qstring.h> 21#include <qstring.h>
22#include <qwidget.h> 22#include <qwidget.h>
23 23
24#include <opie/oclickablelabel.h> 24#include <opie2/oclickablelabel.h>
25 25
26class MailPluginWidget : public QWidget { 26class MailPluginWidget : public QWidget {
27 27
@@ -36,7 +36,7 @@ protected slots:
36 void startMail(); 36 void startMail();
37 37
38private: 38private:
39 OClickableLabel *mailLabel; 39 Opie::Ui::OClickableLabel *mailLabel;
40 void readConfig(); 40 void readConfig();
41 void getInfo(); 41 void getInfo();
42}; 42};
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 @@
40 40
41#include "weatherpluginwidget.h" 41#include "weatherpluginwidget.h"
42 42
43using namespace Opie::Core;
43WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name ) 44WeatherPluginWidget::WeatherPluginWidget( QWidget *parent, const char* name )
44 : QWidget( parent, name ) 45 : QWidget( parent, name )
45{ 46{
@@ -105,7 +106,7 @@ void WeatherPluginWidget::retreiveData()
105 OProcess *proc = new OProcess; 106 OProcess *proc = new OProcess;
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}
111 112
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 @@
32#include <qstring.h> 32#include <qstring.h>
33#include <qwidget.h> 33#include <qwidget.h>
34 34
35class OProcess; 35namespace Opie {namespace Core {class Opie::Core::OProcess;}}
36class QLabel; 36class QLabel;
37class QTimer; 37class QTimer;
38 38
@@ -65,7 +65,7 @@ class WeatherPluginWidget : public QWidget {
65 void getIcon( const QString & ); 65 void getIcon( const QString & );
66 66
67 private slots: 67 private slots:
68 void dataRetrieved( OProcess * ); 68 void dataRetrieved( Opie::Core::OProcess * );
69}; 69};
70 70
71#endif 71#endif