author | drw <drw> | 2004-03-02 16:46:08 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 16:46:08 (UTC) |
commit | 42008f6bc88cde6d0ed49187e4c2df14f178d1c0 (patch) (side-by-side diff) | |
tree | ed62b583edc5dd9e1d6ece37153715ad60bee099 | |
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 | 11 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/fortunepluginwidget.h | 7 | ||||
-rw-r--r-- | noncore/todayplugins/fortune/opie-today-fortuneplugin.control | 2 |
8 files changed, 15 insertions, 18 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 @@ -1,4 +1,5 @@ config TODAY_FORTUNE 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 @@ -12,9 +12,9 @@ INCLUDEPATH += $(OPIEDIR)/include \ ../ ../library DEPENDPATH += $(OPIEDIR)/include \ ../ ../library -LIBS+= -lqpe -lopie +LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2 DESTDIR = $(OPIEDIR)/plugins/today TARGET = todayfortuneplugin 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 @@ -52,9 +52,9 @@ QString FortunePlugin::pixmapNameConfig() const { return "Fortune"; } -TodayConfigWidget* FortunePlugin::configWidget( QWidget* wid ) +TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ ) { // return new FortunePluginConfig( wid , "Fortune" ); return NULL; } 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 @@ -16,14 +16,14 @@ #ifndef FORTUNE_PLUGIN_H #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 { public: 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 @@ -16,9 +16,9 @@ #ifndef FORTUNE_PLUGIN_IMPL_H #define FORTUNE_PLUGIN_IMPL_H -#include <opie/todayplugininterface.h> +#include <opie2/todayplugininterface.h> class FortunePlugin; class FortunePluginImpl : public TodayPluginInterface 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 @@ -15,21 +15,18 @@ ***************************************************************************/ #include "fortunepluginwidget.h" +#include <qpe/config.h> +#include <qpe/qcopenvelope_qws.h> + #include <qvaluelist.h> #include <qtl.h> #include <qstring.h> #include <qscrollview.h> #include <qobject.h> #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 ) { @@ -75,9 +72,9 @@ void FortunePluginWidget::getFortune() { } } -void FortunePluginWidget::slotStdOut( OProcess* proc, char* buf, int len ) +void FortunePluginWidget::slotStdOut( OProcess* /*proc*/, char* buf, int len ) { QCString s( buf, len ); s.replace( QRegExp("\n"), "" ); fortune->setText( s ); 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 @@ -16,15 +16,14 @@ #ifndef FORTUNE_PLUGIN_WIDGET_H #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 { Q_OBJECT 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 @@ -3,7 +3,7 @@ Files: plugins/today/libtodayfortuneplugin.so* Priority: optional 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 |