author | drw <drw> | 2004-03-02 16:46:08 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 16:46:08 (UTC) |
commit | 42008f6bc88cde6d0ed49187e4c2df14f178d1c0 (patch) (unidiff) | |
tree | ed62b583edc5dd9e1d6ece37153715ad60bee099 /noncore | |
parent | ef17e26cb4d883bf59171d2dcac808cfe2b1372e (diff) | |
download | opie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.zip opie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.tar.gz opie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.tar.bz2 |
Today fortune plugin: libopie -> libopie2
-rw-r--r-- | noncore/todayplugins/fortune/config.in | 1 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortune.pro | 2 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortuneplugin.cpp | 2 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortuneplugin.h | 6 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortunepluginimpl.h | 2 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortunepluginwidget.cpp | 17 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortunepluginwidget.h | 7 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/opie-today-fortuneplugin.control | 2 |
8 files changed, 18 insertions, 21 deletions
diff --git a/noncore/todayplugins/fortune/config.in b/noncore/todayplugins/fortune/config.in index 1f9a08b..ca476f1 100644 --- a/noncore/todayplugins/fortune/config.in +++ b/noncore/todayplugins/fortune/config.in | |||
@@ -2,3 +2,4 @@ | |||
2 | boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)" | 2 | boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)" |
3 | default "y" | 3 | default "y" |
4 | depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY | ||
4 | depends TODAY | 5 | depends TODAY |
diff --git a/noncore/todayplugins/fortune/fortune.pro b/noncore/todayplugins/fortune/fortune.pro index 3446732..84a5730 100644 --- a/noncore/todayplugins/fortune/fortune.pro +++ b/noncore/todayplugins/fortune/fortune.pro | |||
@@ -14,5 +14,5 @@ DEPENDPATH += $(OPIEDIR)/include \ | |||
14 | ../ ../library | 14 | ../ ../library |
15 | 15 | ||
16 | LIBS+= -lqpe -lopie | 16 | LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 |
17 | 17 | ||
18 | DESTDIR = $(OPIEDIR)/plugins/today | 18 | DESTDIR = $(OPIEDIR)/plugins/today |
diff --git a/noncore/todayplugins/fortune/fortuneplugin.cpp b/noncore/todayplugins/fortune/fortuneplugin.cpp index 9751e6f..69d2c45 100644 --- a/noncore/todayplugins/fortune/fortuneplugin.cpp +++ b/noncore/todayplugins/fortune/fortuneplugin.cpp | |||
@@ -54,5 +54,5 @@ QString FortunePlugin::pixmapNameConfig() const | |||
54 | } | 54 | } |
55 | 55 | ||
56 | TodayConfigWidget* FortunePlugin::configWidget( QWidget* wid ) | 56 | TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ ) |
57 | { | 57 | { |
58 | // return new FortunePluginConfig( wid , "Fortune" ); | 58 | // return new FortunePluginConfig( wid , "Fortune" ); |
diff --git a/noncore/todayplugins/fortune/fortuneplugin.h b/noncore/todayplugins/fortune/fortuneplugin.h index 9376771..9b590ad 100644 --- a/noncore/todayplugins/fortune/fortuneplugin.h +++ b/noncore/todayplugins/fortune/fortuneplugin.h | |||
@@ -18,10 +18,10 @@ | |||
18 | #define FORTUNE_PLUGIN_H | 18 | #define FORTUNE_PLUGIN_H |
19 | 19 | ||
20 | #include <opie2/oclickablelabel.h> | ||
21 | #include <opie2/todayplugininterface.h> | ||
22 | |||
20 | #include <qstring.h> | 23 | #include <qstring.h> |
21 | #include <qwidget.h> | 24 | #include <qwidget.h> |
22 | 25 | ||
23 | #include <opie/oclickablelabel.h> | ||
24 | #include <opie/todayplugininterface.h> | ||
25 | |||
26 | class FortunePlugin : public TodayPluginObject | 26 | class FortunePlugin : public TodayPluginObject |
27 | { | 27 | { |
diff --git a/noncore/todayplugins/fortune/fortunepluginimpl.h b/noncore/todayplugins/fortune/fortunepluginimpl.h index 8e380f5..35ecf92 100644 --- a/noncore/todayplugins/fortune/fortunepluginimpl.h +++ b/noncore/todayplugins/fortune/fortunepluginimpl.h | |||
@@ -18,5 +18,5 @@ | |||
18 | #define FORTUNE_PLUGIN_IMPL_H | 18 | #define FORTUNE_PLUGIN_IMPL_H |
19 | 19 | ||
20 | #include <opie/todayplugininterface.h> | 20 | #include <opie2/todayplugininterface.h> |
21 | 21 | ||
22 | class FortunePlugin; | 22 | class FortunePlugin; |
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.cpp b/noncore/todayplugins/fortune/fortunepluginwidget.cpp index e6a0d09..3aa978c 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.cpp +++ b/noncore/todayplugins/fortune/fortunepluginwidget.cpp | |||
@@ -17,4 +17,7 @@ | |||
17 | #include "fortunepluginwidget.h" | 17 | #include "fortunepluginwidget.h" |
18 | 18 | ||
19 | #include <qpe/config.h> | ||
20 | #include <qpe/qcopenvelope_qws.h> | ||
21 | |||
19 | #include <qvaluelist.h> | 22 | #include <qvaluelist.h> |
20 | #include <qtl.h> | 23 | #include <qtl.h> |
@@ -24,10 +27,4 @@ | |||
24 | #include <qlayout.h> | 27 | #include <qlayout.h> |
25 | 28 | ||
26 | #include <qpe/config.h> | ||
27 | #include <qpe/qcopenvelope_qws.h> | ||
28 | |||
29 | #include <opie/oprocess.h> | ||
30 | #include <opie/oticker.h> | ||
31 | |||
32 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) | 29 | FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) |
33 | : QWidget( parent, name ) | 30 | : QWidget( parent, name ) |
@@ -64,8 +61,8 @@ void FortunePluginWidget::getFortune() { | |||
64 | fortuneProcess = new OProcess(); | 61 | fortuneProcess = new OProcess(); |
65 | *fortuneProcess << "fortune"; | 62 | *fortuneProcess << "fortune"; |
66 | 63 | ||
67 | connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*,char*,int) ), | 64 | connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*,char*,int) ), |
68 | this, SLOT(slotStdOut(OProcess*,char*,int) ) ); | 65 | this, SLOT(slotStdOut(OProcess*,char*,int) ) ); |
69 | 66 | ||
70 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { | 67 | if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { |
71 | qWarning("could not start :("); | 68 | qWarning("could not start :("); |
@@ -74,8 +71,8 @@ void FortunePluginWidget::getFortune() { | |||
74 | fortuneProcess = 0; | 71 | fortuneProcess = 0; |
75 | } | 72 | } |
76 | 73 | ||
77 | } | 74 | } |
78 | 75 | ||
79 | void FortunePluginWidget::slotStdOut( OProcess* proc, char* buf, int len ) | 76 | void FortunePluginWidget::slotStdOut( OProcess* /*proc*/, char* buf, int len ) |
80 | { | 77 | { |
81 | QCString s( buf, len ); | 78 | QCString s( buf, len ); |
diff --git a/noncore/todayplugins/fortune/fortunepluginwidget.h b/noncore/todayplugins/fortune/fortunepluginwidget.h index 302d046..abb7bed 100644 --- a/noncore/todayplugins/fortune/fortunepluginwidget.h +++ b/noncore/todayplugins/fortune/fortunepluginwidget.h | |||
@@ -18,11 +18,10 @@ | |||
18 | #define FORTUNE_PLUGIN_WIDGET_H | 18 | #define FORTUNE_PLUGIN_WIDGET_H |
19 | 19 | ||
20 | #include <opie2/oprocess.h> | ||
21 | #include <opie2/oticker.h> | ||
22 | |||
20 | #include <qstring.h> | 23 | #include <qstring.h> |
21 | #include <qwidget.h> | 24 | #include <qwidget.h> |
22 | 25 | ||
23 | #include <opie/oticker.h> | ||
24 | #include <opie/oprocess.h> | ||
25 | |||
26 | |||
27 | class FortunePluginWidget : public QWidget | 26 | class FortunePluginWidget : public QWidget |
28 | { | 27 | { |
diff --git a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control index 48ddab1..9b7adbe 100644 --- a/noncore/todayplugins/fortune/opie-today-fortuneplugin.control +++ b/noncore/todayplugins/fortune/opie-today-fortuneplugin.control | |||
@@ -5,5 +5,5 @@ Section: opie/plugins | |||
5 | Maintainer: Chris Larson <kergoth@handhelds.org> | 5 | Maintainer: Chris Larson <kergoth@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: opie-today, fortune (<=9708-0.1) | fortune-mod | 7 | Depends: opie-today, fortune (<=9708-0.1) | fortune-mod, libopiecore2, libopiepim2, libopieui2 |
8 | Description: 'fortune' plugin for Today | 8 | Description: 'fortune' plugin for Today |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: $QPE_VERSION$EXTRAVERSION |