Today stock ticker plugin: libopie -> libopie2

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
parent: c4c97ef4ccf9d379ff59560c3ae3c32f95fc51d1 (diff)
download: opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.zip
opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.gz
opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.bz2
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
@@ -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>
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>
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
@@ -8,3 +8,3 @@ 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>
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,3 +20,3 @@
-  #include <opie/oticker.h>
+  #include <qlayout.h>
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
parent	c4c97ef4ccf9d379ff59560c3ae3c32f95fc51d1 (diff)
download	opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.zip opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.gz opie-2c00fdd8f3b0c9680ee642a78dfd6587f32e8460.tar.bz2

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 @@
3	default "y"	3	default "y"
4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE && TODAY	4	depends ( LIBQPE \|\| LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2PIM && LIBOPIE2UI && TODAY
5		5


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>
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


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
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
@@ -3,3 +3,2 @@
3	#include <qapplication.h>	3	#include <qapplication.h>
4
5	#include <qlayout.h>	4	#include <qlayout.h>
@@ -17,4 +16,2 @@
17		16
18	#include <opie/oprocess.h>
19
20	#include <stdlib.h>	17	#include <stdlib.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
@@ -4,2 +4,4 @@
4		4
		5	#include <opie2/oprocess.h>
		6
5	#include <qvariant.h>	7	#include <qvariant.h>
@@ -7,3 +9,2 @@
7	#include <qmainwindow.h>	9	#include <qmainwindow.h>
8	#include <opie/oprocess.h>
9		10


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
@@ -8,3 +8,3 @@ 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


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 @@
17	#include "stocktickerconfig.h"	17	#include "stocktickerconfig.h"
18	#include <opie/todayconfigwidget.h>	18
		19	#include <opie2/todayconfigwidget.h>
19		20
@@ -22,3 +23,2 @@
22	#include <qapplication.h>	23	#include <qapplication.h>
23
24	#include <qlayout.h>	24	#include <qlayout.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
@@ -19,4 +19,5 @@
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>


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 \
22		22
23	LIBS+= -lqpe -lopie -lpthread	23	LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 -lpthread
24	TMAKE_CFLAGS += -D__UNIX__	24	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 @@
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>
@@ -23,7 +27,2 @@
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 {


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 @@
16		16
17	#include <qlayout.h>	17	#include <opie2/oticker.h>
18		18
@@ -20,3 +20,3 @@
20		20
21	#include <opie/oticker.h>	21	#include <qlayout.h>
22		22