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
@@ -38,7 +38,6 @@ void DatebookSearch::expand()
 	 _dates->load();
 	 }
-#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++) {
 		new EventItem( this, new OEvent( results[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,7 +1,2 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: .
-# Target is an application:  osearch
-
 DEPENDPATH += $(OPIEDIR)/ioclude
 LIBS += -lqpe -lopie
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
@@ -18,4 +18,6 @@
 #include <qregexp.h>
 
+//#define LIPBOPIE_SEARCH
+
 /**
 @author Patrick S. Vogt
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
@@ -43,9 +43,10 @@ void TodoSearch::expand()
 	 }
 
+#ifdef LIPBOPIE_SEARCH
 	ORecordList<OTodo> results = _todos->matchRegexp(_search);
 	for (uint i = 0; i < results.count(); i++) {
 		new TodoItem( this, new OTodo( results[i] ));
 	}
-/*
+#else
 	ORecordList<OTodo> list = _todos->allRecords();
        QArray<int> m_currentQuery( list.count() );
@@ -57,5 +58,6 @@ void TodoSearch::expand()
                  }
 
-        }*/
+        }
+#endif
 
 }