summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 16:38:47 (UTC)
committer drw <drw>2004-03-02 16:38:47 (UTC)
commit2c00fdd8f3b0c9680ee642a78dfd6587f32e8460 (patch) (side-by-side diff)
treeba73624ab704354f7c14db80dc4f2322920a7407
parentc4c97ef4ccf9d379ff59560c3ae3c32f95fc51d1 (diff)
downloadopie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.zip
opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.gz
opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.bz2
Today stock ticker plugin: libopie -> libopie2
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/todayplugins/stockticker/config.in2
-rw-r--r--noncore/todayplugins/stockticker/opie-today-stocktickerplugin.control2
-rw-r--r--noncore/todayplugins/stockticker/stockticker/config.in2
-rw-r--r--noncore/todayplugins/stockticker/stockticker/inputDialog.cpp3
-rw-r--r--noncore/todayplugins/stockticker/stockticker/inputDialog.h3
-rw-r--r--noncore/todayplugins/stockticker/stockticker/stockticker.pro2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.cpp4
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerconfig.h3
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerlib.pro2
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerplugin.h9
-rw-r--r--noncore/todayplugins/stockticker/stocktickerlib/stocktickerpluginwidget.cpp4
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
@@ -4,6 +4,6 @@ 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
@@ -2,4 +2,4 @@ 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,7 +1,6 @@
#include "inputDialog.h"
#include <qapplication.h>
-
#include <qlayout.h>
#include <qcheckbox.h>
#include <qlineedit.h>
@@ -15,8 +14,6 @@
#include <qmainwindow.h>
#include "helpwindow.h"
-#include <opie/oprocess.h>
-
#include <stdlib.h>
// #include <sys/stat.h>
// #include <unistd.h>
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
@@ -2,10 +2,11 @@
#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;
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
@@ -6,7 +6,7 @@ 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
@@ -15,12 +15,12 @@
***************************************************************************/
#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>
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
@@ -17,8 +17,9 @@
#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;
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
@@ -20,7 +20,7 @@ INCLUDEPATH += $(OPIEDIR)/include \
DEPENDPATH += $(OPIEDIR)/include \
../ ../library
-LIBS+= -lqpe -lopie -lpthread
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread
TMAKE_CFLAGS += -D__UNIX__
DESTDIR = $(OPIEDIR)/plugins/today
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
@@ -18,14 +18,13 @@
#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:
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
@@ -14,11 +14,11 @@
* *
***************************************************************************/
- #include <qlayout.h>
+ #include <opie2/oticker.h>
#include <qpe/config.h>
- #include <opie/oticker.h>
+ #include <qlayout.h>
extern "C" {
#include "libstocks/stocks.h"