6 files changed, 15 insertions, 11 deletions

diff --git a/core/pim/today/plugins/mail/mail.pro b/core/pim/today/plugins/mail/mail.pro
index 70c484d..1c3555b 100644
--- a/core/pim/today/plugins/mail/mail.pro
+++ b/core/pim/today/plugins/mail/mail.pro
@@ -2,25 +2,25 @@ TEMPLATE = lib
 CONFIG -= moc
 CONFIG += qt release
 
 # Input
 HEADERS = mailplugin.h mailpluginimpl.h mailpluginwidget.h
 SOURCES = mailplugin.cpp mailpluginimpl.cpp mailpluginwidget.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include \
                 ../ ../library
 DEPENDPATH      += $(OPIEDIR)/include \
                 ../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -opiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaymailplugin
 
 TRANSLATIONS = ../../../../../i18n/de/libtodaymailplugin.ts \
          ../../../../../i18n/nl/libtodaymailplugin.ts \
          ../../../../../i18n/xx/libtodaymailplugin.ts \
          ../../../../../i18n/en/libtodaymailplugin.ts \
          ../../../../../i18n/es/libtodaymailplugin.ts \
          ../../../../../i18n/fr/libtodaymailplugin.ts \
          ../../../../../i18n/hu/libtodaymailplugin.ts \
          ../../../../../i18n/ja/libtodaymailplugin.ts \
diff --git a/core/pim/today/plugins/mail/mailplugin.h b/core/pim/today/plugins/mail/mailplugin.h
index 7d6d5e8..1edffef 100644
--- a/core/pim/today/plugins/mail/mailplugin.h
+++ b/core/pim/today/plugins/mail/mailplugin.h
@@ -9,31 +9,34 @@
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 
 #ifndef MAIL_PLUGIN_H
 #define MAIL_PLUGIN_H
 
+#include "mailpluginwidget.h"
+
+#include <opie2/todayplugininterface.h>
+#include <opie2/todayconfigwidget.h>
+
 #include <qwidget.h>
 #include <qguardedptr.h>
 
-#include <opie/todayplugininterface.h>
-#include <opie/todayconfigwidget.h>
 
-#include "mailpluginwidget.h"
+
 
 class MailPlugin : public TodayPluginObject {
 
 public:
     MailPlugin();
     ~MailPlugin();
 
     QString pluginName()  const;
     double versionNumber() const;
     QString pixmapNameWidget() const;
     QWidget* widget(QWidget *);
     QString pixmapNameConfig() const;
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.cpp b/core/pim/today/plugins/mail/mailpluginimpl.cpp
index dfd3a64..fac27f4 100644
--- a/core/pim/today/plugins/mail/mailpluginimpl.cpp
+++ b/core/pim/today/plugins/mail/mailpluginimpl.cpp
@@ -1,16 +1,16 @@
 /*
  * mailpluginimpl.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
@@ -29,20 +29,20 @@ MailPluginImpl::~MailPluginImpl() {
 
 
 TodayPluginObject* MailPluginImpl::guiPart() {
     return mailPlugin;
 }
 
 QRESULT MailPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterface **iface ) {
     *iface = 0;
     if ( ( uuid == IID_QUnknown ) || ( uuid == IID_TodayPluginInterface ) )  {
         *iface = this, (*iface)->addRef();
     }else
         return QS_FALSE;
-    
+
     return QS_OK;
 
 }
 
 Q_EXPORT_INTERFACE() {
     Q_CREATE_INSTANCE( MailPluginImpl );
 }
diff --git a/core/pim/today/plugins/mail/mailpluginimpl.h b/core/pim/today/plugins/mail/mailpluginimpl.h
index 72e1760..35b3805 100644
--- a/core/pim/today/plugins/mail/mailpluginimpl.h
+++ b/core/pim/today/plugins/mail/mailpluginimpl.h
@@ -1,32 +1,32 @@
 /*
  * mailpluginimpl.h
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef MAIL_PLUGIN_IMPL_H
 #define MAIL_PLUGIN_IMPL_H
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
 class MailPlugin;
 
 class MailPluginImpl : public TodayPluginInterface{
 
 public:
     MailPluginImpl();
     virtual ~MailPluginImpl();
 
     QRESULT queryInterface( const QUuid &,  QUnknownInterface** );
     Q_REFCOUNT
 
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.cpp b/core/pim/today/plugins/mail/mailpluginwidget.cpp
index feecd81..4194270 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.cpp
+++ b/core/pim/today/plugins/mail/mailpluginwidget.cpp
@@ -4,30 +4,29 @@
  * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include "mailpluginwidget.h"
 
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 
-#include "mailpluginwidget.h"
-
 MailPluginWidget::MailPluginWidget( QWidget *parent,  const char* name)
     : QWidget(parent,  name ) {
 
     m_mailLabel = 0l;
     m_layout = 0l;
 
     if ( m_mailLabel )  {
         delete m_mailLabel;
     }
     m_mailLabel = new OClickableLabel( this );
     connect( m_mailLabel, SIGNAL( clicked() ), this, SLOT( startMail() ) );
 
diff --git a/core/pim/today/plugins/mail/mailpluginwidget.h b/core/pim/today/plugins/mail/mailpluginwidget.h
index 6d16d2c..0ad8738 100644
--- a/core/pim/today/plugins/mail/mailpluginwidget.h
+++ b/core/pim/today/plugins/mail/mailpluginwidget.h
@@ -10,25 +10,27 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #ifndef MAIL_PLUGIN_WIDGET_H
 #define MAIL_PLUGIN_WIDGET_H
 
 #include <qlayout.h>
 
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
+
+using namespace Opie;
 
 class MailPluginWidget : public QWidget {
 
     Q_OBJECT
 
 public:
     MailPluginWidget( QWidget *parent,  const char *name );
     ~MailPluginWidget();
     
     void refresh();
 
 protected slots: