today plus datebook, mail, todolist plugins libopie1->libopie2

8 files changed, 24 insertions, 23 deletions

diff --git a/core/pim/today/plugins/todolist/todolist.pro b/core/pim/today/plugins/todolist/todolist.pro
index 095247f..8f2f898 100644
--- a/core/pim/today/plugins/todolist/todolist.pro
+++ b/core/pim/today/plugins/todolist/todolist.pro
@@ -14,7 +14,7 @@ INCLUDEPATH     += $(OPIEDIR)/include \
 DEPENDPATH      += $(OPIEDIR)/include \
 		../ ../library
 
-LIBS+= -lqpe -lopie
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaytodolistplugin
diff --git a/core/pim/today/plugins/todolist/todoplugin.cpp b/core/pim/today/plugins/todolist/todoplugin.cpp
index 801de9d..5783814 100644
--- a/core/pim/today/plugins/todolist/todoplugin.cpp
+++ b/core/pim/today/plugins/todolist/todoplugin.cpp
@@ -1,7 +1,7 @@
 /*
  * todoplugin.cpp
  *
- * copyright   : (c) 2002,2003 by Maximilian Reiß
+ * copyright   : (c) 2002,2003, 2004  by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -14,12 +14,9 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "todoplugin.h"
 #include "todopluginconfig.h"
 
-
 TodolistPlugin::TodolistPlugin() {
 }
 
diff --git a/core/pim/today/plugins/todolist/todoplugin.h b/core/pim/today/plugins/todolist/todoplugin.h
index f68162f..bea15d5 100644
--- a/core/pim/today/plugins/todolist/todoplugin.h
+++ b/core/pim/today/plugins/todolist/todoplugin.h
@@ -1,7 +1,7 @@
 /*
  * todoplugin.h
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002,2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -17,14 +17,17 @@
 #ifndef TODOLIST_PLUGIN_H
 #define TODOLIST_PLUGIN_H
 
+
+#include "todopluginwidget.h"
+
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
+
 #include <qstring.h>
 #include <qguardedptr.h>
 #include <qwidget.h>
 
-#include <opie/oclickablelabel.h>
-#include <opie/todayplugininterface.h>
-
-#include "todopluginwidget.h"
+using namespace Opie; 
 
 class TodolistPlugin : public TodayPluginObject {
 
diff --git a/core/pim/today/plugins/todolist/todopluginconfig.h b/core/pim/today/plugins/todolist/todopluginconfig.h
index a2d7d2c..7040369 100644
--- a/core/pim/today/plugins/todolist/todopluginconfig.h
+++ b/core/pim/today/plugins/todolist/todopluginconfig.h
@@ -17,11 +17,11 @@
 #ifndef TODOLIST_PLUGIN_CONFIG_H
 #define TODOLIST_PLUGIN_CONFIG_H
 
-#include <qspinbox.h>
+#include "todopluginconfigbase.h"
 
-#include <opie/todayconfigwidget.h>
+#include <opie2/todayconfigwidget.h>
 
-#include "todopluginconfigbase.h"
+#include <qspinbox.h>
 
 class TodolistPluginConfig : public TodayConfigWidget {
     Q_OBJECT
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.cpp b/core/pim/today/plugins/todolist/todopluginimpl.cpp
index 639587f..1a6189f 100644
--- a/core/pim/today/plugins/todolist/todopluginimpl.cpp
+++ b/core/pim/today/plugins/todolist/todopluginimpl.cpp
@@ -1,7 +1,7 @@
 /*
  * todopluginimpl.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -36,7 +36,7 @@ QRESULT TodolistPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterfa
         *iface = this, (*iface)->addRef();
     }else
 	return QS_FALSE;
-	
+
     return QS_OK;
 
 }
diff --git a/core/pim/today/plugins/todolist/todopluginimpl.h b/core/pim/today/plugins/todolist/todopluginimpl.h
index ca62fdb..f9b0b37 100644
--- a/core/pim/today/plugins/todolist/todopluginimpl.h
+++ b/core/pim/today/plugins/todolist/todopluginimpl.h
@@ -1,7 +1,7 @@
 /*
  * todopluginimpl.h
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -17,7 +17,7 @@
 #ifndef TODOLIST_PLUGIN_IMPL_H
 #define TODOLIST_PLUGIN_IMPL_H
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
 class TodolistPlugin;
 
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.cpp b/core/pim/today/plugins/todolist/todopluginwidget.cpp
index 0364f94..567c70f 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.cpp
+++ b/core/pim/today/plugins/todolist/todopluginwidget.cpp
@@ -29,7 +29,7 @@ TodolistPluginWidget::TodolistPluginWidget( QWidget *parent,  const char* name )
     if ( todo ) {
         delete todo;
     }
-    todo = new OTodoAccess();
+    todo = new OPimTodoAccess();
     todo->load();
 
     if ( layoutTodo ) {
diff --git a/core/pim/today/plugins/todolist/todopluginwidget.h b/core/pim/today/plugins/todolist/todopluginwidget.h
index 9cac43d..a020cf4 100644
--- a/core/pim/today/plugins/todolist/todopluginwidget.h
+++ b/core/pim/today/plugins/todolist/todopluginwidget.h
@@ -19,9 +19,10 @@
 
 #include <qlayout.h>
 
-#include <opie/otodoaccess.h>
-#include <opie/oclickablelabel.h>
+#include <opie2/otodoaccess.h>
+#include <opie2/oclickablelabel.h>
 
+using namespace Opie; 
 
 class TodolistPluginWidget : public QWidget {
 
@@ -41,9 +42,9 @@ private:
     OClickableLabel *todoLabel;
     QVBoxLayout* layoutTodo;
 
-    OTodoAccess *todo;
-    OTodoAccess::List m_list;
-    OTodoAccess::List::Iterator m_it;
+    OPimTodoAccess *todo;
+    OPimTodoAccess::List m_list;
+    OPimTodoAccess::List::Iterator m_it;
 
     void readConfig();
     void getTodo();