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

11 files changed, 38 insertions, 32 deletions

diff --git a/core/pim/today/plugins/datebook/datebook.pro b/core/pim/today/plugins/datebook/datebook.pro
index 413aa47..798c981 100644
--- a/core/pim/today/plugins/datebook/datebook.pro
+++ b/core/pim/today/plugins/datebook/datebook.pro
@@ -13,7 +13,7 @@ INCLUDEPATH     += $(OPIEDIR)/include \
 DEPENDPATH      += $(OPIEDIR)/include \
 		../ ../library
 
-LIBS+= -lqpe -lopie 
+LIBS+= -lqpe -lopiecore2 -lopieui2 -lopiepim2
 
 DESTDIR = $(OPIEDIR)/plugins/today
 TARGET = todaydatebookplugin
diff --git a/core/pim/today/plugins/datebook/datebookevent.cpp b/core/pim/today/plugins/datebook/datebookevent.cpp
index e19a690..9a820f2 100644
--- a/core/pim/today/plugins/datebook/datebookevent.cpp
+++ b/core/pim/today/plugins/datebook/datebookevent.cpp
@@ -1,7 +1,7 @@
 /*
  * datebookevent.cpp
  *
- * copyright   : (c) 2002, 2003 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -15,11 +15,12 @@
  ***************************************************************************/
 
 #include "datebookevent.h"
+
 #include <qpe/config.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/calendar.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 using namespace Opie;
 
diff --git a/core/pim/today/plugins/datebook/datebookevent.h b/core/pim/today/plugins/datebook/datebookevent.h
index 1a090e3..e2ee077 100644
--- a/core/pim/today/plugins/datebook/datebookevent.h
+++ b/core/pim/today/plugins/datebook/datebookevent.h
@@ -1,7 +1,7 @@
 /*
  * datebookplugin.h
  *
- * copyright   : (c) 2002, 2003 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -17,9 +17,11 @@
 #ifndef DATEBOOKEVENT_PLUGIN_H
 #define DATEBOOKEVENT_PLUGIN_H
 
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
+
 #include <qpe/datebookdb.h>
 
+using namespace Opie; 
 
 class DateBookEvent: public OClickableLabel {
 
diff --git a/core/pim/today/plugins/datebook/datebookplugin.cpp b/core/pim/today/plugins/datebook/datebookplugin.cpp
index 8dfa52f..f46806f 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.cpp
+++ b/core/pim/today/plugins/datebook/datebookplugin.cpp
@@ -1,8 +1,7 @@
-
 /*
  * datebookplugin.cpp
  *
- * copyright   : (c) 2002,2003 by Maximilian Reiß
+ * copyright   : (c) 2002,2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -15,8 +14,6 @@
  *                                                                         *
  ***************************************************************************/
 
-
-
 #include "datebookplugin.h"
 #include "datebookpluginconfig.h"
 
diff --git a/core/pim/today/plugins/datebook/datebookplugin.h b/core/pim/today/plugins/datebook/datebookplugin.h
index 890c59b..631d6a3 100644
--- a/core/pim/today/plugins/datebook/datebookplugin.h
+++ b/core/pim/today/plugins/datebook/datebookplugin.h
@@ -17,12 +17,12 @@
 #ifndef DATEBOOK_PLUGIN_H
 #define DATEBOOK_PLUGIN_H
 
-#include <qguardedptr.h>
+#include "datebookpluginwidget.h"
 
-#include <opie/oclickablelabel.h>
-#include <opie/todayplugininterface.h>
+#include <opie2/oclickablelabel.h>
+#include <opie2/todayplugininterface.h>
 
-#include "datebookpluginwidget.h"
+#include <qguardedptr.h>
 
 class DatebookPlugin : public TodayPluginObject {
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
index 8ead40d..5fd5221 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.cpp
@@ -1,7 +1,7 @@
 /*
  * datebookpluginconfig.cpp
  *
- * copyright   : (c) 2002,2003 by Maximilian Reiß
+ * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
diff --git a/core/pim/today/plugins/datebook/datebookpluginconfig.h b/core/pim/today/plugins/datebook/datebookpluginconfig.h
index 2d303fc..4f4e3f1 100644
--- a/core/pim/today/plugins/datebook/datebookpluginconfig.h
+++ b/core/pim/today/plugins/datebook/datebookpluginconfig.h
@@ -1,7 +1,7 @@
 /*
  * datebookpluginconfig.h
  *
- * copyright   : (c) 2002,2003 by Maximilian Reiß
+ * copyright   : (c) 2002,2003,2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -17,13 +17,16 @@
 #ifndef DATEBOOK_PLUGIN_CONFIG_H
 #define DATEBOOK_PLUGIN_CONFIG_H
 
+#include "datebookpluginconfigbase.h"
+
+#include <opie2/todayconfigwidget.h>
 
 #include <qcheckbox.h>
 #include <qspinbox.h>
 
-#include <opie/todayconfigwidget.h>
 
-#include "datebookpluginconfigbase.h"
+
+
 
 class DatebookPluginConfig : public TodayConfigWidget  {
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
index 6baffb9..ee250db 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.cpp
@@ -1,7 +1,7 @@
 /*
  * datebookpluginimpl.cpp
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -35,7 +35,7 @@ QRESULT DatebookPluginImpl::queryInterface( const QUuid & uuid,  QUnknownInterfa
         *iface = this, (*iface)->addRef();
     }else
 	return QS_FALSE;
-    
+
     return QS_OK;
 
 }
diff --git a/core/pim/today/plugins/datebook/datebookpluginimpl.h b/core/pim/today/plugins/datebook/datebookpluginimpl.h
index 7c19e59..d34dd6d 100644
--- a/core/pim/today/plugins/datebook/datebookpluginimpl.h
+++ b/core/pim/today/plugins/datebook/datebookpluginimpl.h
@@ -1,7 +1,7 @@
 /*
  * datebookpluginimpl.h
  *
- * copyright   : (c) 2002 by Maximilian Reiß
+ * copyright   : (c) 2002, 2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -17,7 +17,7 @@
 #ifndef DATEBOOK_PLUGIN_IMPL_H
 #define DATEBOOK_PLUGIN_IMPL_H
 
-#include <opie/todayplugininterface.h>
+#include <opie2/todayplugininterface.h>
 
 class DatebookPlugin;
 
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
index 1b11d1b..b6707df 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.cpp
@@ -1,7 +1,7 @@
  /*
  * datebookpluginwidget.cpp
  *
- * copyright   : (c) 2002,2003 by Maximilian Reiß
+ * copyright   : (c) 2002,2003, 2004 by Maximilian Reiß
  * email       : harlekin@handhelds.org
  *
  */
@@ -100,18 +100,18 @@ void DatebookPluginWidget::getDates() {
                     m_eventsList.append( l );
                     l->show();
                     QObject::connect ( l, SIGNAL( editEvent( const Event & ) ), l, SLOT( editEventSlot( const Event & ) ) );
-                } else { 
-			if ( ( QDateTime::currentDateTime()  <=  (*it).event().end() )  
+                } else {
+			if ( ( QDateTime::currentDateTime()  <=  (*it).event().end() )
 			     // Show events which span over many days and are not elapsed.
 			     || ( ( (*it).event().start().date() != date ) &&  (  QDateTime::currentDateTime()  <=  (*it).event().end() )  )
 			     // Show repeated event for today that is not elapsed.
  			     || ( ( (*it).event().repeatType() != Event::NoRepeat )
-				  && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() ) 
-				       && ( QTime::currentTime() < (*it).event().start().time() ) ) ) 
+				  && ( ( date.dayOfWeek() == (*it).date().dayOfWeek() )
+				       && ( QTime::currentTime() < (*it).event().start().time() ) ) )
 			     // Show repeated event for next days.
 			     || ( ( (*it).event().repeatType() != Event::NoRepeat )
-				  && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) )  
-			     ) 
+				  && ( date.dayOfWeek() != (*it).date().dayOfWeek() ) )
+			     )
 			     {
 				count++;
 				// show only later appointments
diff --git a/core/pim/today/plugins/datebook/datebookpluginwidget.h b/core/pim/today/plugins/datebook/datebookpluginwidget.h
index 8988073..68af323 100644
--- a/core/pim/today/plugins/datebook/datebookpluginwidget.h
+++ b/core/pim/today/plugins/datebook/datebookpluginwidget.h
@@ -17,14 +17,17 @@
 #ifndef DATEBOOK_PLUGIN_WIDGET_H
 #define DATEBOOK_PLUGIN_WIDGET_H
 
+#include "datebookevent.h"
+
+#include <opie2/oclickablelabel.h>
+
+#include <qpe/datebookdb.h>
+
 #include <qlayout.h>
 #include <qguardedptr.h>
 #include <qlist.h>
 
-#include <qpe/datebookdb.h>
-#include <opie/oclickablelabel.h>
-
-#include "datebookevent.h"
+using namespace Opie; 
 
 class DatebookPluginWidget :  public QWidget {