author | tille <tille> | 2003-05-09 12:01:20 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-09 12:01:20 (UTC) |
commit | d371c94c81f9f0e961aa7e47a27c323215709e8a (patch) (unidiff) | |
tree | 3ad54515f41a9bbb78327cb8ce6e93bab99ff1bf /core/pim | |
parent | 7183dce01fa07a905d259cb79a8792ca993a75f6 (diff) | |
download | opie-d371c94c81f9f0e961aa7e47a27c323215709e8a.zip opie-d371c94c81f9f0e961aa7e47a27c323215709e8a.tar.gz opie-d371c94c81f9f0e961aa7e47a27c323215709e8a.tar.bz2 |
counting results now
-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 2 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 1 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.h | 3 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index c5b1ae7..0ee8eba 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp | |||
@@ -8,16 +8,17 @@ | |||
8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 | 8 | // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 |
9 | // | 9 | // |
10 | // Copyright: See COPYING file that comes with this distribution | 10 | // Copyright: See COPYING file that comes with this distribution |
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "adresssearch.h" | 13 | #include "adresssearch.h" |
14 | 14 | ||
15 | #include <opie/ocontactaccess.h> | 15 | #include <opie/ocontactaccess.h> |
16 | #include <qstring.h> | ||
16 | 17 | ||
17 | #include "contactitem.h" | 18 | #include "contactitem.h" |
18 | //#include <qdir.h> | 19 | //#include <qdir.h> |
19 | 20 | ||
20 | AdressSearch::AdressSearch(QListView* parent, QString name): | 21 | AdressSearch::AdressSearch(QListView* parent, QString name): |
21 | SearchGroup(parent, name) | 22 | SearchGroup(parent, name) |
22 | { | 23 | { |
23 | _contacts = 0; | 24 | _contacts = 0; |
@@ -31,13 +32,14 @@ AdressSearch::~AdressSearch() | |||
31 | 32 | ||
32 | 33 | ||
33 | void AdressSearch::expand() | 34 | void AdressSearch::expand() |
34 | { | 35 | { |
35 | SearchGroup::expand(); | 36 | SearchGroup::expand(); |
36 | if (_search.isEmpty()) return; | 37 | if (_search.isEmpty()) return; |
37 | if (!_contacts) _contacts = new OContactAccess("osearch"); | 38 | if (!_contacts) _contacts = new OContactAccess("osearch"); |
38 | ORecordList<OContact> results = _contacts->matchRegexp(_search); | 39 | ORecordList<OContact> results = _contacts->matchRegexp(_search); |
40 | setText(0, text(0) + " (" + QString::number( results.count() ) + ")" ); | ||
39 | for (uint i = 0; i < results.count(); i++) { | 41 | for (uint i = 0; i < results.count(); i++) { |
40 | new ContactItem( this, new OContact( results[i] )); | 42 | new ContactItem( this, new OContact( results[i] )); |
41 | } | 43 | } |
42 | } | 44 | } |
43 | 45 | ||
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 8f9d472..0590252 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -34,16 +34,17 @@ void DatebookSearch::expand() | |||
34 | { | 34 | { |
35 | SearchGroup::expand(); | 35 | SearchGroup::expand(); |
36 | if (!_dates){ | 36 | if (!_dates){ |
37 | _dates = new ODateBookAccess(); | 37 | _dates = new ODateBookAccess(); |
38 | _dates->load(); | 38 | _dates->load(); |
39 | } | 39 | } |
40 | #ifdef LIPBOPIE_SEARCH | 40 | #ifdef LIPBOPIE_SEARCH |
41 | ORecordList<OEvent> results = _dates->matchRegexp(_search); | 41 | ORecordList<OEvent> results = _dates->matchRegexp(_search); |
42 | setText(0, text(0) + " (" + QString::number( results.count() ) + ")" ); | ||
42 | for (uint i = 0; i < results.count(); i++) { | 43 | for (uint i = 0; i < results.count(); i++) { |
43 | new EventItem( this, new OEvent( results[i] )); | 44 | new EventItem( this, new OEvent( results[i] )); |
44 | } | 45 | } |
45 | #else | 46 | #else |
46 | ORecordList<OEvent> list = _dates->allRecords(); | 47 | ORecordList<OEvent> list = _dates->allRecords(); |
47 | QArray<int> m_currentQuery( list.count() ); | 48 | QArray<int> m_currentQuery( list.count() ); |
48 | for( uint i=0; i<list.count(); i++ ){ | 49 | for( uint i=0; i<list.count(); i++ ){ |
49 | //qDebug("datebook: %s",list[i].description().latin1() ); | 50 | //qDebug("datebook: %s",list[i].description().latin1() ); |
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h index 6b6bbf5..4195e6f 100644 --- a/core/pim/osearch/searchgroup.h +++ b/core/pim/osearch/searchgroup.h | |||
@@ -11,18 +11,17 @@ | |||
11 | // | 11 | // |
12 | // | 12 | // |
13 | #ifndef SEARCHGROUP_H | 13 | #ifndef SEARCHGROUP_H |
14 | #define SEARCHGROUP_H | 14 | #define SEARCHGROUP_H |
15 | 15 | ||
16 | #include "olistviewitem.h" | 16 | #include "olistviewitem.h" |
17 | 17 | ||
18 | #include <qregexp.h> | 18 | #include <qregexp.h> |
19 | 19 | #define LIPBOPIE_SEARCH | |
20 | //#define LIPBOPIE_SEARCH | ||
21 | 20 | ||
22 | /** | 21 | /** |
23 | @author Patrick S. Vogt | 22 | @author Patrick S. Vogt |
24 | */ | 23 | */ |
25 | class SearchGroup : public OListViewItem | 24 | class SearchGroup : public OListViewItem |
26 | { | 25 | { |
27 | public: | 26 | public: |
28 | SearchGroup(QListView* parent, QString name); | 27 | SearchGroup(QListView* parent, QString name); |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 9a22ee1..fba8aa0 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -39,16 +39,17 @@ void TodoSearch::expand() | |||
39 | 39 | ||
40 | if (!_todos){ | 40 | if (!_todos){ |
41 | _todos = new OTodoAccess(); | 41 | _todos = new OTodoAccess(); |
42 | _todos->load(); | 42 | _todos->load(); |
43 | } | 43 | } |
44 | 44 | ||
45 | #ifdef LIPBOPIE_SEARCH | 45 | #ifdef LIPBOPIE_SEARCH |
46 | ORecordList<OTodo> results = _todos->matchRegexp(_search); | 46 | ORecordList<OTodo> results = _todos->matchRegexp(_search); |
47 | setText(0, text(0) + " (" + QString::number( results.count() ) + ")"); | ||
47 | for (uint i = 0; i < results.count(); i++) { | 48 | for (uint i = 0; i < results.count(); i++) { |
48 | new TodoItem( this, new OTodo( results[i] )); | 49 | new TodoItem( this, new OTodo( results[i] )); |
49 | } | 50 | } |
50 | #else | 51 | #else |
51 | ORecordList<OTodo> list = _todos->allRecords(); | 52 | ORecordList<OTodo> list = _todos->allRecords(); |
52 | QArray<int> m_currentQuery( list.count() ); | 53 | QArray<int> m_currentQuery( list.count() ); |
53 | for( uint i=0; i<list.count(); i++ ){ | 54 | for( uint i=0; i<list.count(); i++ ){ |
54 | // qDebug("todo: %s",list[i].summary().latin1() ); | 55 | // qDebug("todo: %s",list[i].summary().latin1() ); |