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,14 +1,13 @@
 TEMPLATE = lib
-#CONFIG -= moc
 CONFIG += qt plugin 
 
 # Input
 HEADERS = fortuneplugin.h fortunepluginimpl.h \
         fortunepluginwidget.h
 SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
         fortunepluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
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
@@ -7,36 +7,39 @@
  */
 /***************************************************************************
  *   *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.     *
  *   *
  ***************************************************************************/
 
 #include "fortunepluginwidget.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
+/* QT */
 #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();
 }
 
 FortunePluginWidget::~FortunePluginWidget() {
         if( fortuneProcess ){
                 delete fortuneProcess;
         }
@@ -58,25 +61,25 @@ 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(Opie::Core::OProcess*,char*,int) ),
                 this,  SLOT(slotStdOut(Opie::Core::OProcess*,char*,int) ) );
 
         if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
-                qWarning("could not start :(");
+                owarn << "could not start :(" << oendl; 
                 fortune->setText( QString("Failed to obtain fortune.") );
                 delete fortuneProcess;
                 fortuneProcess = 0;
         }
 
 }
 
 void FortunePluginWidget::slotStdOut( OProcess* /*proc*/, char* buf, int len )
 {
         QCString s( buf, len );
         s.replace( QRegExp("\n"), "" );
         fortune->setText( s );
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,33 +1,35 @@
 #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 );
     layout->setSpacing(6);
     layout->setMargin( 2);
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setFocus();
 
@@ -45,44 +47,44 @@ InputDialog::InputDialog( )
 
 }
 
 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;
 
       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();
 
 
 }
 
 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();
     LineEdit1->text();
 
 }
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,29 +1,28 @@
 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 \
       ../libstocks/stocks.h
 SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidget.cpp stocktickerconfig.cpp \
       ../libstocks/csv.c \
       ../libstocks/currency.c \
       ../libstocks/history.c \
       ../libstocks/http.c \
       ../libstocks/lists.c \
       ../libstocks/stocks.c
 
 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
@@ -36,25 +36,25 @@ extern "C" {
       bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck;
       bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck;
       bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck;
 
 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" );
 //        bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck;
 //        bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck;
 //        bool dominPriceCheck, domaxPriceCheck, dovariationCheck, dovolumeCheck;
 
       dotimeCheck=dodateCheck=dosymbolCheck=donameCheck= docurrentPriceCheck=dolastPriceCheck=doopenPriceCheck=dominPriceCheck=domaxPriceCheck=dovariationCheck=dovolumeCheck=false;
 
@@ -269,51 +269,51 @@ void getStocks(char *blah) {
 
             //::free((void*)thread1);
              //getStocks(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) {
       switch(errcode) {
         case QSocket::ErrConnectionRefused:
             output = tr("Connection refused.");
             break;
         case QSocket::ErrHostNotFound:
             output = tr("Could not find server.");