summaryrefslogtreecommitdiff
authortille <tille>2003-05-08 13:22:51 (UTC)
committer tille <tille>2003-05-08 13:22:51 (UTC)
commit08f9d5965b127b0b889b96cf16b7d34b5a9a6928 (patch) (side-by-side diff)
tree7d17bfff623ba6cfb105ae9144e51378a71de040
parent763d7d7da84682fb87a631a997e93c08f5abde61 (diff)
downloadopie-08f9d5965b127b0b889b96cf16b7d34b5a9a6928.zip
opie-08f9d5965b127b0b889b96cf16b7d34b5a9a6928.tar.gz
opie-08f9d5965b127b0b889b96cf16b7d34b5a9a6928.tar.bz2
now it 'works' with the current libopie, again
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/datebooksearch.cpp3
-rw-r--r--core/pim/osearch/osearch.pro5
-rw-r--r--core/pim/osearch/searchgroup.h2
-rw-r--r--core/pim/osearch/todosearch.cpp6
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
}