summaryrefslogtreecommitdiff
authorharlekin <harlekin>2004-03-01 16:38:12 (UTC)
committer harlekin <harlekin>2004-03-01 16:38:12 (UTC)
commit49615014f281a58bd9bde5543692ffddab052755 (patch) (unidiff)
treefea29073a62a2217ce25976e492772f0636dce80
parent032f2d909293fb29e6c7e3cf9cce1a12484c80f7 (diff)
downloadopie-49615014f281a58bd9bde5543692ffddab052755.zip
opie-49615014f281a58bd9bde5543692ffddab052755.tar.gz
opie-49615014f281a58bd9bde5543692ffddab052755.tar.bz2
osearch libopie1->libopie2
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp19
-rw-r--r--core/pim/osearch/adresssearch.h8
-rw-r--r--core/pim/osearch/applnkitem.cpp3
-rw-r--r--core/pim/osearch/applnksearch.cpp13
-rw-r--r--core/pim/osearch/contactitem.cpp7
-rw-r--r--core/pim/osearch/contactitem.h9
-rw-r--r--core/pim/osearch/datebooksearch.cpp19
-rw-r--r--core/pim/osearch/datebooksearch.h4
-rw-r--r--core/pim/osearch/doclnkitem.cpp3
-rw-r--r--core/pim/osearch/doclnksearch.cpp18
-rw-r--r--core/pim/osearch/eventitem.cpp10
-rw-r--r--core/pim/osearch/eventitem.h8
-rw-r--r--core/pim/osearch/mainwindow.cpp50
-rw-r--r--core/pim/osearch/mainwindow.h1
-rw-r--r--core/pim/osearch/olistview.cpp9
-rw-r--r--core/pim/osearch/osearch.pro2
-rw-r--r--core/pim/osearch/resultitem.cpp4
-rw-r--r--core/pim/osearch/resultitem.h4
-rw-r--r--core/pim/osearch/searchgroup.cpp8
-rw-r--r--core/pim/osearch/todoitem.cpp16
-rw-r--r--core/pim/osearch/todoitem.h9
-rw-r--r--core/pim/osearch/todosearch.cpp14
-rw-r--r--core/pim/osearch/todosearch.h8
23 files changed, 137 insertions, 109 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
@@ -11,23 +11,22 @@
11// 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
23AdressSearch::AdressSearch(QListView* parent, QString name): 22AdressSearch::AdressSearch(QListView* parent, QString name):
24 SearchGroup(parent, name) 23 SearchGroup(parent, name)
25{ 24{
26 _contacts = 0; 25 _contacts = 0;
27 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" ); 26 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
28 setPixmap( 0, is.pixmap( QIconSet::Large, true ) ); 27 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
29 28
30 29
31 //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); 30 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
32 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" ); 31 /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
33 QImage img = pix.convertToImage(); 32 QImage img = pix.convertToImage();
@@ -44,14 +43,14 @@ AdressSearch::~AdressSearch()
44 43
45void AdressSearch::load() 44void AdressSearch::load()
46{ 45{
47 _contacts = new OContactAccess("osearch"); 46 _contacts = new OPimContactAccess("osearch");
48} 47}
49 48
50int AdressSearch::search() 49int 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();
57} 56}
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,5 +1,3 @@
1//
2//
3// C++ Interface: $MODULE$ 1// C++ Interface: $MODULE$
4// 2//
5// Description: 3// Description:
@@ -14,8 +12,10 @@
14#define ADRESSSEARCH_H 12#define ADRESSSEARCH_H
15 13
16#include "searchgroup.h" 14#include "searchgroup.h"
15#include <opie2/ocontactaccess.h>
16
17using namespace Opie;
17 18
18class OContactAccess;
19 19
20/** 20/**
21@author Patrick S. Vogt 21@author Patrick S. Vogt
@@ -32,7 +32,7 @@ protected:
32 virtual void insertItem( void* ); 32 virtual void insertItem( void* );
33 33
34private: 34private:
35 OContactAccess *_contacts; 35 OPimContactAccess *_contacts;
36}; 36};
37 37
38#endif 38#endif
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
@@ -13,9 +13,10 @@
13#include "applnkitem.h" 13#include "applnkitem.h"
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
19AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app) 20AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
20 : ResultItem(parent) 21 : ResultItem(parent)
21{ 22{
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
@@ -11,14 +11,13 @@
11// 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
23AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) 22AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
24{ 23{
@@ -43,16 +42,16 @@ void AppLnkSearch::load()
43int AppLnkSearch::search() 42int AppLnkSearch::search()
44{ 43{
45 QList<AppLnk> appList = _apps->children(); 44 QList<AppLnk> appList = _apps->children();
46 45
47 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){ 46 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
48 if ( (_search.match( app->name() ) != -1) 47 if ( (_search.match( app->name() ) != -1)
49 || (_search.match(app->comment()) != -1) 48 || (_search.match(app->comment()) != -1)
50 || (_search.match(app->exec()) != -1) ) { 49 || (_search.match(app->exec()) != -1) ) {
51 insertItem( app ); 50 insertItem( app );
52 }else 51 }else
53 if (searchFile( app )) 52 if (searchFile( app ))
54 insertItem( app ); 53 insertItem( app );
55 qApp->processEvents( 100 ); 54 qApp->processEvents( 100 );
56 } 55 }
57 return _resultCount; 56 return _resultCount;
58} 57}
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
@@ -12,12 +12,13 @@
12// 12//
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
20ContactItem::ContactItem(OListViewItem* parent, OContact *contact) 18#include <qpixmap.h>
19
20
21ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
21: ResultItem(parent) 22: ResultItem(parent)
22{ 23{
23 _contact = contact; 24 _contact = contact;
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
@@ -13,9 +13,12 @@
13#ifndef CONTACTITEM_H 13#ifndef CONTACTITEM_H
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
18class OContact; 21using namespace Opie;
19 22
20/** 23/**
21@author Patrick S. Vogt 24@author Patrick S. Vogt
@@ -23,7 +26,7 @@ class OContact;
23class ContactItem : public ResultItem 26class ContactItem : public ResultItem
24{ 27{
25public: 28public:
26 ContactItem(OListViewItem* parent, OContact *contact); 29 ContactItem(OListViewItem* parent, OPimContact *contact);
27 30
28 ~ContactItem(); 31 ~ContactItem();
29 32
@@ -34,7 +37,7 @@ public:
34 37
35private: 38private:
36 void setIcon(); 39 void setIcon();
37 OContact *_contact; 40 OPimContact *_contact;
38 41
39}; 42};
40 43
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
@@ -2,7 +2,7 @@
2// 2//
3// C++ Implementation: $MODULE$ 3// C++ Implementation: $MODULE$
4// 4//
5// Description: 5// Description:
6// 6//
7// 7//
8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003 8// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
@@ -11,19 +11,22 @@
11// 11//
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>
24#include <qdatetime.h> 25#include <qdatetime.h>
25#include <qpopupmenu.h> 26#include <qpopupmenu.h>
26 27
28
29
27DatebookSearch::DatebookSearch(QListView* parent, QString name) 30DatebookSearch::DatebookSearch(QListView* parent, QString name)
28: SearchGroup(parent, name), _dates(0), _popupMenu(0) 31: SearchGroup(parent, name), _dates(0), _popupMenu(0)
29{ 32{
@@ -59,15 +62,15 @@ void DatebookSearch::load()
59 62
60int DatebookSearch::search() 63int 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}
67 70
68void DatebookSearch::insertItem( void *rec ) 71void 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() &&
73 !ev->recurrence().doesRecur() 76 !ev->recurrence().doesRecur()
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
@@ -14,8 +14,10 @@
14#define DATEBOOKSEARCH_H 14#define DATEBOOKSEARCH_H
15 15
16#include "searchgroup.h" 16#include "searchgroup.h"
17#include <opie2/odatebookaccess.h>
18
19using namespace Opie;
17 20
18class ODateBookAccess;
19class QAction; 21class QAction;
20 22
21/** 23/**
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
@@ -13,10 +13,11 @@
13#include "doclnkitem.h" 13#include "doclnkitem.h"
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
21DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app) 22DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app)
22 : ResultItem(parent) 23 : ResultItem(parent)
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
@@ -11,19 +11,23 @@
11// 11//
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>
16#include <qiconset.h> 27#include <qiconset.h>
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
28DocLnkSearch::DocLnkSearch(QListView* parent, QString name) 32DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
29: AppLnkSearch(parent, name), _popupMenu(0) 33: AppLnkSearch(parent, name), _popupMenu(0)
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
@@ -12,14 +12,14 @@
12// 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
22EventItem::EventItem(OListViewItem* parent, OEvent *event) 19#include <qdatetime.h>
20#include <qpixmap.h>
21
22EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
23 : ResultItem(parent) 23 : ResultItem(parent)
24{ 24{
25 _event = event; 25 _event = event;
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
@@ -15,7 +15,9 @@
15 15
16#include "resultitem.h" 16#include "resultitem.h"
17 17
18class OEvent; 18#include <opie2/opimevent.h>
19
20using namespace Opie;
19 21
20/** 22/**
21@author Patrick S. Vogt 23@author Patrick S. Vogt
@@ -23,7 +25,7 @@ class OEvent;
23class EventItem : public ResultItem 25class EventItem : public ResultItem
24{ 26{
25public: 27public:
26 EventItem(OListViewItem* parent, OEvent *event); 28 EventItem(OListViewItem* parent, OPimEvent *event);
27 29
28 ~EventItem(); 30 ~EventItem();
29 31
@@ -33,7 +35,7 @@ public:
33 35
34private: 36private:
35 void setIcon(); 37 void setIcon();
36 OEvent *_event; 38 OPimEvent *_event;
37 39
38}; 40};
39 41
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
@@ -10,7 +10,27 @@
10// (c) 2002 Patrick S. Vogt <tille@handhelds.org> 10// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
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"
13 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>
32
33#include <qtoolbar.h>
14#include <qaction.h> 34#include <qaction.h>
15#include <qmessagebox.h> 35#include <qmessagebox.h>
16#include <qpopupmenu.h> 36#include <qpopupmenu.h>
@@ -29,26 +49,10 @@
29#include <qregexp.h> 49#include <qregexp.h>
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"
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 53
51static const char* const image1_data[] = { 54
55static const char* const image1_data[] = {
52"14 14 3 1", 56"14 14 3 1",
53". c None", 57". c None",
54"# c #000000", 58"# c #000000",
@@ -178,25 +182,25 @@ void MainWindow::makeMenu()
178 LabelEnterText = new QLabel( searchBar, "Label" ); 182 LabelEnterText = new QLabel( searchBar, "Label" );
179 LabelEnterText->setAutoMask( FALSE ); 183 LabelEnterText->setAutoMask( FALSE );
180 LabelEnterText->setText( tr( "Search for: " ) ); 184 LabelEnterText->setText( tr( "Search for: " ) );
181 185
182 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 186 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
183 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); 187 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
184 QWhatsThis::add( searchEdit, tr("Enter your search terms here") ); 188 QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
185 searchEdit->setFocus(); 189 searchEdit->setFocus();
186 searchBar->setHorizontalStretchable( TRUE ); 190 searchBar->setHorizontalStretchable( TRUE );
187 searchBar->setStretchableWidget( searchEdit ); 191 searchBar->setStretchableWidget( searchEdit );
188 192
189 //Search button 193 //Search button
190 SearchAllAction->addTo( searchBar ); 194 SearchAllAction->addTo( searchBar );
191 195
192 //image ripped of off opie-login/loginwindow.cpp 196 //image ripped of off opie-login/loginwindow.cpp
193 QPixmap image1( ( const char** ) image1_data ); 197 QPixmap image1( ( const char** ) image1_data );
194 198
195 //Clear text 199 //Clear text
196 ClearSearchText = new QToolButton( searchBar, "ClearSearchText"); 200 ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
197 ClearSearchText->setText( tr( "" ) ); 201 ClearSearchText->setText( tr( "" ) );
198 ClearSearchText->setPixmap( image1 ); 202 ClearSearchText->setPixmap( image1 );
199 203
200 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) ); 204 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
201 connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) ); 205 connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
202 206
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
@@ -16,7 +16,6 @@
16#include <qdialog.h> 16#include <qdialog.h>
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>
22#include <qpopupmenu.h> 21#include <qpopupmenu.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
@@ -10,17 +10,20 @@
10 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
16OListView::OListView(QWidget *parent, const char *name ) 19OListView::OListView(QWidget *parent, const char *name )
17 : QListView(parent,name) 20 : QListView(parent,name)
18{ 21{
19 22
20 setRootIsDecorated( true ); 23 setRootIsDecorated( true );
21 addColumn(tr("Results"),qApp->desktop()->width() - 9 ); 24 addColumn(tr("Results"),qApp->desktop()->width() - 9 );
22 //setColumnWidthMode(0, Manual); 25 //setColumnWidthMode(0, Manual);
23 26
24 setSorting( -1 ); 27 setSorting( -1 );
25 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*))); 28 connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
26} 29}
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
@@ -35,5 +35,5 @@ TARGET = osearch
35 35
36INCLUDEPATH = $(OPIEDIR)/include 36INCLUDEPATH = $(OPIEDIR)/include
37DEPENDPATH += $(OPIEDIR)/include 37DEPENDPATH += $(OPIEDIR)/include
38LIBS += -lqpe -lopie 38LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
39include ( $(OPIEDIR)/include.pro ) 39include ( $(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
@@ -12,10 +12,8 @@
12// 12//
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
20ResultItem::ResultItem(OListViewItem* parent) 18ResultItem::ResultItem(OListViewItem* parent)
21: OListViewItem(parent) 19: 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
@@ -13,10 +13,10 @@
13#ifndef RESULTITEM_H 13#ifndef RESULTITEM_H
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
22*/ 22*/
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
@@ -10,14 +10,14 @@
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 "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
23static OWait *wait = 0; 23static OWait *wait = 0;
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
@@ -12,12 +12,14 @@
12// 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
20TodoItem::TodoItem(OListViewItem* parent, OTodo *todo) 19#include <qpixmap.h>
20
21
22TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo)
21: ResultItem(parent) 23: ResultItem(parent)
22{ 24{
23 _todo = todo; 25 _todo = todo;
@@ -61,16 +63,16 @@ void TodoItem::setIcon()
61 case -1: 63 case -1:
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;
76 default: 78 default:
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
@@ -13,8 +13,11 @@
13#ifndef TODOITEM_H 13#ifndef TODOITEM_H
14#define TODOITEM_H 14#define TODOITEM_H
15 15
16
17#include <opie2/opimtodo.h>
16#include "resultitem.h" 18#include "resultitem.h"
17class OTodo; 19
20using namespace Opie;
18 21
19/** 22/**
20@author Patrick S. Vogt 23@author Patrick S. Vogt
@@ -22,7 +25,7 @@ class OTodo;
22class TodoItem : public ResultItem 25class TodoItem : public ResultItem
23{ 26{
24public: 27public:
25 TodoItem(OListViewItem* parent, OTodo *todo); 28 TodoItem(OListViewItem* parent, OPimTodo *todo);
26 ~TodoItem(); 29 ~TodoItem();
27 30
28 virtual QString toRichText(); 31 virtual QString toRichText();
@@ -31,7 +34,7 @@ public:
31 34
32private: 35private:
33 void setIcon(); 36 void setIcon();
34 OTodo *_todo; 37 OPimTodo *_todo;
35 38
36}; 39};
37 40
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
@@ -11,15 +11,15 @@
11// 11//
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
24TodoSearch::TodoSearch(QListView* parent, QString name) 24TodoSearch::TodoSearch(QListView* parent, QString name)
25: SearchGroup(parent, name), _todos(0), _popupMenu(0) 25: SearchGroup(parent, name), _todos(0), _popupMenu(0)
@@ -49,21 +49,21 @@ TodoSearch::~TodoSearch()
49 49
50void TodoSearch::load() 50void TodoSearch::load()
51{ 51{
52 _todos = new OTodoAccess(); 52 _todos = new OPimTodoAccess();
53 _todos->load(); 53 _todos->load();
54} 54}
55 55
56int TodoSearch::search() 56int 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}
63 63
64void TodoSearch::insertItem( void *rec ) 64void 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;
69 (void)new TodoItem( this, todo ); 69 (void)new TodoItem( this, todo );
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
@@ -15,9 +15,13 @@
15 15
16#include "searchgroup.h" 16#include "searchgroup.h"
17 17
18class OTodoAccess; 18#include <opie2/otodoaccess.h>
19#include <opie2/opimtodo.h>
20
19class QAction; 21class QAction;
20 22
23using namespace Opie;
24
21/** 25/**
22@author Patrick S. Vogt 26@author Patrick S. Vogt
23*/ 27*/
@@ -35,7 +39,7 @@ protected:
35 virtual void insertItem( void* ); 39 virtual void insertItem( void* );
36 40
37private: 41private:
38 OTodoAccess *_todos; 42 OPimTodoAccess *_todos;
39 QAction *actionShowCompleted; 43 QAction *actionShowCompleted;
40 QPopupMenu *_popupMenu; 44 QPopupMenu *_popupMenu;
41}; 45};