summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/contactitem.cpp4
-rw-r--r--core/pim/osearch/datebooksearch.cpp17
-rw-r--r--core/pim/osearch/searchgroup.h1
-rw-r--r--core/pim/osearch/todoitem.cpp6
-rw-r--r--core/pim/osearch/todosearch.cpp15
5 files changed, 5 insertions, 38 deletions
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 29d81be..788a415 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -40,3 +40,3 @@ void ContactItem::editItem()
QCopEnvelope e("QPE/Application/addressbook", "edit(int)");
-// QCopEnvelope e("QPE/Addressbook", "editEvent(int)");
+// QCopEnvelope e("QPE/Addressbook", "edit(int)");
e << _contact->uid();
@@ -47,3 +47,3 @@ void ContactItem::showItem()
QCopEnvelope e("QPE/Application/addressbook", "show(int)");
-// QCopEnvelope e("QPE/Addressbook", "viewDefault(QDate)");
+// QCopEnvelope e("QPE/Addressbook", "show(int)");
e << _contact->uid();
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 0590252..83b99f5 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -39,3 +39,2 @@ void DatebookSearch::expand()
}
-#ifdef LIPBOPIE_SEARCH
ORecordList<OEvent> results = _dates->matchRegexp(_search);
@@ -45,18 +44,2 @@ void DatebookSearch::expand()
}
-#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] ) );
- }
-
- }
-#endif
}
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index 4195e6f..d26ff17 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -18,3 +18,2 @@
#include <qregexp.h>
-#define LIPBOPIE_SEARCH
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp
index 4ea4586..145b423 100644
--- a/core/pim/osearch/todoitem.cpp
+++ b/core/pim/osearch/todoitem.cpp
@@ -44,4 +44,3 @@ void TodoItem::showItem()
// QCopEnvelope e("QPE/Todolist", "show(int)");
- qDebug("calling todolist for %i",_todo->uid());
- QCopEnvelope e("QPE/Todolist", "show(int)");
+ QCopEnvelope e("QPE/Application/todolist", "show(int)");
e << _todo->uid();
@@ -51,3 +50,4 @@ void TodoItem::editItem()
{
- QCopEnvelope e("QPE/Todolist", "edit(int)");
+// QCopEnvelope e("QPE/Todolist", "edit(int)");
+ QCopEnvelope e("QPE/Application/todolist", "edit(int)");
e << _todo->uid();
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index fba8aa0..cbe356b 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -16,3 +16,2 @@
#include <opie/otodo.h>
-#include <qdir.h>
@@ -23,3 +22,2 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
{
- //_fileName = QDir::homeDirPath()+"/Applications/todolist/todolist.xml";
_todos = 0;
@@ -44,3 +42,2 @@ void TodoSearch::expand()
-#ifdef LIPBOPIE_SEARCH
ORecordList<OTodo> results = _todos->matchRegexp(_search);
@@ -50,14 +47,2 @@ void TodoSearch::expand()
}
-#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