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
@@ -12,12 +12,11 @@
 //
 #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):
@@ -25,8 +24,8 @@ AdressSearch::AdressSearch(QListView* parent, QString 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" );
@@ -45,12 +44,12 @@ 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,4 +1,2 @@
-//
-//
 // C++ Interface: $MODULE$
 //
@@ -15,6 +13,8 @@
 
 #include "searchgroup.h"
+#include <opie2/ocontactaccess.h>
+
+using namespace Opie;
 
-class OContactAccess;
 
 /**
@@ -33,5 +33,5 @@ protected:
 
 private:
-    OContactAccess *_contacts;
+    OPimContactAccess *_contacts;
 };
 
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 @@
 
 #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
@@ -12,12 +12,11 @@
 //
 #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)
@@ -44,14 +43,14 @@ 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;
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 @@
 #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)
 {
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 @@
 #define CONTACTITEM_H
 
+#include <opie2/opimrecord.h>
+#include <opie2/opimcontact.h>
+
 #include "resultitem.h"
 
-class OContact;
+using namespace Opie;
 
 /**
@@ -24,5 +27,5 @@ class ContactItem : public ResultItem
 {
 public:
-    ContactItem(OListViewItem* parent, OContact *contact);
+    ContactItem(OListViewItem* parent, OPimContact *contact);
 
     ~ContactItem();
@@ -35,5 +38,5 @@ 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
@@ -3,5 +3,5 @@
 // C++ Implementation: $MODULE$
 //
-// Description: 
+// Description:
 //
 //
@@ -12,12 +12,13 @@
 //
 #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>
@@ -25,4 +26,6 @@
 #include <qpopupmenu.h>
 
+
+
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
@@ -60,7 +63,7 @@ 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;
 }
@@ -68,5 +71,5 @@ int DatebookSearch::search()
 void DatebookSearch::insertItem( void *rec )
 {
-        OEvent *ev = (OEvent*)rec;
+        OPimEvent *ev = (OPimEvent*)rec;
         if ( !actionShowPastEvents->isOn() &&
               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 @@
 
 #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
@@ -14,8 +14,9 @@
 
 #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)
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 @@
 //
 
+
+#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>
@@ -17,12 +28,5 @@
 #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)
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 @@
 #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)
 {
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 @@
 #include "resultitem.h"
 
-class OEvent;
+#include <opie2/opimevent.h>
+
+using namespace Opie;
 
 /**
@@ -24,5 +26,5 @@ class EventItem : public ResultItem
 {
 public:
-    EventItem(OListViewItem* parent, OEvent *event);
+    EventItem(OListViewItem* parent, OPimEvent *event);
 
     ~EventItem();
@@ -34,5 +36,5 @@ 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
@@ -11,5 +11,25 @@
 
 
+#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>
@@ -30,24 +50,8 @@
 #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",
@@ -179,5 +183,5 @@ void MainWindow::makeMenu()
   LabelEnterText->setAutoMask( FALSE );
   LabelEnterText->setText( tr( "Search for: " ) );
-  
+
   addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
   QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
@@ -186,16 +190,16 @@ void MainWindow::makeMenu()
   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() ) );
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 @@
 #include <qaction.h>
 #include <qlist.h>
-
 #include <qmap.h>
 #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,15 +11,18 @@
 #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*)));
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
 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
@@ -13,8 +13,6 @@
 #include "resultitem.h"
 
-#include <qmessagebox.h>
-
-#include <opie/otodo.h>
 
+#include <qmessagebox.h>
 
 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 @@
 #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
@@ -11,12 +11,12 @@
 //
 //
+#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
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 @@
 #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)
 {
@@ -62,14 +64,14 @@ void TodoItem::setIcon()
                 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;
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 @@
 #define TODOITEM_H
 
+
+#include <opie2/opimtodo.h>
 #include "resultitem.h"
-class OTodo;
+
+using namespace Opie;
 
 /**
@@ -23,5 +26,5 @@ class TodoItem : public ResultItem
 {
 public:
-    TodoItem(OListViewItem* parent, OTodo *todo);
+    TodoItem(OListViewItem* parent, OPimTodo *todo);
     ~TodoItem();
 
@@ -32,5 +35,5 @@ 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
@@ -12,13 +12,13 @@
 //
 #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)
@@ -50,5 +50,5 @@ TodoSearch::~TodoSearch()
 void TodoSearch::load()
 {
-         _todos = new OTodoAccess();
+         _todos = new OPimTodoAccess();
          _todos->load();
 }
@@ -56,7 +56,7 @@ void TodoSearch::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;
 }
@@ -64,5 +64,5 @@ int TodoSearch::search()
 void TodoSearch::insertItem( void *rec )
 {
-        OTodo *todo = (OTodo*)rec;
+        OPimTodo *todo = (OPimTodo*)rec;
         if (!actionShowCompleted->isOn() &&
                 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 @@
 #include "searchgroup.h"
 
-class OTodoAccess;
+#include <opie2/otodoaccess.h>
+#include <opie2/opimtodo.h>
+
 class QAction;
 
+using namespace Opie;
+
 /**
 @author Patrick S. Vogt
@@ -36,5 +40,5 @@ protected:
 
 private:
-    OTodoAccess *_todos;
+    OPimTodoAccess *_todos;
     QAction *actionShowCompleted;
     QPopupMenu *_popupMenu;