12 files changed, 11 insertions, 113 deletions

diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 625c7cd..4d0f8e6 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -21,8 +21,7 @@
 #include <qwidget.h>
 
 #include <opie/oclickablelabel.h>
-
-#include "../../todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class DatebookPlugin : public TodayPluginObject {
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index 99aa76c..feba9ee 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -6,7 +6,7 @@
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
-#include "../../todayconfigwidget.h"
+#include <opie/todayconfigwidget.h>
 
 class DatebookPluginConfig : public TodayConfigWidget {
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h
index 037dff4..4dbb318 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.h
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h
@@ -17,7 +17,7 @@
 #ifndef DATEBOOK_PLUGIN_IMPL_H
 #define DATEBOOK_PLUGIN_IMPL_H
 
-#include "../../todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class DatebookPlugin;
 
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index a27f4c7..d2a3dcb 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -24,8 +24,8 @@
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
 
-#include "../../todayplugininterface.h"
-#include "../../todayconfigwidget.h"
+#include <opie/todayplugininterface.h>
+#include <opie/todayconfigwidget.h>
 
 class MailPlugin : public TodayPluginObject {
 
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h
index 9930e6e..54412b2 100644
--- a/core/pim/today/plugins/mail/mailpluginimpl.h
+++ b/core/pim/today/plugins/mail/mailpluginimpl.h
@@ -17,7 +17,7 @@
 #ifndef MAIL_PLUGIN_IMPL_H
 #define MAIL_PLUGIN_IMPL_H
 
-#include "../../todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class MailPlugin;
 
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index 2c03389..0a6669f 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -22,8 +22,7 @@
 
 #include <opie/tododb.h>
 #include <opie/oclickablelabel.h>
-
-#include "../../todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class TodolistPlugin : public TodayPluginObject {
 
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index 26557d5..4584ebe 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -20,7 +20,7 @@
 #include <qwidget.h>
 #include <qspinbox.h>
 
-#include "../../todayconfigwidget.h"
+#include <opie/todayconfigwidget.h>
 
 class TodolistPluginConfig : public TodayConfigWidget {
 
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h
index 29e0294..c119be2 100644
--- a/core/pim/today/plugins/todolist/todopluginimpl.h
+++ b/core/pim/today/plugins/todolist/todopluginimpl.h
@@ -17,7 +17,7 @@
 #ifndef TODOLIST_PLUGIN_IMPL_H
 #define TODOLIST_PLUGIN_IMPL_H
 
-#include "../../todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class TodolistPlugin;
 
diff --git a/core/pim/today/today.cpp b/core/pim/today/today.cpp
index f5f88f8..35758d5 100644
--- a/core/pim/today/today.cpp
+++ b/core/pim/today/today.cpp
@@ -16,7 +16,7 @@
 
 
 #include "today.h"
-#include "todayconfigwidget.h"
+#include <opie/todayconfigwidget.h>
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
diff --git a/core/pim/today/today.h b/core/pim/today/today.h
index b35c9b1..92512b9 100644
--- a/core/pim/today/today.h
+++ b/core/pim/today/today.h
@@ -29,7 +29,7 @@
 
 #include "todayconfig.h"
 #include "todaybase.h"
-#include "todayplugininterface.h"
+#include <opie/todayplugininterface.h>
 
 class QVBoxLayout;
 
diff --git a/core/pim/today/todayconfigwidget.h b/core/pim/today/todayconfigwidget.h
deleted file mode 100644
index 48cf379..0000000
--- a/core/pim/today/todayconfigwidget.h
+++ b/dev/null
@@ -1,21 +0,0 @@
-
-#ifndef CONFIG_WIDGET_H
-#define CONFIG_WIDGET_H
-
-
-class TodayConfigWidget : public QWidget {
-
-
-public:
-
-    TodayConfigWidget( QWidget *parent,  const char *name ) : QWidget( parent,  name ) {} ;
-    virtual ~TodayConfigWidget() {};
-
-    /**
-     * Plugins need to reimplement this in the config widget
-     * Used when the config dialog is closed to write config stuff
-     */
-    virtual void  writeConfig() = 0;
-};
-
-#endif
diff --git a/core/pim/today/todayplugininterface.h b/core/pim/today/todayplugininterface.h
deleted file mode 100644
index becb79c..0000000
--- a/core/pim/today/todayplugininterface.h
+++ b/dev/null
@@ -1,79 +0,0 @@
-
-#ifndef TODAY_PLUGIN_INTERFACE
-#define TODAY_PLUGIN_INTERFACE
-
-#include <qpe/qcom.h>
-#include "todayconfigwidget.h"
-
-class QString;
-class QWidget;
-
-#ifndef IID_TodayPluginInterface
-#define IID_TodayPluginInterface QUuid( 0x70481804, 0x2b50, 0x4fba, 0x80, 0xbb, 0x0b, 0xf8, 0xdc, 0x72, 0x04, 0x14)
-#endif
-
-/**
- *
- *
- *
- */
-class TodayPluginObject  {
-
-    Q_OBJECT
-
-public:
-
-    virtual ~TodayPluginObject() {};
-
-    /**
-     * The name if the plugin
-     */
-    virtual QString pluginName() const = 0;
-
-    /**
-     * Version numbering
-     */
-    virtual double versionNumber() const = 0;
-
-
-    virtual  QString pixmapNameWidget() const = 0;
-
-    /**    widget for the today view
-     * It _needs_ a parent here.
-     */
-    virtual QWidget* widget( QWidget * ) = 0;
-
-    /**
-     * Pixmap used in the config widget
-     */
-    virtual QString pixmapNameConfig() const = 0;
-
-    /**
-     * Config plugin widget - optional
-     * If the plugin has a config widget, it  _needs_  a parent here.
-     */
-    virtual TodayConfigWidget* configWidget( QWidget * ) = 0;
-
-    /**
-     * The application that should be assigned to the button (pixmap)
-     */
-    virtual QString appName() const = 0;
-
-    /**
-     * minimum height the plugin at least should have
-     */
-    // virtual int minHeight()  const = 0;
-
-    /**
-     *  maximum height that should be used before starting scrolling
-     */
-    // virtual int maxHeight() const = 0;
-
-};
-
-
-struct TodayPluginInterface : public QUnknownInterface {
-    virtual TodayPluginObject *guiPart() = 0;
-};
-
-#endif