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
@@ -6,57 +6,56 @@
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 	_contacts = 0;
-	QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );	
+	QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
-	
-	
+
+
 //	QWhatsThis::add( this, QObject::tr("Search the addressbook") );
 /*	QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
 	QImage img = pix.convertToImage();
 	img.smoothScale( 14, 14 );
 	pix.convertFromImage( img );
 	setPixmap( 0, pix );*/
 }
 
 
 AdressSearch::~AdressSearch()
 {
 	delete _contacts;
 }
 
 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();
 }
 
 void AdressSearch::insertItem( void* )
 {
 
 }
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,38 +1,38 @@
-//
-//
 // C++ Interface: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef ADRESSSEARCH_H
 #define ADRESSSEARCH_H
 
 #include "searchgroup.h"
+#include <opie2/ocontactaccess.h>
+
+using namespace Opie;
 
-class OContactAccess;
 
 /**
 @author Patrick S. Vogt
 */
 class AdressSearch : public SearchGroup
 {
 public:
     AdressSearch(QListView* parent, QString name);
     ~AdressSearch();
 
 protected:
 	virtual void load();
 	virtual int search();
 	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
@@ -8,19 +8,20 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 	_app = app;
 	setText(0, _app->name() );
 	setPixmap(0, _app->pixmap() );
 }
 
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
@@ -6,24 +6,23 @@
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 	_apps = 0;
 	QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
 	//QIconSet is = Resource::loadIconSet( "AppsIcon" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 }
@@ -38,26 +37,26 @@ AppLnkSearch::~AppLnkSearch()
 void AppLnkSearch::load()
 {
 	_apps = new AppLnkSet(QPEApplication::qpeDir());
 }
 
 int AppLnkSearch::search()
 {
 	QList<AppLnk> appList = _apps->children();
-	
+
 	for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
 		if ( (_search.match( app->name() ) != -1)
 		    || (_search.match(app->comment()) != -1)
-		    || (_search.match(app->exec()) != -1) ) {	    
+		    || (_search.match(app->exec()) != -1) ) {
 			insertItem( app );
 		}else
 		if (searchFile( app ))
-			insertItem( app );		
-		qApp->processEvents( 100 );		
+			insertItem( app );
+		qApp->processEvents( 100 );
 	}
 	return _resultCount;
 }
 
 void AppLnkSearch::insertItem( void *rec )
 {
 	(void)new AppLnkItem( this, (AppLnk*)rec );
 	_resultCount++;
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
@@ -7,22 +7,23 @@
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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;
 	setText(0, _contact->toShortText());
 	setIcon();
 }
 
 void ContactItem::setIcon()
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
@@ -8,34 +8,37 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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
 */
 class ContactItem : public ResultItem
 {
 public:
-    ContactItem(OListViewItem* parent, OContact *contact);
+    ContactItem(OListViewItem* parent, OPimContact *contact);
 
     ~ContactItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 
 private:
 	void setIcon();
-	OContact *_contact;
+	OPimContact *_contact;
 
 };
 
 #endif
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
@@ -1,34 +1,37 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
-// Description: 
+// Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 	QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 	actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null,  0, 0, 0, true );
 	actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null,  0, 0, 0, true );
 	Config cfg( "osearch", Config::User );
@@ -54,25 +57,25 @@ DatebookSearch::~DatebookSearch()
 void DatebookSearch::load()
 {
 	 _dates = new ODateBookAccess();
 	 _dates->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()
 	    ) return;
 	if ( !actionSearchInDates->isOn() && (
 	      ev->lastHitField() == Qtopia::StartDateTime ||
  	      ev->lastHitField() == Qtopia::EndDateTime )
 	    ) return;
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
@@ -9,18 +9,20 @@
 // 
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef DATEBOOKSEARCH_H
 #define DATEBOOKSEARCH_H
 
 #include "searchgroup.h"
+#include <opie2/odatebookaccess.h>
+
+using namespace Opie;
 
-class ODateBookAccess;
 class QAction;
 
 /**
 @author Patrick S. Vogt
 */
 class DatebookSearch : public SearchGroup
 {
 public:
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
@@ -8,20 +8,21 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 	_doc = app;
 	setText(0, _doc->name() );
 	setPixmap(0, _doc->pixmap() );
 }
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
@@ -6,29 +6,33 @@
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 
+
+#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)
 {
 	QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) );
 
 	actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null,  0, 0, 0, true );
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
@@ -7,24 +7,24 @@
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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;
 	setText(0, _event->toShortText() );
 	setIcon();
 }
 
 
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
@@ -10,31 +10,33 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef EVENTITEM_H
 #define EVENTITEM_H
 
 #include "resultitem.h"
 
-class OEvent;
+#include <opie2/opimevent.h>
+
+using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class EventItem : public ResultItem
 {
 public:
-    EventItem(OListViewItem* parent, OEvent *event);
+    EventItem(OListViewItem* parent, OPimEvent *event);
 
     ~EventItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 private:
     void setIcon();
-    OEvent *_event;
+    OPimEvent *_event;
 
 };
 
 #endif
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
@@ -5,17 +5,37 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (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>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qhbuttongroup.h>
@@ -24,36 +44,20 @@
 #include <qintdict.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qsignalmapper.h>
 #include <qtextbrowser.h>
 #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[] = { 
+
+static const char* const image1_data[] = {
 "14 14 3 1",
 ". c None",
 "# c #000000",
 "a c #ff0000",
 "..............",
 "..##.......###",
 ".#aa#....##aa#",
 "#aaaa#.##aaaa#",
@@ -173,35 +177,35 @@ void MainWindow::makeMenu()
   actionCaseSensitiv->addTo( searchOptions );
   actionWildcards = new QAction( tr("Use wildcards"),QString::null,  0, this, 0, true );
   actionWildcards->addTo( searchOptions );
 
   //SEARCH BAR
   LabelEnterText = new QLabel( searchBar, "Label" );
   LabelEnterText->setAutoMask( FALSE );
   LabelEnterText->setText( tr( "Search for: " ) );
-  
+
   addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
   QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
   QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
   searchEdit->setFocus();
   searchBar->setHorizontalStretchable( TRUE );
   searchBar->setStretchableWidget( searchEdit );
-  
+
   //Search button
   SearchAllAction->addTo( searchBar );
-  
+
   //image ripped of off opie-login/loginwindow.cpp
   QPixmap image1( ( const char** ) image1_data );
-  
+
   //Clear text
   ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
   ClearSearchText->setText( tr( "" ) );
   ClearSearchText->setPixmap( image1 );
-  
+
   connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
   connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
 
 }
 
 MainWindow::~MainWindow()
 {
    Config cfg( "osearch", Config::User );
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
@@ -11,17 +11,16 @@
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qdialog.h>
 #include <qaction.h>
 #include <qlist.h>
-
 #include <qmap.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 class QAction;
 class QToolBar;
 class QHBox;
 class QVBoxLayout;
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
@@ -5,27 +5,30 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
   // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 
 #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)
 {
 
-	setRootIsDecorated( true );	
+	setRootIsDecorated( true );
 	addColumn(tr("Results"),qApp->desktop()->width() - 9 );
 	//setColumnWidthMode(0, Manual);
-	
+
 	setSorting( -1 );
  	connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
 }
 
 
 OListView::~OListView()
 {
 }
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
@@ -30,10 +30,10 @@ HEADERS += mainwindow.h \
            applnkitem.h \
            doclnkitem.h \
            doclnksearch.h 
 
 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
@@ -7,20 +7,18 @@
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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
@@ -8,20 +8,20 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef RESULTITEM_H
 #define RESULTITEM_H
 
-#include <qintdict.h>
-
 #include "olistviewitem.h"
 
+#include <qintdict.h>
+
 /**
 @author Patrick S. Vogt
 */
 class ResultItem : public OListViewItem
 {
 public:
     ResultItem(OListViewItem* parent);
     ~ResultItem();
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
@@ -5,24 +5,24 @@
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // 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;
 #endif
 
 SearchGroup::SearchGroup(QListView* parent, QString name)
 : OListViewItem(parent, name)
 {
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
@@ -7,22 +7,24 @@
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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;
 	setText( 0, todo->toShortText() );
 	setIcon();
 }
 
 TodoItem::~TodoItem()
@@ -56,26 +58,26 @@ QIntDict<QString> TodoItem::actions()
 
 void TodoItem::setIcon()
 {
 	QPixmap icon;
 	switch ( _todo->lastHitField() ) {
 	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:
 		icon = Resource::loadPixmap( "DocsIcon" );
 		break;
 	}
 	setPixmap( 0, icon );
 }
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
@@ -8,31 +8,34 @@
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef TODOITEM_H
 #define TODOITEM_H
 
+
+#include <opie2/opimtodo.h>
 #include "resultitem.h"
-class OTodo;
+
+using namespace Opie;
 
 /**
 @author Patrick S. Vogt
 */
 class TodoItem : public ResultItem
 {
 public:
-    TodoItem(OListViewItem* parent, OTodo *todo);
+    TodoItem(OListViewItem* parent, OPimTodo *todo);
     ~TodoItem();
 
     virtual QString toRichText();
     virtual void action( int );
     virtual QIntDict<QString> actions();
 
 private:
     void setIcon();
-    OTodo *_todo;
+    OPimTodo *_todo;
 
 };
 
 #endif
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
@@ -6,25 +6,25 @@
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #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)
 {
 //	AppLnkSet als(QPEApplication::qpeDir());
 //	setPixmap( 0, als.findExec("todolist")->pixmap() );
 	QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
@@ -44,31 +44,31 @@ TodoSearch::~TodoSearch()
 	delete _popupMenu;
 	delete actionShowCompleted;
 	delete _todos;
 }
 
 
 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 );
 	_resultCount++;
 }
 
 QPopupMenu* TodoSearch::popupMenu()
 {
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
@@ -10,19 +10,23 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #ifndef TODOSEARCH_H
 #define TODOSEARCH_H
 
 #include "searchgroup.h"
 
-class OTodoAccess;
+#include <opie2/otodoaccess.h>
+#include <opie2/opimtodo.h>
+
 class QAction;
 
+using namespace Opie;
+
 /**
 @author Patrick S. Vogt
 */
 class TodoSearch : public SearchGroup
 {
 public:
     TodoSearch(QListView* parent, QString name);
     ~TodoSearch();
@@ -30,14 +34,14 @@ public:
     virtual QPopupMenu* popupMenu();
 
 protected:
 	virtual void load();
 	virtual int search();
 	virtual void insertItem( void* );
 
 private:
-    OTodoAccess *_todos;
+    OPimTodoAccess *_todos;
     QAction *actionShowCompleted;
     QPopupMenu *_popupMenu;
 };
 
 #endif