Diffstat (limited to 'noncore/todayplugins/fortune') (more/less context) (ignore whitespace changes)
-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 @@ boolean "opie-today-fortuneplugin (a joke a day keeps the doctor away)" default "y" + depends (LIBQPE || LIBQPE-X11) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && TODAY 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 \ ../ ../library -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 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 } -TodayConfigWidget* FortunePlugin::configWidget( QWidget* wid ) +TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ ) { // 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 @@ #define FORTUNE_PLUGIN_H +#include <opie2/oclickablelabel.h> +#include <opie2/todayplugininterface.h> + #include <qstring.h> #include <qwidget.h> -#include <opie/oclickablelabel.h> -#include <opie/todayplugininterface.h> - class FortunePlugin : public TodayPluginObject { 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 @@ #define FORTUNE_PLUGIN_IMPL_H -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> 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 @@ #include "fortunepluginwidget.h" +#include <qpe/config.h> +#include <qpe/qcopenvelope_qws.h> + #include <qvaluelist.h> #include <qtl.h> @@ -24,10 +27,4 @@ #include <qlayout.h> -#include <qpe/config.h> -#include <qpe/qcopenvelope_qws.h> - -#include <opie/oprocess.h> -#include <opie/oticker.h> - FortunePluginWidget::FortunePluginWidget( QWidget *parent, const char* name ) : QWidget( parent, name ) @@ -64,8 +61,8 @@ void FortunePluginWidget::getFortune() { fortuneProcess = new OProcess(); *fortuneProcess << "fortune"; - + connect(fortuneProcess, SIGNAL(receivedStdout(OProcess*,char*,int) ), this, SLOT(slotStdOut(OProcess*,char*,int) ) ); - + if(!fortuneProcess->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) { qWarning("could not start :("); @@ -74,8 +71,8 @@ void FortunePluginWidget::getFortune() { fortuneProcess = 0; } - + } -void FortunePluginWidget::slotStdOut( OProcess* proc, char* buf, int len ) +void FortunePluginWidget::slotStdOut( OProcess* /*proc*/, char* buf, int len ) { 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 @@ #define FORTUNE_PLUGIN_WIDGET_H +#include <opie2/oprocess.h> +#include <opie2/oticker.h> + #include <qstring.h> #include <qwidget.h> -#include <opie/oticker.h> -#include <opie/oprocess.h> - - class FortunePluginWidget : public QWidget { 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 Maintainer: Chris Larson <kergoth@handhelds.org> Architecture: arm -Depends: opie-today, fortune (<=9708-0.1) | fortune-mod +Depends: opie-today, fortune (<=9708-0.1) | fortune-mod, libopiecore2, libopiepim2, libopieui2 Description: 'fortune' plugin for Today Version: $QPE_VERSION$EXTRAVERSION |