1 files changed, 10 insertions, 7 deletions

diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 50c76e0..2b4660a 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -13,10 +13,11 @@
 #include "datebooksearch.h"
-
 #include "eventitem.h"
 
+#include <opie2/opimevent.h>
+#include <opie2/opimrecurrence.h>
+
+
 #include <qpe/resource.h>
 #include <qpe/config.h>
-#include <opie/oevent.h>
-#include <opie/orecur.h>
-#include <opie/odatebookaccess.h>
+
 #include <qiconset.h>
@@ -26,2 +27,4 @@
 
+
+
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
@@ -61,5 +64,5 @@ int DatebookSearch::search()
 {
-        ORecordList<OEvent> results = _dates->matchRegexp(_search);
+        OPimRecordList<OPimEvent> results = _dates->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++)
-                insertItem( new OEvent( results[i] ) );
+                insertItem( new OPimEvent( results[i] ) );
         return _resultCount;
@@ -69,3 +72,3 @@ void DatebookSearch::insertItem( void *rec )
 {
-        OEvent *ev = (OEvent*)rec;
+        OPimEvent *ev = (OPimEvent*)rec;
         if ( !actionShowPastEvents->isOn() &&