summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp13
-rw-r--r--core/pim/osearch/adresssearch.h8
-rw-r--r--core/pim/osearch/applnkitem.cpp3
-rw-r--r--core/pim/osearch/applnksearch.cpp5
-rw-r--r--core/pim/osearch/contactitem.cpp7
-rw-r--r--core/pim/osearch/contactitem.h9
-rw-r--r--core/pim/osearch/datebooksearch.cpp17
-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.cpp38
-rw-r--r--core/pim/osearch/mainwindow.h1
-rw-r--r--core/pim/osearch/olistview.cpp5
-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, 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
@@ -11,14 +11,13 @@
//
//
#include "adresssearch.h"
+#include "contactitem.h"
+
+#include <qpe/resource.h>
#include <qstring.h>
#include <qiconset.h>
//#include <qwhatsthis.h>
-#include <qpe/resource.h>
-#include <opie/ocontactaccess.h>
-
-#include "contactitem.h"
AdressSearch::AdressSearch(QListView* parent, QString name):
SearchGroup(parent, name)
@@ -44,14 +43,14 @@ AdressSearch::~AdressSearch()
void AdressSearch::load()
{
- _contacts = new OContactAccess("osearch");
+ _contacts = new OPimContactAccess("osearch");
}
int AdressSearch::search()
{
- ORecordList<OContact> results = _contacts->matchRegexp(_search);
+ OPimRecordList<OPimContact> results = _contacts->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++) {
- (void)new ContactItem( this, new OContact( results[i] ));
+ (void)new ContactItem( this, new OPimContact( results[i] ));
}
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,5 +1,3 @@
-//
-//
// C++ Interface: $MODULE$
//
// Description:
@@ -14,8 +12,10 @@
#define ADRESSSEARCH_H
#include "searchgroup.h"
+#include <opie2/ocontactaccess.h>
+
+using namespace Opie;
-class OContactAccess;
/**
@author Patrick S. Vogt
@@ -32,7 +32,7 @@ protected:
virtual void insertItem( void* );
private:
- OContactAccess *_contacts;
+ OPimContactAccess *_contacts;
};
#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 @@
#include "applnkitem.h"
#include <qpe/applnk.h>
-#include <qfileinfo.h>
#include <qpe/qcopenvelope_qws.h>
+#include <qfileinfo.h>
+
AppLnkItem::AppLnkItem(OListViewItem* parent, AppLnk *app)
: 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
@@ -11,14 +11,13 @@
//
//
#include "applnksearch.h"
+#include "applnkitem.h"
#include <qpe/applnk.h>
#include <qpe/qpeapplication.h>
-#include <qiconset.h>
#include <qpe/resource.h>
-#include "applnkitem.h"
-
+#include <qiconset.h>
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
@@ -12,12 +12,13 @@
//
#include "contactitem.h"
-#include <qpixmap.h>
-#include <opie/ocontact.h>
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
-ContactItem::ContactItem(OListViewItem* parent, OContact *contact)
+#include <qpixmap.h>
+
+
+ContactItem::ContactItem(OListViewItem* parent, OPimContact *contact)
: ResultItem(parent)
{
_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 @@
#ifndef CONTACTITEM_H
#define CONTACTITEM_H
+#include <opie2/opimrecord.h>
+#include <opie2/opimcontact.h>
+
#include "resultitem.h"
-class OContact;
+using namespace Opie;
/**
@author Patrick S. Vogt
@@ -23,7 +26,7 @@ class OContact;
class ContactItem : public ResultItem
{
public:
- ContactItem(OListViewItem* parent, OContact *contact);
+ ContactItem(OListViewItem* parent, OPimContact *contact);
~ContactItem();
@@ -34,7 +37,7 @@ public:
private:
void setIcon();
- OContact *_contact;
+ OPimContact *_contact;
};
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
@@ -11,19 +11,22 @@
//
//
#include "datebooksearch.h"
-
#include "eventitem.h"
+#include <opie2/opimevent.h>
+#include <opie2/opimrecurrence.h>
+
+
#include <qpe/resource.h>
#include <qpe/config.h>
-#include <opie/oevent.h>
-#include <opie/orecur.h>
-#include <opie/odatebookaccess.h>
+
#include <qiconset.h>
#include <qaction.h>
#include <qdatetime.h>
#include <qpopupmenu.h>
+
+
DatebookSearch::DatebookSearch(QListView* parent, QString name)
: SearchGroup(parent, name), _dates(0), _popupMenu(0)
{
@@ -59,15 +62,15 @@ void DatebookSearch::load()
int DatebookSearch::search()
{
- ORecordList<OEvent> results = _dates->matchRegexp(_search);
+ OPimRecordList<OPimEvent> results = _dates->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++)
- insertItem( new OEvent( results[i] ) );
+ insertItem( new OPimEvent( results[i] ) );
return _resultCount;
}
void DatebookSearch::insertItem( void *rec )
{
- OEvent *ev = (OEvent*)rec;
+ OPimEvent *ev = (OPimEvent*)rec;
if ( !actionShowPastEvents->isOn() &&
ev->endDateTime() < QDateTime::currentDateTime() &&
!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 @@
#define DATEBOOKSEARCH_H
#include "searchgroup.h"
+#include <opie2/odatebookaccess.h>
+
+using namespace Opie;
-class ODateBookAccess;
class QAction;
/**
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 @@
#include "doclnkitem.h"
#include <qpe/applnk.h>
+#include <qpe/qcopenvelope_qws.h>
+
#include <qfile.h>
#include <qtextstream.h>
#include <qfileinfo.h>
-#include <qpe/qcopenvelope_qws.h>
DocLnkItem::DocLnkItem(OListViewItem* parent, DocLnk *app)
: 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 @@
//
//
+
+#include "doclnkitem.h"
+#include "doclnksearch.h"
+
+#include <opie2/owait.h>
+
+#include <qpe/applnk.h>
+#include <qpe/config.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
#include <qaction.h>
#include <qfile.h>
#include <qiconset.h>
#include <qpopupmenu.h>
#include <qtextstream.h>
-#include <qpe/applnk.h>
-#include <qpe/config.h>
-#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
-#include <opie/owait.h>
-#include "doclnkitem.h"
-#include "doclnksearch.h"
DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
: 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 @@
//
#include "eventitem.h"
-#include <qdatetime.h>
-#include <qpixmap.h>
+
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
-//#include <qwhatsthis.h>
-#include <opie/oevent.h>
-EventItem::EventItem(OListViewItem* parent, OEvent *event)
+#include <qdatetime.h>
+#include <qpixmap.h>
+
+EventItem::EventItem(OListViewItem* parent, OPimEvent *event)
: ResultItem(parent)
{
_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 @@
#include "resultitem.h"
-class OEvent;
+#include <opie2/opimevent.h>
+
+using namespace Opie;
/**
@author Patrick S. Vogt
@@ -23,7 +25,7 @@ class OEvent;
class EventItem : public ResultItem
{
public:
- EventItem(OListViewItem* parent, OEvent *event);
+ EventItem(OListViewItem* parent, OPimEvent *event);
~EventItem();
@@ -33,7 +35,7 @@ public:
private:
void setIcon();
- OEvent *_event;
+ OPimEvent *_event;
};
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 @@
// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
+#include "olistview.h"
+#include "olistviewitem.h"
+#include "resultitem.h"
+#include "adresssearch.h"
+#include "todosearch.h"
+#include "datebooksearch.h"
+#include "applnksearch.h"
+#include "doclnksearch.h"
+#include "mainwindow.h"
+
+#include <opie2/owait.h>
+
+#include <qpe/qpemessagebox.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+#include <qpe/global.h>
+#include <qtoolbar.h>
#include <qaction.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>
@@ -29,24 +49,8 @@
#include <qregexp.h>
#include <qwhatsthis.h>
#include <qmenubar.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qtoolbar.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <opie/owait.h>
-#include "olistview.h"
-#include "olistviewitem.h"
-#include "resultitem.h"
-#include "adresssearch.h"
-#include "todosearch.h"
-#include "datebooksearch.h"
-#include "applnksearch.h"
-#include "doclnksearch.h"
-#include "mainwindow.h"
+
static const char* const image1_data[] = {
"14 14 3 1",
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 @@
#include <qdialog.h>
#include <qaction.h>
#include <qlist.h>
-
#include <qmap.h>
#include <qtimer.h>
#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,9 +10,12 @@
#include "olistview.h"
#include "olistviewitem.h"
-#include <qmessagebox.h>
+
#include <qpe/qpeapplication.h>
+#include <qmessagebox.h>
+
+
OListView::OListView(QWidget *parent, const char *name )
: 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
@@ -35,5 +35,5 @@ TARGET = osearch
INCLUDEPATH = $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2 -lopiepim2 -lopieui2
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
@@ -12,10 +12,8 @@
//
#include "resultitem.h"
-#include <qmessagebox.h>
-
-#include <opie/otodo.h>
+#include <qmessagebox.h>
ResultItem::ResultItem(OListViewItem* parent)
: 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 @@
#ifndef RESULTITEM_H
#define RESULTITEM_H
-#include <qintdict.h>
-
#include "olistviewitem.h"
+#include <qintdict.h>
+
/**
@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
@@ -10,14 +10,14 @@
// Copyright: See COPYING file that comes with this distribution
//
//
+#include "olistviewitem.h"
+#include "searchgroup.h"
+
+#include <opie2/owait.h>
#include <qobject.h>
#include <qregexp.h>
#include <qapplication.h>
-#include <opie/owait.h>
-
-#include "olistviewitem.h"
-#include "searchgroup.h"
#ifndef NEW_OWAIT
static 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 @@
//
#include "todoitem.h"
-#include <opie/otodo.h>
-#include <qpixmap.h>
+
#include <qpe/resource.h>
#include <qpe/qcopenvelope_qws.h>
-TodoItem::TodoItem(OListViewItem* parent, OTodo *todo)
+#include <qpixmap.h>
+
+
+TodoItem::TodoItem(OListViewItem* parent, OPimTodo *todo)
: ResultItem(parent)
{
_todo = todo;
@@ -61,16 +63,16 @@ void TodoItem::setIcon()
case -1:
icon = Resource::loadPixmap( "reset" );
break;
- case OTodo::Description:
+ case OPimTodo::Description:
icon = Resource::loadPixmap( "txt" );
break;
- case OTodo::Summary:
+ case OPimTodo::Summary:
icon = Resource::loadPixmap( "osearch/summary" );
break;
- case OTodo::Priority:
+ case OPimTodo::Priority:
icon = Resource::loadPixmap( "todo/priority1" );
break;
- case OTodo::HasDate:
+ case OPimTodo::HasDate:
icon = Resource::loadPixmap( "osearch/clock" );
break;
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 @@
#ifndef TODOITEM_H
#define TODOITEM_H
+
+#include <opie2/opimtodo.h>
#include "resultitem.h"
-class OTodo;
+
+using namespace Opie;
/**
@author Patrick S. Vogt
@@ -22,7 +25,7 @@ class OTodo;
class TodoItem : public ResultItem
{
public:
- TodoItem(OListViewItem* parent, OTodo *todo);
+ TodoItem(OListViewItem* parent, OPimTodo *todo);
~TodoItem();
virtual QString toRichText();
@@ -31,7 +34,7 @@ public:
private:
void setIcon();
- OTodo *_todo;
+ OPimTodo *_todo;
};
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 @@
//
//
#include "todosearch.h"
+#include "todoitem.h"
-#include <opie/otodoaccess.h>
-#include <opie/otodo.h>
#include <qpe/resource.h>
#include <qpe/config.h>
+
#include <qiconset.h>
#include <qaction.h>
#include <qpopupmenu.h>
-#include "todoitem.h"
+
TodoSearch::TodoSearch(QListView* parent, QString name)
: SearchGroup(parent, name), _todos(0), _popupMenu(0)
@@ -49,21 +49,21 @@ TodoSearch::~TodoSearch()
void TodoSearch::load()
{
- _todos = new OTodoAccess();
+ _todos = new OPimTodoAccess();
_todos->load();
}
int TodoSearch::search()
{
- ORecordList<OTodo> results = _todos->matchRegexp(_search);
+ OPimRecordList<OPimTodo> results = _todos->matchRegexp(_search);
for (uint i = 0; i < results.count(); i++)
- insertItem( new OTodo( results[i] ));
+ insertItem( new OPimTodo( results[i] ));
return _resultCount;
}
void TodoSearch::insertItem( void *rec )
{
- OTodo *todo = (OTodo*)rec;
+ OPimTodo *todo = (OPimTodo*)rec;
if (!actionShowCompleted->isOn() &&
todo->isCompleted() ) return;
(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 @@
#include "searchgroup.h"
-class OTodoAccess;
+#include <opie2/otodoaccess.h>
+#include <opie2/opimtodo.h>
+
class QAction;
+using namespace Opie;
+
/**
@author Patrick S. Vogt
*/
@@ -35,7 +39,7 @@ protected:
virtual void insertItem( void* );
private:
- OTodoAccess *_todos;
+ OPimTodoAccess *_todos;
QAction *actionShowCompleted;
QPopupMenu *_popupMenu;
};