summaryrefslogtreecommitdiff
authordrw <drw>2004-03-02 16:46:08 (UTC)
committer drw <drw>2004-03-02 16:46:08 (UTC)
commit42008f6bc88cde6d0ed49187e4c2df14f178d1c0 (patch) (side-by-side diff)
treeed62b583edc5dd9e1d6ece37153715ad60bee099
parentef17e26cb4d883bf59171d2dcac808cfe2b1372e (diff)
downloadopie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.zip
opie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.tar.gz
opie-42008f6bc88cde6d0ed49187e4c2df14f178d1c0.tar.bz2
Today fortune plugin: libopie -> libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/todayplugins/fortune/config.in1
-rw-r--r--noncore/todayplugins/fortune/fortune.pro2
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.cpp2
-rw-r--r--noncore/todayplugins/fortune/fortuneplugin.h6
-rw-r--r--noncore/todayplugins/fortune/fortunepluginimpl.h2
-rw-r--r--noncore/todayplugins/fortune/fortunepluginwidget.cpp17
-rw-r--r--noncore/todayplugins/fortune/fortunepluginwidget.h7
-rw-r--r--noncore/todayplugins/fortune/opie-today-fortuneplugin.control2
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
@@ -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
@@ -10,12 +10,12 @@ SOURCES = fortuneplugin.cpp fortunepluginimpl.cpp \
INCLUDEPATH += $(OPIEDIR)/include \
../ ../library
DEPENDPATH += $(OPIEDIR)/include \
../ ../library
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopiepim2 -lopieui2
DESTDIR = $(OPIEDIR)/plugins/today
TARGET = todayfortuneplugin
include ( $(OPIEDIR)/include.pro )
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
@@ -50,13 +50,13 @@ QWidget* FortunePlugin::widget( QWidget *wid )
QString FortunePlugin::pixmapNameConfig() const
{
return "Fortune";
}
-TodayConfigWidget* FortunePlugin::configWidget( QWidget* wid )
+TodayConfigWidget* FortunePlugin::configWidget( QWidget* /*wid*/ )
{
// return new FortunePluginConfig( wid , "Fortune" );
return NULL;
}
QString FortunePlugin::appName() const
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
@@ -14,18 +14,18 @@
* *
***************************************************************************/
#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:
FortunePlugin();
~FortunePlugin();
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
@@ -14,13 +14,13 @@
* *
***************************************************************************/
#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
@@ -13,25 +13,22 @@
* (at your option) any later version. *
* *
***************************************************************************/
#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 )
{
fortune = NULL;
getFortune();
@@ -60,25 +57,25 @@ void FortunePluginWidget::getFortune() {
fortune->setText( QString("Obtaining fortune...") );
layoutFortune->addWidget( fortune );
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 :(");
fortune->setText( QString("Failed to obtain fortune.") );
delete fortuneProcess;
fortuneProcess = 0;
}
-
+
}
-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
@@ -14,19 +14,18 @@
* *
***************************************************************************/
#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
public:
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
@@ -1,9 +1,9 @@
Package: opie-today-fortuneplugin
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