now it 'works' with the current libopie, again

4 files changed, 6 insertions, 8 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
@@ -34,13 +34,12 @@ void DatebookSearch::expand()
 {
 	SearchGroup::expand();
  	if (!_dates){
 	 _dates = new ODateBookAccess();
 	 _dates->load();
 	 }
-#define LIPBOPIE_SEARCH
 #ifdef LIPBOPIE_SEARCH
 	ORecordList<OEvent> results = _dates->matchRegexp(_search); 
 	for (uint i = 0; i < results.count(); i++) {
 		new EventItem( this, new OEvent( results[i] ));
 	}
 #else
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,11 +1,6 @@
-# File generated by kdevelop's qmake manager. 
-# ------------------------------------------- 
-# Subdir relative project main directory: .
-# Target is an application:  osearch
-
 DEPENDPATH += $(OPIEDIR)/ioclude
 LIBS += -lqpe -lopie
 INTERFACES =
 include ( $(OPIEDIR)/include.pro )
 TEMPLATE = app
 CONFIG += debug warn_on qt
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
@@ -14,12 +14,14 @@
 #define SEARCHGROUP_H
 
 #include "olistviewitem.h"
 
 #include <qregexp.h>
 
+//#define LIPBOPIE_SEARCH
+
 /**
 @author Patrick S. Vogt
 */
 class SearchGroup : public OListViewItem
 {
 public:
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
@@ -39,25 +39,27 @@ void TodoSearch::expand()
 
 	if (!_todos){
 	 _todos = new OTodoAccess();
 	 _todos->load();
 	 }
 
+#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() );
        for( uint i=0; i<list.count(); i++ ){
      //  	qDebug("todo: %s",list[i].summary().latin1() );
                  if ( list[i].match( _search ) ){
 	//	 	qDebug("FOUND");
 			new TodoItem( this, new OTodo( list[i] ) );
                  }
 
-        }*/
+        }
+#endif
 
 }