author | drw <drw> | 2004-03-02 16:38:47 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 16:38:47 (UTC) |
commit | 2c00fdd8f3b0c9680ee642a78dfd6587f32e8460 (patch) (side-by-side diff) | |
tree | ba73624ab704354f7c14db80dc4f2322920a7407 /noncore | |
parent | c4c97ef4ccf9d379ff59560c3ae3c32f95fc51d1 (diff) | |
download | opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.zip opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.gz opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.bz2 |
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 @@ -3,3 +3,3 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY 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 @@ -6,3 +6,3 @@ 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 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 @@ -4,2 +4,2 @@ config TODAY_STOCKTICKERSUB 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 @@ -3,3 +3,2 @@ #include <qapplication.h> - #include <qlayout.h> @@ -17,4 +16,2 @@ -#include <opie/oprocess.h> - #include <stdlib.h> @@ -33,5 +30,5 @@ InputDialog::InputDialog( ) LineEdit1->setFocus(); - + layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 3); - + QLabel *label; @@ -64,3 +61,3 @@ void InputDialog::doLookup() { proc<<"-O"<< tempHtml<< url; - + connect( &proc, SIGNAL( processExited(OProcess*)),this, SLOT( showBrowser(OProcess*))); @@ -74,4 +71,4 @@ void InputDialog::doLookup() { LineEdit1->text(); - - + + } @@ -81,3 +78,3 @@ void InputDialog::showBrowser(OProcess*) { QString tempHtml = "/tmp/stockticker.html"; - + HelpWindow *StockLookup = new HelpWindow( tempHtml,".",this, "SymbolLookup"); @@ -87,3 +84,3 @@ void InputDialog::showBrowser(OProcess*) { 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 @@ -4,2 +4,4 @@ +#include <opie2/oprocess.h> + #include <qvariant.h> @@ -7,3 +9,2 @@ #include <qmainwindow.h> -#include <opie/oprocess.h> @@ -18,3 +19,3 @@ public: ~InputDialog(); - + private: @@ -23,5 +24,5 @@ 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 @@ -4,7 +4,7 @@ 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 @@ -17,3 +17,4 @@ #include "stocktickerconfig.h" -#include <opie/todayconfigwidget.h> + +#include <opie2/todayconfigwidget.h> @@ -22,3 +23,2 @@ #include <qapplication.h> - #include <qlayout.h> @@ -46,5 +46,5 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* // QWhatsThis::add( LineEdit1, tr("Enter the stock symbols you want to be shown here.")); - + layout->addMultiCellWidget( LineEdit1, 0, 0, 0, 4); - + Config cfg( "stockticker"); @@ -54,3 +54,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* LineEdit1->setText(symbollist); - + QLabel *label; @@ -67,3 +67,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* QWhatsThis::add( timeCheck, tr("Toggles Time of current price field")); - + dateCheck= new QCheckBox ( "Date", this ); @@ -72,3 +72,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* QWhatsThis::add(dateCheck, tr("Toggles date field")); - + symbolCheck= new QCheckBox ( "Symbol", this ); @@ -125,3 +125,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* layout->addMultiCellWidget( timerDelaySpin , 6, 6, 0, 0); - + QLabel *label2; @@ -139,3 +139,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* layout->addMultiCellWidget( scrollSpeed , 7, 7, 0, 0); - + QLabel *label3; @@ -153,3 +153,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* layout->addMultiCellWidget( scrollLength , 8, 8, 0, 0); - + QLabel *label4; @@ -159,3 +159,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* layout->addMultiCellWidget( label4, 8, 8, 1, 2); - + // lookupButton = new QPushButton(this, "LookupButton"); @@ -164,3 +164,3 @@ StocktickerPluginConfig::StocktickerPluginConfig( QWidget *parent, const char* // layout->addMultiCellWidget( lookupButton , 9, 9, 0, 0); - + QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Expanding ); @@ -194,3 +194,3 @@ void StocktickerPluginConfig::writeConfig() { 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 @@ -19,4 +19,5 @@ +#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 @@ -22,3 +22,3 @@ DEPENDPATH += $(OPIEDIR)/include \ -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 @@ -20,2 +20,6 @@ +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> +#include <opie2/todayconfigwidget.h> + #include <qstring.h> @@ -23,7 +27,2 @@ -#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 @@ -16,3 +16,3 @@ - #include <qlayout.h> + #include <opie2/oticker.h> @@ -20,5 +20,5 @@ - #include <opie/oticker.h> + #include <qlayout.h> - extern "C" { +extern "C" { #include "libstocks/stocks.h" @@ -212,3 +212,3 @@ void getStocks(char *blah) { - /* 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); @@ -284,3 +284,3 @@ void getStocks(char *blah) { - // if(Sock->state() == QSocket::Idle) { + // if(Sock->state() == QSocket::Idle) { // Sock->connectToHost("finance.yahoo.com", 80); |