Today stock ticker plugin: libopie -> libopie2

11 files changed, 43 insertions, 45 deletions

diff --git a/noncore/todayplugins/stockticker/config.in b/noncore/todayplugins/stockticker/config.in
index 83e7fbd..f0fd4aa 100644
--- a/noncore/todayplugins/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/config.in
@@ -1,7 +1,7 @@
   config TODAY_STOCKTICKER
     boolean "opie-today-stocktickerplugin (stock ticker)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY
 
   source noncore/todayplugins/stockticker/stockticker/config.in
   source noncore/todayplugins/stockticker/stocktickerlib/config.in
diff --git a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
index 3e3bad1..f04ad64 100644
--- a/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
+++ b/noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control
@@ -1,9 +1,9 @@
 Package: opie-today-stocktickerplugin
 Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png
 Priority: optional
 Section: opie/plugins
 Maintainer: L.J. Potter <lpotter@trolltech.com>
 Architecture: arm
-Depends: libqte2, opie-today
+Depends: libqte2, libopiecore2, libopiepim2, libopieui2, opie-today
 Description: Stock ticker plugin for Today
 Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/todayplugins/stockticker/stockticker/config.in b/noncore/todayplugins/stockticker/stockticker/config.in
index d9e0f1f..1252b63 100644
--- a/noncore/todayplugins/stockticker/stockticker/config.in
+++ b/noncore/todayplugins/stockticker/stockticker/config.in
@@ -1,5 +1,5 @@
 config TODAY_STOCKTICKERSUB
   boolean
   depends TODAY_STOCKTICKERLIB
   default "y" if TODAY_STOCKTICKER
-  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY
+  depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && TODAY
diff --git a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp
index 64798f4..b3fa708 100644
--- a/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp
+++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.cpp
@@ -1,48 +1,45 @@
 #include "inputDialog.h"
 
 #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>
 #include <qmainwindow.h>
 #include "helpwindow.h"
 
-#include <opie/oprocess.h>
-
 #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();
-    
+
     layout->addMultiCellWidget(  LineEdit1, 0, 0, 0, 3);
-    
+
     QLabel *label;
     label = new QLabel(this);
     label->setText( tr("Enter something to lookup / search."));
     label->setMaximumHeight(60);
     layout->addMultiCellWidget( label, 1, 1, 0, 3);
 
     connect(LineEdit1,SIGNAL(returnPressed()),this,SLOT(doLookup()));
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
     layout->addItem( spacer, 8, 0 );
 
 }
 
@@ -53,37 +50,37 @@ 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);
 
 
 /*
       OProcess proc;
       proc << "/usr/bin/wget";
       proc<<"-O"<< tempHtml<< url;
-    
+
       connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(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");
     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/stockticker/inputDialog.h b/noncore/todayplugins/stockticker/stockticker/inputDialog.h
index 15c2f22..a1c00bd 100644
--- a/noncore/todayplugins/stockticker/stockticker/inputDialog.h
+++ b/noncore/todayplugins/stockticker/stockticker/inputDialog.h
@@ -1,29 +1,30 @@
 
 #ifndef INPUTDIALOG_H
 #define INPUTDIALOG_H
 
+#include <opie2/oprocess.h>
+
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
-#include <opie/oprocess.h>
 
 class QLineEdit;
 class QCheckBox;
 
 class InputDialog : public  QMainWindow {
     Q_OBJECT
 
 public:
     InputDialog(  );
     ~InputDialog();
-    
+
 private:
     QLineEdit* LineEdit1;
 private slots:
     void doLookup();
-    void showBrowser(OProcess*); 
+    void showBrowser(OProcess*);
 protected slots:
-    
+
 };
 
 #endif // INPUTDIALOG_H
diff --git a/noncore/todayplugins/stockticker/stockticker/stockticker.pro b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
index 38a9425..a33c877 100644
--- a/noncore/todayplugins/stockticker/stockticker/stockticker.pro
+++ b/noncore/todayplugins/stockticker/stockticker/stockticker.pro
@@ -1,12 +1,12 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = inputDialog.h helpwindow.h
 SOURCES   = inputDialog.cpp helpwindow.cpp main.cpp
-INTERFACES  = 
+INTERFACES  =
 TARGET    = stockticker
-INCLUDEPATH     += $(OPIEDIR)/include 
+INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2
 DESTDIR = $(OPIEDIR)/bin
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp
index 915233a..009d390 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp
@@ -6,80 +6,80 @@
  *
  */
 /***************************************************************************
  *                                                                         *
  *   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 "stocktickerconfig.h"
-#include <opie/todayconfigwidget.h>
+
+#include <opie2/todayconfigwidget.h>
 
 #include <qpe/config.h>
 
 #include <qapplication.h>
-
 #include <qlayout.h>
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qvariant.h>
 #include <qpushbutton.h>
 #include <qwhatsthis.h>
 #include <qlabel.h>
 #include <qstringlist.h>
 #include <qmainwindow.h>
 
 #include <stdlib.h>
 
 StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char* name)
     : TodayConfigWidget(parent,  name ) {
 
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing(2);
     layout->setMargin( 2);
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setFocus();
 //     QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here."));
-    
+
     layout->addMultiCellWidget(  LineEdit1, 0, 0, 0, 4);
-    
+
     Config cfg( "stockticker");
     cfg.setGroup( "Symbols" );
     QString symbollist;
     symbollist = cfg.readEntry("Symbols", "");
     LineEdit1->setText(symbollist);
-    
+
     QLabel *label;
     label = new QLabel(this);
     label->setText( tr("Enter stock symbols seperated\nby a space."));
     label->setMaximumHeight(60);
     layout->addMultiCellWidget( label, 1, 1, 0, 4);
 
     cfg.setGroup( "Fields" );
 
     timeCheck= new QCheckBox ( "Time",this );
     timeCheck->setChecked( cfg.readBoolEntry("timeCheck",1));
     layout->addMultiCellWidget(timeCheck, 2, 2, 0, 0 );
     QWhatsThis::add( timeCheck, tr("Toggles Time of current price field"));
-    
+
     dateCheck= new QCheckBox ( "Date", this );
     dateCheck->setChecked( cfg.readBoolEntry("dateCheck",1));
     layout->addMultiCellWidget( dateCheck, 2, 2, 1, 1 );
     QWhatsThis::add(dateCheck, tr("Toggles date field"));
-    
+
     symbolCheck= new QCheckBox ( "Symbol", this );
     symbolCheck->setChecked( cfg.readBoolEntry("symbolCheck",1));
     layout->addMultiCellWidget( symbolCheck, 2, 2, 2, 2 );
     QWhatsThis::add(symbolCheck, tr("Toggles Symbol field"));
 
     nameCheck= new QCheckBox ( "Name", this );
     nameCheck->setChecked( cfg.readBoolEntry("nameCheck",1));
     layout->addMultiCellWidget( nameCheck, 3, 3, 0, 0 );
     QWhatsThis::add(nameCheck, tr("Toggles Name of symbols owner field"));
 
     currentPriceCheck= new QCheckBox ( "Price", this );
     currentPriceCheck->setChecked( cfg.readBoolEntry("currentPriceCheck",1));
@@ -114,64 +114,64 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     volumeCheck= new QCheckBox ( "Volume", this );
     volumeCheck->setChecked( cfg.readBoolEntry("volumeCheck",1));
     layout->addMultiCellWidget( volumeCheck , 5, 5, 1, 1);
     QWhatsThis::add(volumeCheck, tr("Toggles volume of trading field"));
 
     timerDelaySpin =  new QSpinBox( this, "timer spin" );
     QWhatsThis::add( timerDelaySpin , tr( "How often stocks prices should be looked up. In minutes" ) );
     timerDelaySpin->setMaxValue( 60);
 
     cfg.setGroup("Timer");
     timerDelaySpin->setValue( cfg.readNumEntry("Delay",15));
     layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0);
-    
+
     QLabel *label2;
     label2 = new QLabel(this);
     label2->setText( tr("Minutes between lookups."));
     label2->setMaximumHeight(60);
     layout->addMultiCellWidget( label2, 6, 6, 1, 2);
 
     scrollSpeed = new QSpinBox( this, "Scrollspin" );
     QWhatsThis::add( timerDelaySpin , tr( "Speed of scrolling action, in milliseconds" ) );
     scrollSpeed->setMaxValue( 1000);
     scrollSpeed->setSteps(50,50);
     cfg.setGroup("Timer");
     scrollSpeed->setValue( cfg.readNumEntry("ScrollSpeed",50));
     layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0);
-    
+
     QLabel *label3;
     label3 = new QLabel(this);
     label3->setText( tr("Scroll Speed, in milliseconds"));
     label3->setMaximumHeight(60);
     layout->addMultiCellWidget( label3, 7, 7, 1, 2);
 
     scrollLength = new QSpinBox( this, "ScrollLength" );
     QWhatsThis::add( timerDelaySpin , tr( "Length of scrolling" ) );
     scrollLength->setMaxValue( 10);
 //    scrollLength->setSteps(5,5);
     cfg.setGroup("Timer");
     scrollLength->setValue( cfg.readNumEntry("ScrollLength",1));
     layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0);
-    
+
     QLabel *label4;
     label4 = new QLabel(this);
     label4->setText( tr("Scroll Length"));
     label4->setMaximumHeight(60);
     layout->addMultiCellWidget( label4, 8, 8, 1, 2);
-    
+
 //      lookupButton = new QPushButton(this, "LookupButton");
 //      lookupButton->setText(tr("Symbol Lookup"));
 //      connect(lookupButton,SIGNAL(clicked()),SLOT( doLookup()));
 //      layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0);
-    
+
     QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding );
     layout->addItem( spacer, 9, 0 );
 
 }
 
 
 void StocktickerPluginConfig::writeConfig() {
     Config cfg( "stockticker");
     cfg.setGroup( "Symbols" );
     QString outText = text().upper();
     outText.stripWhiteSpace();
     cfg.writeEntry("Symbols",  outText );
@@ -183,25 +183,25 @@ void StocktickerPluginConfig::writeConfig() {
     cfg.writeEntry("currentPriceCheck",currentPriceCheck->isChecked());
     cfg.writeEntry("lastPriceCheck",lastPriceCheck->isChecked());
     cfg.writeEntry("openPriceCheck",openPriceCheck->isChecked());
     cfg.writeEntry("minPriceCheck",minPriceCheck->isChecked());
     cfg.writeEntry("maxPriceCheck",maxPriceCheck->isChecked());
     cfg.writeEntry("variationCheck",variationCheck->isChecked());
     cfg.writeEntry("volumeCheck",volumeCheck->isChecked());
 
     cfg.setGroup("Timer");
     cfg.writeEntry("Delay",timerDelaySpin->value());
     cfg.writeEntry("ScrollLength",scrollLength->value());
     cfg.writeEntry("ScrollSpeed",scrollSpeed->value());
-      
+
     cfg.write();
 }
 
 StocktickerPluginConfig::~StocktickerPluginConfig() {
 }
 
 QString StocktickerPluginConfig::text() const {
    return LineEdit1->text();
 }
 
 void StocktickerPluginConfig::doLookup() {
 
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h
index 10f9678..3c852ce 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h
@@ -8,26 +8,27 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef STOCKTICKER_PLUGIN_CONFIG_H
 #define STOCKTICKER_PLUGIN_CONFIG_H
 
+#include <opie2/todayconfigwidget.h>
+
 #include <qwidget.h>
-#include <opie/todayconfigwidget.h>
 #include <qstring.h>
 
 class QLineEdit;
 class QCheckBox;
 class QPushButton;
 class QCheckBox;
 class QSpinBox;
 
 class StocktickerPluginConfig : public TodayConfigWidget {
     Q_OBJECT
 public:
     StocktickerPluginConfig( QWidget *parent,  const char *name );
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
index bb22b4e..baf6430 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro
@@ -11,19 +11,19 @@ SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidge
       ../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 -lopie -lpthread
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread
 TMAKE_CFLAGS += -D__UNIX__
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaystocktickerplugin
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h
index e88c687..42af821 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h
@@ -9,32 +9,31 @@
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef STOCKTICKER_PLUGIN_H
 #define STOCKTICKER_PLUGIN_H
 
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
+#include <opie2/todayconfigwidget.h>
+
 #include <qstring.h>
 #include <qwidget.h>
 
-#include <opie/oclickablelabel.h>
-
-#include <opie/todayplugininterface.h>
-#include <opie/todayconfigwidget.h>
-
 class StockTickerPlugin : public TodayPluginObject {
 
 public:
     StockTickerPlugin();
     ~StockTickerPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
     TodayConfigWidget* configWidget(QWidget *);
diff --git a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
index fedc79c..51113ba 100644
--- a/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
+++ b/noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp
@@ -5,31 +5,31 @@
    * email       : llornkcor@handhelds.org
    *
    */
   /***************************************************************************
    *                                                                         *
    *   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 <qlayout.h>
+  #include <opie2/oticker.h>
 
   #include <qpe/config.h>
 
-  #include <opie/oticker.h>
+  #include <qlayout.h>
 
-  extern "C" {
+extern "C" {
   #include "libstocks/stocks.h"
   }
 
   #include <pthread.h>
 
   #include "stocktickerpluginwidget.h"
 
   QString output;
   OTicker *stocktickerTicker;
   QCString stock_liste;
       bool dotimeCheck, dodateCheck, dosymbolCheck, donameCheck;
       bool docurrentPriceCheck, dolastPriceCheck, doopenPriceCheck;
@@ -201,25 +201,25 @@ void getStocks(char *blah) {
           if(dovariationCheck)
                   output +=tempString;
 
   //         printf("| Volume    | %-9d                |\n", stocks_tmp->Volume);
           tempString.sprintf("|  Volume %-9d  ", stocks_tmp->Volume);
           if(dovolumeCheck)
               output +=tempString;
 
   //         printf("----------------------------------------\n\n");
           tempString.sprintf("||==++==|");
           output +=tempString;
 
-            /* Simple function which help to browse in the stocks list */ 
+            /* Simple function which help to browse in the stocks list */
           stocks_tmp = next_stock(stocks_tmp);
       }
 
       stocktickerTicker->setText( output.latin1() );
 
         /* frees stocks */
       free_stocks(stocks_quotes);
       free_stocks(stocks_tmp);
 
       stock_liste="";
       //delete stock_liste;
       tempString="";
@@ -273,25 +273,25 @@ void getStocks(char *blah) {
   void StockTickerPluginWidget::timerEvent( QTimerEvent *e ) {
       killTimer(e->timerId());
       checkConnection();
   }
 
   void StockTickerPluginWidget::checkConnection() {
   //     qDebug("checking connection");
   //     Sock = new QSocket( this );
 
   //      if( wasError)
   //          stocktickerTicker->setText("Checking connection");
 
-  //     if(Sock->state() == QSocket::Idle) {    
+  //     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");
           isConnected();
   //    }
   }
 
   void StockTickerPluginWidget::isConnected() {
   //    qDebug("We connect, so ok to grab stocks");
      if(this->isVisible())