now it 'works' with the current libopie, again

4 files changed, 7 insertions, 9 deletions

diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index e60a3b1..8f9d472 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -39,5 +39,4 @@ void DatebookSearch::expand()
          }
-#define LIPBOPIE_SEARCH
 #ifdef LIPBOPIE_SEARCH
-        ORecordList<OEvent> results = _dates->matchRegexp(_search); 
+        ORecordList<OEvent> results = _dates->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++) {
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro
index 996eb53..397bc83 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -1,6 +1 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: .
-# Target is an application:  osearch
-
 DEPENDPATH += $(OPIEDIR)/ioclude
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index d26ff17..6b6bbf5 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -19,2 +19,4 @@
 
+//#define LIPBOPIE_SEARCH
+
 /**
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 82fae8d..9a22ee1 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -44,2 +44,3 @@ void TodoSearch::expand()
 
+#ifdef LIPBOPIE_SEARCH
         ORecordList<OTodo> results = _todos->matchRegexp(_search);
@@ -48,3 +49,3 @@ void TodoSearch::expand()
         }
-/*
+#else
         ORecordList<OTodo> list = _todos->allRecords();
@@ -58,3 +59,4 @@ void TodoSearch::expand()
 
-        }*/
+        }
+#endif