6 files changed, 24 insertions, 21 deletions
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro index 2e4b4b3..74c60b1 100644 --- a/noncore/todayplugins/fortune/fortune.pro +++ b/noncore/todayplugins/fortune/fortune.pro | |||
@@ -1,4 +1,3 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
4 | 3 | ||
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp index c3ee546..c147567 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp +++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp | |||
@@ -17,7 +17,12 @@ | |||
17 | #include "fortunepluginwidget.h" | 17 | #include "fortunepluginwidget.h" |
18 | 18 | ||
19 | /* OPIE */ | ||
20 | #include <opie2/odebug.h> | ||
19 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
20 | #include <qpe/qcopenvelope_qws.h> | 22 | #include <qpe/qcopenvelope_qws.h> |
23 | using namespace Opie::Core; | ||
24 | using namespace Opie::Ui; | ||
21 | 25 | ||
26 | /* QT */ | ||
22 | #include <qvaluelist.h> | 27 | #include <qvaluelist.h> |
23 | #include <qtl.h> | 28 | #include <qtl.h> |
@@ -27,6 +32,4 @@ | |||
27 | #include <qlayout.h> | 32 | #include <qlayout.h> |
28 | 33 | ||
29 | using namespace Opie::Core; | ||
30 | using namespace Opie::Ui; | ||
31 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) | 34 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) |
32 | : QWidget( parent, name ) | 35 | : QWidget( parent, name ) |
@@ -68,5 +71,5 @@ void FortunePluginWidget::getFortune() { | |||
68 | 71 | ||
69 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 72 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
70 | qWarning("could not start :("); | 73 | owarn << "could not start :(" << oendl; |
71 | fortune->setText( QString("Failed to obtain fortune.") ); | 74 | fortune->setText( QString("Failed to obtain fortune.") ); |
72 | delete fortuneProcess; | 75 | delete fortuneProcess; |
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp index ce35256..ae219d7 100644 --- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp +++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp | |||
@@ -1,4 +1,11 @@ | |||
1 | #include "inputDialog.h" | 1 | #include "inputDialog.h" |
2 | #include "helpwindow.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | #include <qpe/config.h> | ||
7 | using namespace Opie::Core; | ||
2 | 8 | ||
9 | /* QT */ | ||
3 | #include <qapplication.h> | 10 | #include <qapplication.h> |
4 | #include <qlayout.h> | 11 | #include <qlayout.h> |
@@ -10,14 +17,9 @@ | |||
10 | #include <qlabel.h> | 17 | #include <qlabel.h> |
11 | #include <qlayout.h> | 18 | #include <qlayout.h> |
12 | #include <qpe/config.h> | ||
13 | #include <qstringlist.h> | 19 | #include <qstringlist.h> |
14 | using namespace Opie::Core; | ||
15 | using namespace Opie::Core; | ||
16 | #include <qmainwindow.h> | 20 | #include <qmainwindow.h> |
17 | #include "helpwindow.h" | ||
18 | 21 | ||
22 | /* STD */ | ||
19 | #include <stdlib.h> | 23 | #include <stdlib.h> |
20 | // #include <sys/stat.h> | ||
21 | // #include <unistd.h> | ||
22 | 24 | ||
23 | InputDialog::InputDialog( ) | 25 | InputDialog::InputDialog( ) |
@@ -55,5 +57,5 @@ void InputDialog::doLookup() { | |||
55 | QString tempHtml = "/tmp/stockticker.html"; | 57 | QString tempHtml = "/tmp/stockticker.html"; |
56 | QString cmd = "wget -O "+tempHtml+" "+url; | 58 | QString cmd = "wget -O "+tempHtml+" "+url; |
57 | qDebug(cmd); | 59 | odebug << cmd << oendl; |
58 | 60 | ||
59 | 61 | ||
@@ -77,5 +79,5 @@ void InputDialog::doLookup() { | |||
77 | 79 | ||
78 | void InputDialog::showBrowser(OProcess*) { | 80 | void InputDialog::showBrowser(OProcess*) { |
79 | qDebug("BLAH"); | 81 | odebug << "BLAH" << oendl; |
80 | QString tempHtml = "/tmp/stockticker.html"; | 82 | QString tempHtml = "/tmp/stockticker.html"; |
81 | 83 | ||
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/config.in b/noncore/todayplugins/stockticker/stocktickerlib/config.in index 4d589f9..7dbe03a 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/config.in +++ b/noncore/todayplugins/stockticker/stocktickerlib/config.in | |||
@@ -2,3 +2,3 @@ config TODAY_STOCKTICKERLIB | |||
2 | boolean | 2 | boolean |
3 | default "y" if TODAY_STOCKTICKER | 3 | default "y" if TODAY_STOCKTICKER |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM && TODAY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro index e70d1c0..6dcf945 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro | |||
@@ -1,4 +1,3 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
4 | 3 | ||
@@ -21,6 +20,6 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
21 | ../ ../library | 20 | ../ ../library |
22 | 21 | ||
23 | LIBS+= -lqpe -lopieui2 -lopiepim2 -lpthread | 22 | LIBS += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lpthread |
24 | TMAKE_CFLAGS += -D__UNIX__ | 23 | DEFINES += __UNIX__ |
25 | 24 | ||
26 | DESTDIR = $(OPIEDIR)/plugins/today | 25 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp index aaeb5ee..4855ac6 100644 --- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp +++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp | |||
@@ -46,5 +46,5 @@ void getStocks(char *blah) { | |||
46 | ::free ( blah ); | 46 | ::free ( blah ); |
47 | // char *stock_liste = (char *)blah->latin1(); | 47 | // char *stock_liste = (char *)blah->latin1(); |
48 | // qDebug("%s", stock_liste.data() ); | 48 | // odebug << "" << stock_liste.data() << "" << oendl; |
49 | output = ""; | 49 | output = ""; |
50 | QString tempString; | 50 | QString tempString; |
@@ -279,5 +279,5 @@ void getStocks(char *blah) { | |||
279 | 279 | ||
280 | void StockTickerPluginWidget::checkConnection() { | 280 | void StockTickerPluginWidget::checkConnection() { |
281 | // qDebug("checking connection"); | 281 | // odebug << "checking connection" << oendl; |
282 | // Sock = new QSocket( this ); | 282 | // Sock = new QSocket( this ); |
283 | 283 | ||
@@ -290,5 +290,5 @@ void getStocks(char *blah) { | |||
290 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); | 290 | // connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) ); |
291 | // } else { | 291 | // } else { |
292 | // qDebug("State is not Idle"); | 292 | // odebug << "State is not Idle" << oendl; |
293 | isConnected(); | 293 | isConnected(); |
294 | // } | 294 | // } |
@@ -296,5 +296,5 @@ void getStocks(char *blah) { | |||
296 | 296 | ||
297 | void StockTickerPluginWidget::isConnected() { | 297 | void StockTickerPluginWidget::isConnected() { |
298 | // qDebug("We connect, so ok to grab stocks"); | 298 | // odebug << "We connect, so ok to grab stocks" << oendl; |
299 | if(this->isVisible()) | 299 | if(this->isVisible()) |
300 | doStocks(); | 300 | doStocks(); |
@@ -305,5 +305,5 @@ void getStocks(char *blah) { | |||
305 | if(timerDelay > 0) | 305 | if(timerDelay > 0) |
306 | startTimer(timerDelay*60000); | 306 | startTimer(timerDelay*60000); |
307 | // qDebug("timer set for %d",(timerDelay*60000)/60000); | 307 | // odebug << "timer set for " << (timerDelay*60000)/60000 << "" << oendl; |
308 | wasError = false; | 308 | wasError = false; |
309 | 309 | ||