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
@@ -24,35 +24,34 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
 }
 
 
 DatebookSearch::~DatebookSearch()
 {
 	delete _dates;
 }
 
 
 void DatebookSearch::expand()
 {
 	SearchGroup::expand();
  	if (!_dates){
 	 _dates = new ODateBookAccess();
 	 _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] ));
 	}
 #else
 	ORecordList<OEvent> list = _dates->allRecords();
        QArray<int> m_currentQuery( list.count() );
        for( uint i=0; i<list.count(); i++ ){
 	//qDebug("datebook: %s",list[i].description().latin1() );
                  if (
 		 	( list[i].description().contains( _search )  ) ||
 		 	( list[i].note().contains( _search )  ) ||
 		 	( list[i].location().contains( _search )  )
 		 ){
 		 	//qDebug("FOUND");
 			new EventItem( this, new OEvent( list[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,21 +1,16 @@
-# 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
 DESTDIR = $(OPIEDIR)/bin
 TARGET = osearch
 INCLUDEPATH = $(OPIEDIR)/include
 SOURCES += main.cpp \
            mainwindow.cpp \
            olistview.cpp \
            olistviewitem.cpp \
            adresssearch.cpp \
            todosearch.cpp \
            datebooksearch.cpp \
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
@@ -4,32 +4,34 @@
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef SEARCHGROUP_H
 #define SEARCHGROUP_H
 
 #include "olistviewitem.h"
 
 #include <qregexp.h>
 
+//#define LIPBOPIE_SEARCH
+
 /**
 @author Patrick S. Vogt
 */
 class SearchGroup : public OListViewItem
 {
 public:
     SearchGroup(QListView* parent, QString name);
 
     ~SearchGroup();
 
     virtual void expand();
     virtual void setSearch(QString);
     virtual void setSearch(QRegExp);
     virtual int rtti() { return Searchgroup;}
 
 protected:
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
@@ -29,35 +29,37 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
 TodoSearch::~TodoSearch()
 {
 	delete _todos;
 }
 
 
 void TodoSearch::expand()
 {
 	SearchGroup::expand();
 	if (_search.isEmpty()) return;
 
 	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
 
 }