author | drw <drw> | 2004-03-02 16:38:47 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 16:38:47 (UTC) |
commit | 2c00fdd8f3b0c9680ee642a78dfd6587f32e8460 (patch) (unidiff) | |
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, 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 @@ | |||
1 | config TODAY_STOCKTICKER | 1 | config TODAY_STOCKTICKER |
2 | boolean "opie-today-stocktickerplugin (stock ticker)" | 2 | boolean "opie-today-stocktickerplugin (stock ticker)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY |
5 | 5 | ||
6 | source noncore/todayplugins/stockticker/stockticker/config.in | 6 | source noncore/todayplugins/stockticker/stockticker/config.in |
7 | source noncore/todayplugins/stockticker/stocktickerlib/config.in | 7 | 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 @@ | |||
1 | Package: opie-today-stocktickerplugin | 1 | Package: opie-today-stocktickerplugin |
2 | Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png | 2 | Files: plugins/today/libtodaystocktickerplugin.so* bin/stockticker pics/stockticker/stockticker.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/plugins | 4 | Section: opie/plugins |
5 | Maintainer: L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: libqte2, opie-today | 7 | Depends: libqte2, libopiecore2, libopiepim2, libopieui2, opie-today |
8 | Description: Stock ticker plugin for Today | 8 | Description: Stock ticker plugin for Today |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | 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 @@ | |||
1 | config TODAY_STOCKTICKERSUB | 1 | config TODAY_STOCKTICKERSUB |
2 | boolean | 2 | boolean |
3 | depends TODAY_STOCKTICKERLIB | 3 | depends TODAY_STOCKTICKERLIB |
4 | default "y" if TODAY_STOCKTICKER | 4 | default "y" if TODAY_STOCKTICKER |
5 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && TODAY | 5 | 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,10 +1,9 @@ | |||
1 | #include "inputDialog.h" | 1 | #include "inputDialog.h" |
2 | 2 | ||
3 | #include <qapplication.h> | 3 | #include <qapplication.h> |
4 | |||
5 | #include <qlayout.h> | 4 | #include <qlayout.h> |
6 | #include <qcheckbox.h> | 5 | #include <qcheckbox.h> |
7 | #include <qlineedit.h> | 6 | #include <qlineedit.h> |
8 | #include <qvariant.h> | 7 | #include <qvariant.h> |
9 | #include <qpushbutton.h> | 8 | #include <qpushbutton.h> |
10 | #include <qwhatsthis.h> | 9 | #include <qwhatsthis.h> |
@@ -12,14 +11,12 @@ | |||
12 | #include <qlayout.h> | 11 | #include <qlayout.h> |
13 | #include <qpe/config.h> | 12 | #include <qpe/config.h> |
14 | #include <qstringlist.h> | 13 | #include <qstringlist.h> |
15 | #include <qmainwindow.h> | 14 | #include <qmainwindow.h> |
16 | #include "helpwindow.h" | 15 | #include "helpwindow.h" |
17 | 16 | ||
18 | #include <opie/oprocess.h> | ||
19 | |||
20 | #include <stdlib.h> | 17 | #include <stdlib.h> |
21 | // #include <sys/stat.h> | 18 | // #include <sys/stat.h> |
22 | // #include <unistd.h> | 19 | // #include <unistd.h> |
23 | 20 | ||
24 | InputDialog::InputDialog( ) | 21 | InputDialog::InputDialog( ) |
25 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { | 22 | : QMainWindow( 0x0, 0x0, WStyle_ContextHelp ) { |
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,14 +1,15 @@ | |||
1 | 1 | ||
2 | #ifndef INPUTDIALOG_H | 2 | #ifndef INPUTDIALOG_H |
3 | #define INPUTDIALOG_H | 3 | #define INPUTDIALOG_H |
4 | 4 | ||
5 | #include <opie2/oprocess.h> | ||
6 | |||
5 | #include <qvariant.h> | 7 | #include <qvariant.h> |
6 | #include <qdialog.h> | 8 | #include <qdialog.h> |
7 | #include <qmainwindow.h> | 9 | #include <qmainwindow.h> |
8 | #include <opie/oprocess.h> | ||
9 | 10 | ||
10 | class QLineEdit; | 11 | class QLineEdit; |
11 | class QCheckBox; | 12 | class QCheckBox; |
12 | 13 | ||
13 | class InputDialog : public QMainWindow { | 14 | class InputDialog : public QMainWindow { |
14 | Q_OBJECT | 15 | Q_OBJECT |
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,10 +3,10 @@ CONFIG = qt warn_on release | |||
3 | HEADERS = inputDialog.h helpwindow.h | 3 | HEADERS = inputDialog.h helpwindow.h |
4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp | 4 | SOURCES = inputDialog.cpp helpwindow.cpp main.cpp |
5 | INTERFACES = | 5 | INTERFACES = |
6 | TARGET = stockticker | 6 | TARGET = stockticker |
7 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS+= -lqpe -lopie | 9 | LIBS+= -lqpe -lopiecore2 |
10 | DESTDIR = $(OPIEDIR)/bin | 10 | DESTDIR = $(OPIEDIR)/bin |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | 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 | |||
@@ -12,18 +12,18 @@ | |||
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include "stocktickerconfig.h" | 17 | #include "stocktickerconfig.h" |
18 | #include <opie/todayconfigwidget.h> | 18 | |
19 | #include <opie2/todayconfigwidget.h> | ||
19 | 20 | ||
20 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
21 | 22 | ||
22 | #include <qapplication.h> | 23 | #include <qapplication.h> |
23 | |||
24 | #include <qlayout.h> | 24 | #include <qlayout.h> |
25 | #include <qspinbox.h> | 25 | #include <qspinbox.h> |
26 | #include <qcheckbox.h> | 26 | #include <qcheckbox.h> |
27 | #include <qlineedit.h> | 27 | #include <qlineedit.h> |
28 | #include <qvariant.h> | 28 | #include <qvariant.h> |
29 | #include <qpushbutton.h> | 29 | #include <qpushbutton.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 | |||
@@ -14,14 +14,15 @@ | |||
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #ifndef STOCKTICKER_PLUGIN_CONFIG_H | 17 | #ifndef STOCKTICKER_PLUGIN_CONFIG_H |
18 | #define STOCKTICKER_PLUGIN_CONFIG_H | 18 | #define STOCKTICKER_PLUGIN_CONFIG_H |
19 | 19 | ||
20 | #include <opie2/todayconfigwidget.h> | ||
21 | |||
20 | #include <qwidget.h> | 22 | #include <qwidget.h> |
21 | #include <opie/todayconfigwidget.h> | ||
22 | #include <qstring.h> | 23 | #include <qstring.h> |
23 | 24 | ||
24 | class QLineEdit; | 25 | class QLineEdit; |
25 | class QCheckBox; | 26 | class QCheckBox; |
26 | class QPushButton; | 27 | class QPushButton; |
27 | class QCheckBox; | 28 | class QCheckBox; |
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 | |||
@@ -17,13 +17,13 @@ SOURCES = stocktickerplugin.cpp stocktickerpluginimpl.cpp stocktickerpluginwidge | |||
17 | 17 | ||
18 | INCLUDEPATH += $(OPIEDIR)/include \ | 18 | INCLUDEPATH += $(OPIEDIR)/include \ |
19 | ../ ../library | 19 | ../ ../library |
20 | DEPENDPATH += $(OPIEDIR)/include \ | 20 | DEPENDPATH += $(OPIEDIR)/include \ |
21 | ../ ../library | 21 | ../ ../library |
22 | 22 | ||
23 | LIBS+= -lqpe -lopie -lpthread | 23 | LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread |
24 | TMAKE_CFLAGS += -D__UNIX__ | 24 | TMAKE_CFLAGS += -D__UNIX__ |
25 | 25 | ||
26 | DESTDIR = $(OPIEDIR)/plugins/today | 26 | DESTDIR = $(OPIEDIR)/plugins/today |
27 | TARGET = todaystocktickerplugin | 27 | TARGET = todaystocktickerplugin |
28 | 28 | ||
29 | include ( $(OPIEDIR)/include.pro ) | 29 | 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 | |||
@@ -15,20 +15,19 @@ | |||
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | 17 | ||
18 | #ifndef STOCKTICKER_PLUGIN_H | 18 | #ifndef STOCKTICKER_PLUGIN_H |
19 | #define STOCKTICKER_PLUGIN_H | 19 | #define STOCKTICKER_PLUGIN_H |
20 | 20 | ||
21 | #include <opie2/oclickablelabel.h> | ||
22 | #include <opie2/todayplugininterface.h> | ||
23 | #include <opie2/todayconfigwidget.h> | ||
24 | |||
21 | #include <qstring.h> | 25 | #include <qstring.h> |
22 | #include <qwidget.h> | 26 | #include <qwidget.h> |
23 | 27 | ||
24 | #include <opie/oclickablelabel.h> | ||
25 | |||
26 | #include <opie/todayplugininterface.h> | ||
27 | #include <opie/todayconfigwidget.h> | ||
28 | |||
29 | class StockTickerPlugin : public TodayPluginObject { | 28 | class StockTickerPlugin : public TodayPluginObject { |
30 | 29 | ||
31 | public: | 30 | public: |
32 | StockTickerPlugin(); | 31 | StockTickerPlugin(); |
33 | ~StockTickerPlugin(); | 32 | ~StockTickerPlugin(); |
34 | 33 | ||
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 | |||
@@ -11,17 +11,17 @@ | |||
11 | * it under the terms of the GNU General Public License as published by * | 11 | * it under the terms of the GNU General Public License as published by * |
12 | * the Free Software Foundation; either version 2 of the License, or * | 12 | * the Free Software Foundation; either version 2 of the License, or * |
13 | * (at your option) any later version. * | 13 | * (at your option) any later version. * |
14 | * * | 14 | * * |
15 | ***************************************************************************/ | 15 | ***************************************************************************/ |
16 | 16 | ||
17 | #include <qlayout.h> | 17 | #include <opie2/oticker.h> |
18 | 18 | ||
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | 20 | ||
21 | #include <opie/oticker.h> | 21 | #include <qlayout.h> |
22 | 22 | ||
23 | extern "C" { | 23 | extern "C" { |
24 | #include "libstocks/stocks.h" | 24 | #include "libstocks/stocks.h" |
25 | } | 25 | } |
26 | 26 | ||
27 | #include <pthread.h> | 27 | #include <pthread.h> |