From 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Sun, 04 Apr 2004 13:54:40 +0000
Subject: convert to Opie Debugging Framework

---
(limited to 'noncore/todayplugins')

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,5 +1,4 @@
 TEMPLATE = lib
-#CONFIG -= moc
 CONFIG += qt plugin 
 
 # Input
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
@@ -16,9 +16,14 @@
 
 #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>
@@ -26,8 +31,6 @@
 #include <qobject.h>
 #include <qlayout.h>
 
-using namespace Opie::Core;
-using namespace Opie::Ui;
 FortunePluginWidget::FortunePluginWidget( QWidget *parent,  const char* name )
 	: QWidget( parent, name )
 {
@@ -67,7 +70,7 @@ void FortunePluginWidget::getFortune() {
 		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;
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,5 +1,12 @@
 #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>
@@ -9,16 +16,11 @@
 #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 ) {
@@ -54,7 +56,7 @@ void InputDialog::doLookup() {
     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; 
 
 
 /*
@@ -76,7 +78,7 @@ void InputDialog::doLookup() {
 }
 
 void InputDialog::showBrowser(OProcess*) {
-    qDebug("BLAH");
+    odebug << "BLAH" << oendl; 
     QString tempHtml = "/tmp/stockticker.html";
 
     HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup");
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,5 +1,4 @@
 TEMPLATE = lib
-CONFIG -= moc
 CONFIG += qt plugin 
 
 HEADERS = stocktickerplugin.h stocktickerpluginimpl.h stocktickerpluginwidget.h stocktickerconfig.h \
@@ -20,8 +19,8 @@ INCLUDEPATH     += $(OPIEDIR)/include \
 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
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
@@ -45,7 +45,7 @@ void getStocks(char *blah) {
       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;
@@ -278,7 +278,7 @@ void getStocks(char *blah) {
   }
 
   void StockTickerPluginWidget::checkConnection() {
-  //     qDebug("checking connection");
+  //     odebug << "checking connection" << oendl; 
   //     Sock = new QSocket( this );
 
   //      if( wasError)
@@ -289,13 +289,13 @@ void getStocks(char *blah) {
   //         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();
 
@@ -304,7 +304,7 @@ void getStocks(char *blah) {
       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();
--
cgit v0.9.0.2