11 files changed, 17 insertions, 19 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,27 +1,24 @@ #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")); 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,16 +1,17 @@ #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: 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 = TARGET = stockticker 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 @@ -10,22 +10,22 @@ * 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> 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 @@ -12,18 +12,19 @@ * 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; 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 @@ -15,15 +15,15 @@ SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidge ../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 @@ -13,24 +13,23 @@ * (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; 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 @@ -9,21 +9,21 @@ * * * 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" { #include "libstocks/stocks.h" } #include <pthread.h> #include "stocktickerpluginwidget.h" |