author | harlekin <harlekin> | 2004-03-01 16:38:12 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2004-03-01 16:38:12 (UTC) |
commit | 49615014f281a58bd9bde5543692ffddab052755 (patch) (unidiff) | |
tree | fea29073a62a2217ce25976e492772f0636dce80 /core/pim | |
parent | 032f2d909293fb29e6c7e3cf9cce1a12484c80f7 (diff) | |
download | opie-49615014f281a58bd9bde5543692ffddab052755.zip opie-49615014f281a58bd9bde5543692ffddab052755.tar.gz opie-49615014f281a58bd9bde5543692ffddab052755.tar.bz2 |
osearch libopie1->libopie2
-rw-r--r-- | core/pim/osearch/adresssearch.cpp | 13 | ||||
-rw-r--r-- | core/pim/osearch/adresssearch.h | 8 | ||||
-rw-r--r-- | core/pim/osearch/applnkitem.cpp | 3 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 5 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.cpp | 7 | ||||
-rw-r--r-- | core/pim/osearch/contactitem.h | 9 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.cpp | 17 | ||||
-rw-r--r-- | core/pim/osearch/datebooksearch.h | 4 | ||||
-rw-r--r-- | core/pim/osearch/doclnkitem.cpp | 3 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 18 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.cpp | 10 | ||||
-rw-r--r-- | core/pim/osearch/eventitem.h | 8 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 38 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.h | 1 | ||||
-rw-r--r-- | core/pim/osearch/olistview.cpp | 5 | ||||
-rw-r--r-- | core/pim/osearch/osearch.pro | 2 | ||||
-rw-r--r-- | core/pim/osearch/resultitem.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/resultitem.h | 4 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 8 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.cpp | 16 | ||||
-rw-r--r-- | core/pim/osearch/todoitem.h | 9 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.cpp | 14 | ||||
-rw-r--r-- | core/pim/osearch/todosearch.h | 8 |
23 files changed, 121 insertions, 93 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp index 7681ea2..dbd6df6 100644 --- a/core/pim/osearch/adresssearch.cpp +++ b/core/pim/osearch/adresssearch.cpp | |||
@@ -12,12 +12,11 @@ | |||
12 | // | 12 | // |
13 | #include "adresssearch.h" | 13 | #include "adresssearch.h" |
14 | #include "contactitem.h" | ||
15 | |||
16 | #include <qpe/resource.h> | ||
14 | 17 | ||
15 | #include <qstring.h> | 18 | #include <qstring.h> |
16 | #include <qiconset.h> | 19 | #include <qiconset.h> |
17 | //#include <qwhatsthis.h> | 20 | //#include <qwhatsthis.h> |
18 | #include <qpe/resource.h> | ||
19 | #include <opie/ocontactaccess.h> | ||
20 | |||
21 | #include "contactitem.h" | ||
22 | 21 | ||
23 | AdressSearch::AdressSearch(QListView* parent, QString name): | 22 | AdressSearch::AdressSearch(QListView* parent, QString name): |
@@ -45,12 +44,12 @@ AdressSearch::~AdressSearch() | |||
45 | void AdressSearch::load() | 44 | void AdressSearch::load() |
46 | { | 45 | { |
47 | _contacts = new OContactAccess("osearch"); | 46 | _contacts = new OPimContactAccess("osearch"); |
48 | } | 47 | } |
49 | 48 | ||
50 | int AdressSearch::search() | 49 | int AdressSearch::search() |
51 | { | 50 | { |
52 | ORecordList<OContact> results = _contacts->matchRegexp(_search); | 51 | OPimRecordList<OPimContact> results = _contacts->matchRegexp(_search); |
53 | for (uint i = 0; i < results.count(); i++) { | 52 | for (uint i = 0; i < results.count(); i++) { |
54 | (void)new ContactItem( this, new OContact( results[i] )); | 53 | (void)new ContactItem( this, new OPimContact( results[i] )); |
55 | } | 54 | } |
56 | return results.count(); | 55 | return results.count(); |
diff --git a/core/pim/osearch/adresssearch.h b/core/pim/osearch/adresssearch.h index d5c7622..028521a 100644 --- a/core/pim/osearch/adresssearch.h +++ b/core/pim/osearch/adresssearch.h | |||
@@ -1,4 +1,2 @@ | |||
1 | // | ||
2 | // | ||
3 | // C++ Interface: $MODULE$ | 1 | // C++ Interface: $MODULE$ |
4 | // | 2 | // |
@@ -15,6 +13,8 @@ | |||
15 | 13 | ||
16 | #include "searchgroup.h" | 14 | #include "searchgroup.h" |
15 | #include <opie2/ocontactaccess.h> | ||
16 | |||
17 | using namespace Opie; | ||
17 | 18 | ||
18 | class OContactAccess; | ||
19 | 19 | ||
20 | /** | 20 | /** |
@@ -33,5 +33,5 @@ protected: | |||
33 | 33 | ||
34 | private: | 34 | private: |
35 | OContactAccess *_contacts; | 35 | OPimContactAccess *_contacts; |
36 | }; | 36 | }; |
37 | 37 | ||
diff --git a/core/pim/osearch/applnkitem.cpp b/core/pim/osearch/applnkitem.cpp index 2c4a4cb..06c2b1e 100644 --- a/core/pim/osearch/applnkitem.cpp +++ b/core/pim/osearch/applnkitem.cpp | |||
@@ -14,7 +14,8 @@ | |||
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qfileinfo.h> | ||
17 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
18 | 17 | ||
18 | #include <qfileinfo.h> | ||
19 | |||
19 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) | 20 | AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) |
20 | : ResultItem(parent) | 21 | : ResultItem(parent) |
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp index e8170c5..1c84d66 100644 --- a/core/pim/osearch/applnksearch.cpp +++ b/core/pim/osearch/applnksearch.cpp | |||
@@ -12,12 +12,11 @@ | |||
12 | // | 12 | // |
13 | #include "applnksearch.h" | 13 | #include "applnksearch.h" |
14 | #include "applnkitem.h" | ||
14 | 15 | ||
15 | #include <qpe/applnk.h> | 16 | #include <qpe/applnk.h> |
16 | #include <qpe/qpeapplication.h> | 17 | #include <qpe/qpeapplication.h> |
17 | #include <qiconset.h> | ||
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | 19 | ||
20 | #include "applnkitem.h" | 20 | #include <qiconset.h> |
21 | |||
22 | 21 | ||
23 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) | 22 | AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) |
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp index c4738ae..eedc374 100644 --- a/core/pim/osearch/contactitem.cpp +++ b/core/pim/osearch/contactitem.cpp | |||
@@ -13,10 +13,11 @@ | |||
13 | #include "contactitem.h" | 13 | #include "contactitem.h" |
14 | 14 | ||
15 | #include <qpixmap.h> | ||
16 | #include <opie/ocontact.h> | ||
17 | #include <qpe/resource.h> | 15 | #include <qpe/resource.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 16 | #include <qpe/qcopenvelope_qws.h> |
19 | 17 | ||
20 | ContactItem::ContactItem(OListViewItem* parent, OContact *contact) | 18 | #include <qpixmap.h> |
19 | |||
20 | |||
21 | ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact) | ||
21 | : ResultItem(parent) | 22 | : ResultItem(parent) |
22 | { | 23 | { |
diff --git a/core/pim/osearch/contactitem.h b/core/pim/osearch/contactitem.h index d6303e2..3c553fc 100644 --- a/core/pim/osearch/contactitem.h +++ b/core/pim/osearch/contactitem.h | |||
@@ -14,7 +14,10 @@ | |||
14 | #define CONTACTITEM_H | 14 | #define CONTACTITEM_H |
15 | 15 | ||
16 | #include <opie2/opimrecord.h> | ||
17 | #include <opie2/opimcontact.h> | ||
18 | |||
16 | #include "resultitem.h" | 19 | #include "resultitem.h" |
17 | 20 | ||
18 | class OContact; | 21 | using namespace Opie; |
19 | 22 | ||
20 | /** | 23 | /** |
@@ -24,5 +27,5 @@ class ContactItem : public ResultItem | |||
24 | { | 27 | { |
25 | public: | 28 | public: |
26 | ContactItem(OListViewItem* parent, OContact *contact); | 29 | ContactItem(OListViewItem* parent, OPimContact *contact); |
27 | 30 | ||
28 | ~ContactItem(); | 31 | ~ContactItem(); |
@@ -35,5 +38,5 @@ public: | |||
35 | private: | 38 | private: |
36 | void setIcon(); | 39 | void setIcon(); |
37 | OContact *_contact; | 40 | OPimContact *_contact; |
38 | 41 | ||
39 | }; | 42 | }; |
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp index 50c76e0..2b4660a 100644 --- a/core/pim/osearch/datebooksearch.cpp +++ b/core/pim/osearch/datebooksearch.cpp | |||
@@ -12,12 +12,13 @@ | |||
12 | // | 12 | // |
13 | #include "datebooksearch.h" | 13 | #include "datebooksearch.h" |
14 | |||
15 | #include "eventitem.h" | 14 | #include "eventitem.h" |
16 | 15 | ||
16 | #include <opie2/opimevent.h> | ||
17 | #include <opie2/opimrecurrence.h> | ||
18 | |||
19 | |||
17 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
18 | #include <qpe/config.h> | 21 | #include <qpe/config.h> |
19 | #include <opie/oevent.h> | 22 | |
20 | #include <opie/orecur.h> | ||
21 | #include <opie/odatebookaccess.h> | ||
22 | #include <qiconset.h> | 23 | #include <qiconset.h> |
23 | #include <qaction.h> | 24 | #include <qaction.h> |
@@ -25,4 +26,6 @@ | |||
25 | #include <qpopupmenu.h> | 26 | #include <qpopupmenu.h> |
26 | 27 | ||
28 | |||
29 | |||
27 | DatebookSearch::DatebookSearch(QListView* parent, QString name) | 30 | DatebookSearch::DatebookSearch(QListView* parent, QString name) |
28 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) | 31 | : SearchGroup(parent, name), _dates(0), _popupMenu(0) |
@@ -60,7 +63,7 @@ void DatebookSearch::load() | |||
60 | int DatebookSearch::search() | 63 | int DatebookSearch::search() |
61 | { | 64 | { |
62 | ORecordList<OEvent> results = _dates->matchRegexp(_search); | 65 | OPimRecordList<OPimEvent> results = _dates->matchRegexp(_search); |
63 | for (uint i = 0; i < results.count(); i++) | 66 | for (uint i = 0; i < results.count(); i++) |
64 | insertItem( new OEvent( results[i] ) ); | 67 | insertItem( new OPimEvent( results[i] ) ); |
65 | return _resultCount; | 68 | return _resultCount; |
66 | } | 69 | } |
@@ -68,5 +71,5 @@ int DatebookSearch::search() | |||
68 | void DatebookSearch::insertItem( void *rec ) | 71 | void DatebookSearch::insertItem( void *rec ) |
69 | { | 72 | { |
70 | OEvent *ev = (OEvent*)rec; | 73 | OPimEvent *ev = (OPimEvent*)rec; |
71 | if ( !actionShowPastEvents->isOn() && | 74 | if ( !actionShowPastEvents->isOn() && |
72 | ev->endDateTime() < QDateTime::currentDateTime() && | 75 | ev->endDateTime() < QDateTime::currentDateTime() && |
diff --git a/core/pim/osearch/datebooksearch.h b/core/pim/osearch/datebooksearch.h index a6d115e..2af727d 100644 --- a/core/pim/osearch/datebooksearch.h +++ b/core/pim/osearch/datebooksearch.h | |||
@@ -15,6 +15,8 @@ | |||
15 | 15 | ||
16 | #include "searchgroup.h" | 16 | #include "searchgroup.h" |
17 | #include <opie2/odatebookaccess.h> | ||
18 | |||
19 | using namespace Opie; | ||
17 | 20 | ||
18 | class ODateBookAccess; | ||
19 | class QAction; | 21 | class QAction; |
20 | 22 | ||
diff --git a/core/pim/osearch/doclnkitem.cpp b/core/pim/osearch/doclnkitem.cpp index 56eb26a..1516b8e 100644 --- a/core/pim/osearch/doclnkitem.cpp +++ b/core/pim/osearch/doclnkitem.cpp | |||
@@ -14,8 +14,9 @@ | |||
14 | 14 | ||
15 | #include <qpe/applnk.h> | 15 | #include <qpe/applnk.h> |
16 | #include <qpe/qcopenvelope_qws.h> | ||
17 | |||
16 | #include <qfile.h> | 18 | #include <qfile.h> |
17 | #include <qtextstream.h> | 19 | #include <qtextstream.h> |
18 | #include <qfileinfo.h> | 20 | #include <qfileinfo.h> |
19 | #include <qpe/qcopenvelope_qws.h> | ||
20 | 21 | ||
21 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) | 22 | DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) |
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp index b03dbd8..c73dcbf 100644 --- a/core/pim/osearch/doclnksearch.cpp +++ b/core/pim/osearch/doclnksearch.cpp | |||
@@ -12,4 +12,15 @@ | |||
12 | // | 12 | // |
13 | 13 | ||
14 | |||
15 | #include "doclnkitem.h" | ||
16 | #include "doclnksearch.h" | ||
17 | |||
18 | #include <opie2/owait.h> | ||
19 | |||
20 | #include <qpe/applnk.h> | ||
21 | #include <qpe/config.h> | ||
22 | #include <qpe/resource.h> | ||
23 | #include <qpe/qpeapplication.h> | ||
24 | |||
14 | #include <qaction.h> | 25 | #include <qaction.h> |
15 | #include <qfile.h> | 26 | #include <qfile.h> |
@@ -17,12 +28,5 @@ | |||
17 | #include <qpopupmenu.h> | 28 | #include <qpopupmenu.h> |
18 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
19 | #include <qpe/applnk.h> | ||
20 | #include <qpe/config.h> | ||
21 | #include <qpe/resource.h> | ||
22 | #include <qpe/qpeapplication.h> | ||
23 | #include <opie/owait.h> | ||
24 | 30 | ||
25 | #include "doclnkitem.h" | ||
26 | #include "doclnksearch.h" | ||
27 | 31 | ||
28 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) | 32 | DocLnkSearch::DocLnkSearch(QListView* parent, QString name) |
diff --git a/core/pim/osearch/eventitem.cpp b/core/pim/osearch/eventitem.cpp index 3228093..f6e34fe 100644 --- a/core/pim/osearch/eventitem.cpp +++ b/core/pim/osearch/eventitem.cpp | |||
@@ -13,12 +13,12 @@ | |||
13 | #include "eventitem.h" | 13 | #include "eventitem.h" |
14 | 14 | ||
15 | #include <qdatetime.h> | 15 | |
16 | #include <qpixmap.h> | ||
17 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
19 | //#include <qwhatsthis.h> | ||
20 | #include <opie/oevent.h> | ||
21 | 18 | ||
22 | EventItem::EventItem(OListViewItem* parent, OEvent *event) | 19 | #include <qdatetime.h> |
20 | #include <qpixmap.h> | ||
21 | |||
22 | EventItem::EventItem(OListViewItem* parent, OPimEvent *event) | ||
23 | : ResultItem(parent) | 23 | : ResultItem(parent) |
24 | { | 24 | { |
diff --git a/core/pim/osearch/eventitem.h b/core/pim/osearch/eventitem.h index 5f9c9fc..68923f1 100644 --- a/core/pim/osearch/eventitem.h +++ b/core/pim/osearch/eventitem.h | |||
@@ -16,5 +16,7 @@ | |||
16 | #include "resultitem.h" | 16 | #include "resultitem.h" |
17 | 17 | ||
18 | class OEvent; | 18 | #include <opie2/opimevent.h> |
19 | |||
20 | using namespace Opie; | ||
19 | 21 | ||
20 | /** | 22 | /** |
@@ -24,5 +26,5 @@ class EventItem : public ResultItem | |||
24 | { | 26 | { |
25 | public: | 27 | public: |
26 | EventItem(OListViewItem* parent, OEvent *event); | 28 | EventItem(OListViewItem* parent, OPimEvent *event); |
27 | 29 | ||
28 | ~EventItem(); | 30 | ~EventItem(); |
@@ -34,5 +36,5 @@ public: | |||
34 | private: | 36 | private: |
35 | void setIcon(); | 37 | void setIcon(); |
36 | OEvent *_event; | 38 | OPimEvent *_event; |
37 | 39 | ||
38 | }; | 40 | }; |
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 55302cb..95f5967 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -11,5 +11,25 @@ | |||
11 | 11 | ||
12 | 12 | ||
13 | #include "olistview.h" | ||
14 | #include "olistviewitem.h" | ||
15 | #include "resultitem.h" | ||
16 | #include "adresssearch.h" | ||
17 | #include "todosearch.h" | ||
18 | #include "datebooksearch.h" | ||
19 | #include "applnksearch.h" | ||
20 | #include "doclnksearch.h" | ||
21 | #include "mainwindow.h" | ||
22 | |||
23 | #include <opie2/owait.h> | ||
24 | |||
25 | #include <qpe/qpemessagebox.h> | ||
26 | #include <qpe/resource.h> | ||
27 | #include <qpe/config.h> | ||
28 | |||
29 | #include <qpe/qpeapplication.h> | ||
30 | #include <qpe/config.h> | ||
31 | #include <qpe/global.h> | ||
13 | 32 | ||
33 | #include <qtoolbar.h> | ||
14 | #include <qaction.h> | 34 | #include <qaction.h> |
15 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
@@ -30,22 +50,6 @@ | |||
30 | #include <qwhatsthis.h> | 50 | #include <qwhatsthis.h> |
31 | #include <qmenubar.h> | 51 | #include <qmenubar.h> |
32 | #include <qpe/qpemessagebox.h> | ||
33 | #include <qpe/resource.h> | ||
34 | #include <qpe/config.h> | ||
35 | #include <qtoolbar.h> | ||
36 | #include <qpe/qpeapplication.h> | ||
37 | #include <qpe/config.h> | ||
38 | #include <qpe/global.h> | ||
39 | #include <opie/owait.h> | ||
40 | 52 | ||
41 | #include "olistview.h" | 53 | |
42 | #include "olistviewitem.h" | ||
43 | #include "resultitem.h" | ||
44 | #include "adresssearch.h" | ||
45 | #include "todosearch.h" | ||
46 | #include "datebooksearch.h" | ||
47 | #include "applnksearch.h" | ||
48 | #include "doclnksearch.h" | ||
49 | #include "mainwindow.h" | ||
50 | 54 | ||
51 | static const char* const image1_data[] = { | 55 | static const char* const image1_data[] = { |
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h index 9886053..bf3081f 100644 --- a/core/pim/osearch/mainwindow.h +++ b/core/pim/osearch/mainwindow.h | |||
@@ -17,5 +17,4 @@ | |||
17 | #include <qaction.h> | 17 | #include <qaction.h> |
18 | #include <qlist.h> | 18 | #include <qlist.h> |
19 | |||
20 | #include <qmap.h> | 19 | #include <qmap.h> |
21 | #include <qtimer.h> | 20 | #include <qtimer.h> |
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp index e678d63..7a7cb26 100644 --- a/core/pim/osearch/olistview.cpp +++ b/core/pim/osearch/olistview.cpp | |||
@@ -11,7 +11,10 @@ | |||
11 | #include "olistview.h" | 11 | #include "olistview.h" |
12 | #include "olistviewitem.h" | 12 | #include "olistviewitem.h" |
13 | #include <qmessagebox.h> | 13 | |
14 | #include <qpe/qpeapplication.h> | 14 | #include <qpe/qpeapplication.h> |
15 | 15 | ||
16 | #include <qmessagebox.h> | ||
17 | |||
18 | |||
16 | OListView::OListView(QWidget *parent, const char *name ) | 19 | OListView::OListView(QWidget *parent, const char *name ) |
17 | : QListView(parent,name) | 20 | : QListView(parent,name) |
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro index c988f48..7412de9 100644 --- a/core/pim/osearch/osearch.pro +++ b/core/pim/osearch/osearch.pro | |||
@@ -36,4 +36,4 @@ TARGET = osearch | |||
36 | INCLUDEPATH = $(OPIEDIR)/include | 36 | INCLUDEPATH = $(OPIEDIR)/include |
37 | DEPENDPATH += $(OPIEDIR)/include | 37 | DEPENDPATH += $(OPIEDIR)/include |
38 | LIBS += -lqpe -lopie | 38 | LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2 |
39 | include ( $(OPIEDIR)/include.pro ) | 39 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/core/pim/osearch/resultitem.cpp b/core/pim/osearch/resultitem.cpp index 2c1e95a..f051b12 100644 --- a/core/pim/osearch/resultitem.cpp +++ b/core/pim/osearch/resultitem.cpp | |||
@@ -13,8 +13,6 @@ | |||
13 | #include "resultitem.h" | 13 | #include "resultitem.h" |
14 | 14 | ||
15 | #include <qmessagebox.h> | ||
16 | |||
17 | #include <opie/otodo.h> | ||
18 | 15 | ||
16 | #include <qmessagebox.h> | ||
19 | 17 | ||
20 | ResultItem::ResultItem(OListViewItem* parent) | 18 | ResultItem::ResultItem(OListViewItem* parent) |
diff --git a/core/pim/osearch/resultitem.h b/core/pim/osearch/resultitem.h index 9e87f99..1c14e8f 100644 --- a/core/pim/osearch/resultitem.h +++ b/core/pim/osearch/resultitem.h | |||
@@ -14,8 +14,8 @@ | |||
14 | #define RESULTITEM_H | 14 | #define RESULTITEM_H |
15 | 15 | ||
16 | #include <qintdict.h> | ||
17 | |||
18 | #include "olistviewitem.h" | 16 | #include "olistviewitem.h" |
19 | 17 | ||
18 | #include <qintdict.h> | ||
19 | |||
20 | /** | 20 | /** |
21 | @author Patrick S. Vogt | 21 | @author Patrick S. Vogt |
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp index 0b58176..5377b9f 100644 --- a/core/pim/osearch/searchgroup.cpp +++ b/core/pim/osearch/searchgroup.cpp | |||
@@ -11,12 +11,12 @@ | |||
11 | // | 11 | // |
12 | // | 12 | // |
13 | #include "olistviewitem.h" | ||
14 | #include "searchgroup.h" | ||
15 | |||
16 | #include <opie2/owait.h> | ||
13 | 17 | ||
14 | #include <qobject.h> | 18 | #include <qobject.h> |
15 | #include <qregexp.h> | 19 | #include <qregexp.h> |
16 | #include <qapplication.h> | 20 | #include <qapplication.h> |
17 | #include <opie/owait.h> | ||
18 | |||
19 | #include "olistviewitem.h" | ||
20 | #include "searchgroup.h" | ||
21 | 21 | ||
22 | #ifndef NEW_OWAIT | 22 | #ifndef NEW_OWAIT |
diff --git a/core/pim/osearch/todoitem.cpp b/core/pim/osearch/todoitem.cpp index 9808a04..c20f1fd 100644 --- a/core/pim/osearch/todoitem.cpp +++ b/core/pim/osearch/todoitem.cpp | |||
@@ -13,10 +13,12 @@ | |||
13 | #include "todoitem.h" | 13 | #include "todoitem.h" |
14 | 14 | ||
15 | #include <opie/otodo.h> | 15 | |
16 | #include <qpixmap.h> | ||
17 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
18 | #include <qpe/qcopenvelope_qws.h> | 17 | #include <qpe/qcopenvelope_qws.h> |
19 | 18 | ||
20 | TodoItem::TodoItem(OListViewItem* parent, OTodo *todo) | 19 | #include <qpixmap.h> |
20 | |||
21 | |||
22 | TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo) | ||
21 | : ResultItem(parent) | 23 | : ResultItem(parent) |
22 | { | 24 | { |
@@ -62,14 +64,14 @@ void TodoItem::setIcon() | |||
62 | icon = Resource::loadPixmap( "reset" ); | 64 | icon = Resource::loadPixmap( "reset" ); |
63 | break; | 65 | break; |
64 | case OTodo::Description: | 66 | case OPimTodo::Description: |
65 | icon = Resource::loadPixmap( "txt" ); | 67 | icon = Resource::loadPixmap( "txt" ); |
66 | break; | 68 | break; |
67 | case OTodo::Summary: | 69 | case OPimTodo::Summary: |
68 | icon = Resource::loadPixmap( "osearch/summary" ); | 70 | icon = Resource::loadPixmap( "osearch/summary" ); |
69 | break; | 71 | break; |
70 | case OTodo::Priority: | 72 | case OPimTodo::Priority: |
71 | icon = Resource::loadPixmap( "todo/priority1" ); | 73 | icon = Resource::loadPixmap( "todo/priority1" ); |
72 | break; | 74 | break; |
73 | case OTodo::HasDate: | 75 | case OPimTodo::HasDate: |
74 | icon = Resource::loadPixmap( "osearch/clock" ); | 76 | icon = Resource::loadPixmap( "osearch/clock" ); |
75 | break; | 77 | break; |
diff --git a/core/pim/osearch/todoitem.h b/core/pim/osearch/todoitem.h index cc78e57..7c8537b 100644 --- a/core/pim/osearch/todoitem.h +++ b/core/pim/osearch/todoitem.h | |||
@@ -14,6 +14,9 @@ | |||
14 | #define TODOITEM_H | 14 | #define TODOITEM_H |
15 | 15 | ||
16 | |||
17 | #include <opie2/opimtodo.h> | ||
16 | #include "resultitem.h" | 18 | #include "resultitem.h" |
17 | class OTodo; | 19 | |
20 | using namespace Opie; | ||
18 | 21 | ||
19 | /** | 22 | /** |
@@ -23,5 +26,5 @@ class TodoItem : public ResultItem | |||
23 | { | 26 | { |
24 | public: | 27 | public: |
25 | TodoItem(OListViewItem* parent, OTodo *todo); | 28 | TodoItem(OListViewItem* parent, OPimTodo *todo); |
26 | ~TodoItem(); | 29 | ~TodoItem(); |
27 | 30 | ||
@@ -32,5 +35,5 @@ public: | |||
32 | private: | 35 | private: |
33 | void setIcon(); | 36 | void setIcon(); |
34 | OTodo *_todo; | 37 | OPimTodo *_todo; |
35 | 38 | ||
36 | }; | 39 | }; |
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp index 8de875e..5042803 100644 --- a/core/pim/osearch/todosearch.cpp +++ b/core/pim/osearch/todosearch.cpp | |||
@@ -12,13 +12,13 @@ | |||
12 | // | 12 | // |
13 | #include "todosearch.h" | 13 | #include "todosearch.h" |
14 | #include "todoitem.h" | ||
14 | 15 | ||
15 | #include <opie/otodoaccess.h> | ||
16 | #include <opie/otodo.h> | ||
17 | #include <qpe/resource.h> | 16 | #include <qpe/resource.h> |
18 | #include <qpe/config.h> | 17 | #include <qpe/config.h> |
18 | |||
19 | #include <qiconset.h> | 19 | #include <qiconset.h> |
20 | #include <qaction.h> | 20 | #include <qaction.h> |
21 | #include <qpopupmenu.h> | 21 | #include <qpopupmenu.h> |
22 | #include "todoitem.h" | 22 | |
23 | 23 | ||
24 | TodoSearch::TodoSearch(QListView* parent, QString name) | 24 | TodoSearch::TodoSearch(QListView* parent, QString name) |
@@ -50,5 +50,5 @@ TodoSearch::~TodoSearch() | |||
50 | void TodoSearch::load() | 50 | void TodoSearch::load() |
51 | { | 51 | { |
52 | _todos = new OTodoAccess(); | 52 | _todos = new OPimTodoAccess(); |
53 | _todos->load(); | 53 | _todos->load(); |
54 | } | 54 | } |
@@ -56,7 +56,7 @@ void TodoSearch::load() | |||
56 | int TodoSearch::search() | 56 | int TodoSearch::search() |
57 | { | 57 | { |
58 | ORecordList<OTodo> results = _todos->matchRegexp(_search); | 58 | OPimRecordList<OPimTodo> results = _todos->matchRegexp(_search); |
59 | for (uint i = 0; i < results.count(); i++) | 59 | for (uint i = 0; i < results.count(); i++) |
60 | insertItem( new OTodo( results[i] )); | 60 | insertItem( new OPimTodo( results[i] )); |
61 | return _resultCount; | 61 | return _resultCount; |
62 | } | 62 | } |
@@ -64,5 +64,5 @@ int TodoSearch::search() | |||
64 | void TodoSearch::insertItem( void *rec ) | 64 | void TodoSearch::insertItem( void *rec ) |
65 | { | 65 | { |
66 | OTodo *todo = (OTodo*)rec; | 66 | OPimTodo *todo = (OPimTodo*)rec; |
67 | if (!actionShowCompleted->isOn() && | 67 | if (!actionShowCompleted->isOn() && |
68 | todo->isCompleted() ) return; | 68 | todo->isCompleted() ) return; |
diff --git a/core/pim/osearch/todosearch.h b/core/pim/osearch/todosearch.h index ee175da..740e483 100644 --- a/core/pim/osearch/todosearch.h +++ b/core/pim/osearch/todosearch.h | |||
@@ -16,7 +16,11 @@ | |||
16 | #include "searchgroup.h" | 16 | #include "searchgroup.h" |
17 | 17 | ||
18 | class OTodoAccess; | 18 | #include <opie2/otodoaccess.h> |
19 | #include <opie2/opimtodo.h> | ||
20 | |||
19 | class QAction; | 21 | class QAction; |
20 | 22 | ||
23 | using namespace Opie; | ||
24 | |||
21 | /** | 25 | /** |
22 | @author Patrick S. Vogt | 26 | @author Patrick S. Vogt |
@@ -36,5 +40,5 @@ protected: | |||
36 | 40 | ||
37 | private: | 41 | private: |
38 | OTodoAccess *_todos; | 42 | OPimTodoAccess *_todos; |
39 | QAction *actionShowCompleted; | 43 | QAction *actionShowCompleted; |
40 | QPopupMenu *_popupMenu; | 44 | QPopupMenu *_popupMenu; |