summaryrefslogtreecommitdiff
authortille <tille>2003-05-10 12:37:35 (UTC)
committer tille <tille>2003-05-10 12:37:35 (UTC)
commit882b5190d02c33aa8c893e8aa54bf3d38ac255c8 (patch) (side-by-side diff)
treec79bf2a664d780013b685dd9617829cecdea3561
parent65efa1e8a846f92580155d6ce7e28fe9b7ae19d2 (diff)
downloadopie-882b5190d02c33aa8c893e8aa54bf3d38ac255c8.zip
opie-882b5190d02c33aa8c893e8aa54bf3d38ac255c8.tar.gz
opie-882b5190d02c33aa8c893e8aa54bf3d38ac255c8.tar.bz2
clean up
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
@@ -38,14 +38,14 @@ 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
@@ -37,27 +37,10 @@ void DatebookSearch::expand()
_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
@@ -16,7 +16,6 @@
#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
@@ -42,13 +42,13 @@ 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
@@ -14,14 +14,12 @@
#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;
}
@@ -42,24 +40,11 @@ void TodoSearch::expand()
_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
}