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
@@ -37,15 +37,15 @@ QString ContactItem::toRichText()
 
 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();
 }
 
 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
@@ -36,28 +36,11 @@ void DatebookSearch::expand()
          if (!_dates){
          _dates = new ODateBookAccess();
          _dates->load();
          }
-#ifdef LIPBOPIE_SEARCH
         ORecordList<OEvent> results = _dates->matchRegexp(_search);
         setText(0, text(0) + " (" + QString::number( results.count() ) + ")" );
         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] ) );
-                 }
-
-        }
-#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
@@ -15,9 +15,8 @@
 
 #include "olistviewitem.h"
 
 #include <qregexp.h>
-#define LIPBOPIE_SEARCH
 
 /**
 @author Patrick S. Vogt
 */
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
@@ -41,14 +41,14 @@ QString TodoItem::toRichText()
 
 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();
 }
 
 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
@@ -13,16 +13,14 @@
 #include "todosearch.h"
 
 #include <opie/otodoaccess.h>
 #include <opie/otodo.h>
-#include <qdir.h>
 
 #include "todoitem.h"
 
 TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name)
 {
-        //_fileName = QDir::homeDirPath()+"/Applications/todolist/todolist.xml";
         _todos = 0;
 }
 
 
@@ -41,26 +39,13 @@ void TodoSearch::expand()
          _todos = new OTodoAccess();
          _todos->load();
          }
 
-#ifdef LIPBOPIE_SEARCH
         ORecordList<OTodo> results = _todos->matchRegexp(_search);
         setText(0, text(0) + " (" + QString::number( results.count() ) + ")");
         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
 
 }