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
@@ -2,5 +2,5 @@
     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
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
@@ -5,5 +5,5 @@ 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
@@ -3,3 +3,3 @@ config TODAY_STOCKTICKERSUB
   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
@@ -2,5 +2,4 @@
 
 #include <qapplication.h>
-
 #include <qlayout.h>
 #include <qcheckbox.h>
@@ -16,6 +15,4 @@
 #include "helpwindow.h"
 
-#include <opie/oprocess.h>
-
 #include <stdlib.h>
 // #include <sys/stat.h>
@@ -32,7 +29,7 @@ InputDialog::InputDialog( )
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setFocus();
-    
+
     layout->addMultiCellWidget(  LineEdit1, 0, 0, 0, 3);
-    
+
     QLabel *label;
     label = new QLabel(this);
@@ -63,5 +60,5 @@ void InputDialog::doLookup() {
       proc << "/usr/bin/wget";
       proc<<"-O"<< tempHtml<< url;
-    
+
       connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*)));
       proc.start( OProcess::NotifyOnExit);
@@ -73,6 +70,6 @@ void InputDialog::doLookup() {
      StockLookup->show();
      LineEdit1->text();
-    
-    
+
+
 }
 
@@ -80,5 +77,5 @@ void InputDialog::showBrowser(OProcess*) {
     qDebug("BLAH");
     QString tempHtml = "/tmp/stockticker.html";
-    
+
     HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup");
     StockLookup->setCaption("Symbol");
@@ -86,4 +83,4 @@ void InputDialog::showBrowser(OProcess*) {
     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
@@ -3,8 +3,9 @@
 #define INPUTDIALOG_H
 
+#include <opie2/oprocess.h>
+
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
-#include <opie/oprocess.h>
 
 class QLineEdit;
@@ -17,12 +18,12 @@ public:
     InputDialog(  );
     ~InputDialog();
-    
+
 private:
     QLineEdit* LineEdit1;
 private slots:
     void doLookup();
-    void showBrowser(OProcess*); 
+    void showBrowser(OProcess*);
 protected slots:
-    
+
 };
 
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
@@ -3,9 +3,9 @@ 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
 
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
@@ -16,10 +16,10 @@
 
 #include "stocktickerconfig.h"
-#include <opie/todayconfigwidget.h>
+
+#include <opie2/todayconfigwidget.h>
 
 #include <qpe/config.h>
 
 #include <qapplication.h>
-
 #include <qlayout.h>
 #include <qspinbox.h>
@@ -45,7 +45,7 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     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" );
@@ -53,5 +53,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     symbollist = cfg.readEntry("Symbols", "");
     LineEdit1->setText(symbollist);
-    
+
     QLabel *label;
     label = new QLabel(this);
@@ -66,10 +66,10 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     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));
@@ -124,5 +124,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     timerDelaySpin->setValue( cfg.readNumEntry("Delay",15));
     layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0);
-    
+
     QLabel *label2;
     label2 = new QLabel(this);
@@ -138,5 +138,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     scrollSpeed->setValue( cfg.readNumEntry("ScrollSpeed",50));
     layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0);
-    
+
     QLabel *label3;
     label3 = new QLabel(this);
@@ -152,5 +152,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     scrollLength->setValue( cfg.readNumEntry("ScrollLength",1));
     layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0);
-    
+
     QLabel *label4;
     label4 = new QLabel(this);
@@ -158,10 +158,10 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent,  const char*
     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 );
@@ -193,5 +193,5 @@ void StocktickerPluginConfig::writeConfig() {
     cfg.writeEntry("ScrollLength",scrollLength->value());
     cfg.writeEntry("ScrollSpeed",scrollSpeed->value());
-      
+
     cfg.write();
 }
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
@@ -18,6 +18,7 @@
 #define STOCKTICKER_PLUGIN_CONFIG_H
 
+#include <opie2/todayconfigwidget.h>
+
 #include <qwidget.h>
-#include <opie/todayconfigwidget.h>
 #include <qstring.h>
 
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
@@ -21,5 +21,5 @@ DEPENDPATH      += $(OPIEDIR)/include \
     ../ ../library
 
-LIBS+= -lqpe -lopie -lpthread
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread
 TMAKE_CFLAGS += -D__UNIX__
 
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
@@ -19,12 +19,11 @@
 #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 {
 
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
@@ -15,11 +15,11 @@
    ***************************************************************************/
 
-  #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"
   }
@@ -211,5 +211,5 @@ void getStocks(char *blah) {
           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);
       }
@@ -283,5 +283,5 @@ void getStocks(char *blah) {
   //          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)) );