4 files changed, 18 insertions, 17 deletions

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,27 +1,29 @@
 #include "inputDialog.h"
+#include "helpwindow.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qapplication.h>
 #include <qlayout.h>
 #include <qcheckbox.h>
 #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"
 
+/* STD */
 #include <stdlib.h>
-// #include <sys/stat.h>
-// #include <unistd.h>
 
 InputDialog::InputDialog( )
  : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) {
     setCaption( tr("Symbol Lookup"));
 
     QGridLayout *layout = new QGridLayout( this );
@@ -51,13 +53,13 @@ InputDialog::~InputDialog() {
 void InputDialog::doLookup() {
 // http://finance.yahoo.com/l?m=&s=siemens&t=
 
     QString url = "\"http://finance.yahoo.com/l?m=&s="+LineEdit1->text()+"\"";
     QString tempHtml = "/tmp/stockticker.html";
      QString cmd = "wget -O "+tempHtml+" "+url;
-     qDebug(cmd);
+     odebug << cmd << oendl; 
 
 
 /*
       OProcess proc;
       proc << "/usr/bin/wget";
       proc<<"-O"<< tempHtml<< url;
@@ -73,13 +75,13 @@ void InputDialog::doLookup() {
      LineEdit1->text();
 
 
 }
 
 void InputDialog::showBrowser(OProcess*) {
-    qDebug("BLAH");
+    odebug << "BLAH" << oendl; 
     QString tempHtml = "/tmp/stockticker.html";
 
     HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup");
     StockLookup->setCaption("Symbol");
     StockLookup->showMaximized();
     StockLookup->show();
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
@@ -1,4 +1,4 @@
 config TODAY_STOCKTICKERLIB
   boolean
   default "y" if TODAY_STOCKTICKER
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2PIM && TODAY
+  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,8 +1,7 @@
 TEMPLATE = lib
-CONFIG -= moc
 CONFIG += qt plugin 
 
 HEADERS = stocktickerplugin.h stocktickerpluginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \
       ../libstocks/csv.h \
       ../libstocks/http.h \
       ../libstocks/lists.h \
@@ -17,13 +16,13 @@ SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidge
 
 INCLUDEPATH     += $(OPIEDIR)/include \
     ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
     ../ ../library
 
-LIBS+= -lqpe  -lopieui2 -lopiepim2 -lpthread
-TMAKE_CFLAGS += -D__UNIX__
+LIBS    += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lpthread
+DEFINES += __UNIX__
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -42,13 +42,13 @@ void getStocks(char *blah) {
   //    stocktickerTicker->setText( "Downloading stock data.");
       stock *stocks_quotes=NULL;
       stock *stocks_tmp;
       stock_liste = blah;
       ::free ( blah );
       //    char *stock_liste = (char *)blah->latin1();
-      //      qDebug("%s", stock_liste.data() );
+      //      odebug << "" << stock_liste.data() << "" << oendl; 
       output = "";
   QString tempString;
       libstocks_return_code error;
 
 //        Config cfg( "stockticker");
 //        cfg.setGroup( "Fields" );
@@ -275,39 +275,39 @@ void getStocks(char *blah) {
   void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) {
       killTimer(e->timerId());
       checkConnection();
   }
 
   void StockTickerPluginWidget::checkConnection() {
-  //     qDebug("checking connection");
+  //     odebug << "checking connection" << oendl; 
   //     Sock = new QSocket( this );
 
   //      if( wasError)
   //          stocktickerTicker->setText("Checking connection");
 
   //     if(Sock->state() == QSocket::Idle) {
   //         Sock->connectToHost("finance.yahoo.com", 80);
   //         connect( Sock, SIGNAL( error(int) ),  SLOT(socketError(int)) );
   //         connect( Sock, SIGNAL( hostFound() ), SLOT(isConnected()) );
   //     } else {
-  //         qDebug("State is not Idle");
+  //         odebug << "State is not Idle" << oendl; 
           isConnected();
   //    }
   }
 
   void StockTickerPluginWidget::isConnected() {
-  //    qDebug("We connect, so ok to grab stocks");
+  //    odebug << "We connect, so ok to grab stocks" << oendl; 
      if(this->isVisible())
         doStocks();
 
       Config cfg( "stockticker");
       cfg.setGroup("Timer");
       timerDelay= cfg.readNumEntry("Delay",0);
       if(timerDelay > 0)
           startTimer(timerDelay*60000);
-      //      qDebug("timer set for %d",(timerDelay*60000)/60000);
+      //      odebug << "timer set for " << (timerDelay*60000)/60000 << "" << oendl; 
       wasError = false;
 
   //    Sock->close();
   }
 
   void StockTickerPluginWidget::socketError(int errcode) {