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,3 +1,2 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
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 | |||
@@ -18,5 +18,10 @@ | |||
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> |
@@ -28,4 +33,2 @@ | |||
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 ) |
@@ -69,3 +72,3 @@ void FortunePluginWidget::getFortune() { | |||
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.") ); |
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,3 +1,10 @@ | |||
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> |
@@ -11,12 +18,7 @@ | |||
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 | ||
@@ -56,3 +58,3 @@ void InputDialog::doLookup() { | |||
56 | QString cmd = "wget -O "+tempHtml+" "+url; | 58 | QString cmd = "wget -O "+tempHtml+" "+url; |
57 | qDebug(cmd); | 59 | odebug << cmd << oendl; |
58 | 60 | ||
@@ -78,3 +80,3 @@ void InputDialog::doLookup() { | |||
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"; |
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 | |||
@@ -3,2 +3,2 @@ config TODAY_STOCKTICKERLIB | |||
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,3 +1,2 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG -= moc | ||
3 | CONFIG += qt plugin | 2 | CONFIG += qt plugin |
@@ -22,4 +21,4 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
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 | ||
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 | |||
@@ -47,3 +47,3 @@ void getStocks(char *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 = ""; |
@@ -280,3 +280,3 @@ void getStocks(char *blah) { | |||
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 ); |
@@ -291,3 +291,3 @@ void getStocks(char *blah) { | |||
291 | // } else { | 291 | // } else { |
292 | // qDebug("State is not Idle"); | 292 | // odebug << "State is not Idle" << oendl; |
293 | isConnected(); | 293 | isConnected(); |
@@ -297,3 +297,3 @@ void getStocks(char *blah) { | |||
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()) |
@@ -306,3 +306,3 @@ void getStocks(char *blah) { | |||
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; |