14 files changed, 123 insertions, 121 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 076e2e0..70a66a0 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -32,7 +32,7 @@ AbLabel::~AbLabel()
 {
 }
 
-void AbLabel::setContacts( const OContactAccess::List& viewList )
+void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         m_viewList = viewList;
         if (m_viewList.count() != 0){
@@ -48,7 +48,7 @@ void AbLabel::setContacts( const OContactAccess::List& viewList )
 
 int AbLabel::currentEntry_UID()
 {
-        OContact contact = currentEntry();
+        Opie::OPimContact contact = currentEntry();
 
         if ( contact.isEmpty() )
                 return 0;
@@ -56,12 +56,12 @@ int AbLabel::currentEntry_UID()
                 return ( contact.uid() );
 }
 
-OContact AbLabel::currentEntry()
+Opie::OPimContact AbLabel::currentEntry()
 {
         if ( ! m_empty )
                 return ( *m_itCurContact );
         else
-                return OContact();
+                return Opie::OPimContact();
 }
 
 
@@ -109,7 +109,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                                 scrollBy( 0, -(visibleHeight()-20) );
                         else {
                                 --m_itCurContact;
-                                if ( *m_itCurContact != OContact() )
+                                if ( *m_itCurContact != Opie::OPimContact() )
                                         sync();
                                 else
                                         m_itCurContact = m_viewList.end();
@@ -126,7 +126,7 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                                 scrollBy( 0, visibleHeight()-20 );
                         else {
                                 ++m_itCurContact;
-                                if ( *m_itCurContact != OContact() )
+                                if ( *m_itCurContact != Opie::OPimContact() )
                                         sync();
                                 else
                                         m_itCurContact = m_viewList.begin();
diff --git a/core/pim/addressbook/ablabel.h b/core/pim/addressbook/ablabel.h
index 80336dc..8d7f2ac 100644
--- a/core/pim/addressbook/ablabel.h
+++ b/core/pim/addressbook/ablabel.h
@@ -20,10 +20,10 @@
 #ifndef ABLABEL_H
 #define ABLABEL_H
 
-#include <opie/ocontact.h>
-#include <qtextview.h>
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
 
-#include <opie/ocontactaccess.h>
+#include <qtextview.h>
 
 class AbLabel : public QTextView
 {
@@ -34,7 +34,7 @@ public:
     ~AbLabel();
 
     // Set the contacts
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
     // Selects a contact
     bool selectContact( int UID );
@@ -43,7 +43,7 @@ public:
     int currentEntry_UID();
 
     //
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
 signals:
     void signalOkPressed();
@@ -53,8 +53,8 @@ protected:
     void keyPressEvent( QKeyEvent * );
 
 private:
-    OContactAccess::List m_viewList;
-    OContactAccess::List::Iterator m_itCurContact;
+    Opie::OPimContactAccess::List m_viewList;
+    Opie::OPimContactAccess::List::Iterator m_itCurContact;
 
     bool m_empty;
 
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 29f4383..cd77b13 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -20,12 +20,11 @@
 **********************************************************************/
 
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
 
 #include <errno.h>
@@ -151,7 +150,7 @@ void AbTable::init()
         columnVisible = true;
 }
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         qWarning("AbTable::setContacts()");
 
@@ -161,7 +160,7 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         setSorting( false );
         setPaintingEnabled( FALSE );
         
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
         //int row = 0;
         // for ( it = m_viewList.begin(); it != m_viewList.end(); ++it )
@@ -187,7 +186,7 @@ bool AbTable::selectContact( int UID )
 {
         qWarning( "AbTable::selectContact( %d )", UID );
         int rows = numRows();
-        OContact* foundContact = 0l;
+        Opie::OPimContact* foundContact = 0l;
         bool found = false;
 
         setPaintingEnabled( FALSE );
@@ -213,9 +212,9 @@ bool AbTable::selectContact( int UID )
 }
 
 #if 0
-void AbTable::insertIntoTable( const OContact& cnt, int row )
+void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
 {
-        qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row );
+        qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
         QString strName;
         ContactItem contactItem;
         
@@ -272,7 +271,7 @@ void AbTable::resort()
 #endif
 }
 
-OContact AbTable::currentEntry()
+Opie::OPimContact AbTable::currentEntry()
         {
         return m_viewList[currentRow()];
 }
@@ -394,7 +393,7 @@ void AbTable::moveTo( char c )
 
 #if 0
 // Useless.. Nobody uses it .. (se)
-QString AbTable::findContactName( const OContact &entry )
+QString AbTable::findContactName( const Opie::OPimContact &entry )
 {
         // We use the fileAs, then company, defaultEmail
         QString str;
@@ -550,7 +549,7 @@ QStringList AbTable::choiceSelection(int /*index*/) const
            
         QString selname = choicenames.at(index);
         for (each row) {
-        OContact *c = contactForRow(row);
+        Opie::OPimContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
         r.append(c->email);
         }
@@ -631,7 +630,7 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
     //qWarning( "Paint row: %d", row );
 
-    OContact act_contact = m_viewList[row];
+    Opie::OPimContact act_contact = m_viewList[row];
 
     // Paint alternating background bars
     if (  (row % 2 ) == 0 ) {
@@ -684,7 +683,7 @@ void AbTable::rowHeightChanged( int row )
         if ( enablePainting )
                 QTable::rowHeightChanged( row );
 }
-ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
+ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {
 
         ContactItem item;
diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index b9ebe27..927a5a9 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -22,9 +22,10 @@
 #ifndef ABTABLE_H
 #define ABTABLE_H
 
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
+
 #include <qpe/categories.h>
-#include <opie/ocontact.h>
-#include <opie/ocontactaccess.h>
 
 #include <qmap.h>
 #include <qtable.h>
@@ -83,7 +84,7 @@ public:
     ~AbTable();
 
     // Set the contacts shown in the table
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
     // Set the list for primary contacts
     void setOrderedList( const QValueList<int> ordered );
@@ -92,12 +93,12 @@ public:
     bool selectContact( int UID );
     
     // Get the current selected entry
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
     // Get the UID of the current selected Entry
     int currentEntry_UID();
 
-    // QString findContactName( const OContact &entry );
+    // QString findContactName( const Opie::OPimContact &entry );
 
     void init();
     void clear();
@@ -135,8 +136,8 @@ protected slots:
     void rowHeightChanged( int row );
 
 private:
-    // void insertIntoTable( const OContact &cnt, int row );
-    ContactItem findContactContact( const OContact &entry, int row );
+    // void insertIntoTable( const Opie::OPimContact &cnt, int row );
+    ContactItem findContactContact( const Opie::OPimContact &entry, int row );
     void fitColumns();
     void resizeRows();
     void realignTable();
@@ -145,14 +146,14 @@ private:
 
     int lastSortCol;
     bool asc;
-    // QMap<AbTableItem*, OContact> contactList;
+    // QMap<AbTableItem*, Opie::OPimContact> contactList;
     QValueList<int> intFields;
     QStringList choicenames;
     bool enablePainting;
     bool columnVisible;
     int countNested;
 
-    OContactAccess::List m_viewList;
+    Opie::OPimContactAccess::List m_viewList;
 
 };
 #endif // ABTABLE_H
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 8d61582..aa242b7 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -16,11 +16,11 @@
 
 #include "abview.h"
 
-#include <qlayout.h>
+#include <opie2/ocontactaccessbackend_vcard.h>
 
 #include <qpe/global.h>
 
-#include <opie/ocontactaccessbackend_vcard.h>
+#include <qlayout.h>
 
 #include <assert.h>
 
@@ -53,7 +53,7 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
 {
         qWarning("AbView::c'tor");
         // Load default database and handle syncing myself.. !
-        m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false );
+        m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
         m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
         mCat.load( categoryFileName() );
 
@@ -104,7 +104,7 @@ void AbView::setView( Views view )
          load();
 }
 
-void AbView::addEntry( const OContact &newContact )
+void AbView::addEntry( const Opie::OPimContact &newContact )
 {
         qWarning("abview:AddContact");
         m_contactdb->add ( newContact );
@@ -118,7 +118,7 @@ void AbView::removeEntry( const int UID )
         load();
 }
 
-void AbView::replaceEntry( const OContact &contact )
+void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
         qWarning("abview:ReplaceContact");
         m_contactdb->replace( contact );
@@ -126,9 +126,9 @@ void AbView::replaceEntry( const OContact &contact )
 
 }
 
-OContact AbView::currentEntry()
+Opie::OPimContact AbView::currentEntry()
 {
-        OContact currentContact;
+        Opie::OPimContact currentContact;
 
         switch ( (int) m_curr_View ) {
         case TableView:
@@ -228,14 +228,14 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 
         assert( mode < AbConfig::LASTELEMENT );
 
-        OContact query;
+        Opie::OPimContact query;
         if ( c == 0 ){
                 load();
                 return;
         }else{
                 // If the current Backend is unable to solve the query, we will 
                 // ignore the request ..
-                if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){
+                if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
                         return;
                 }
 
@@ -251,7 +251,7 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                         qWarning( "I will ignore it.." );
                         return;
                 }
-                m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
+                m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
                 if ( m_curr_category != -1 )
                         clearForCategory();
                 m_curr_Contact = 0;
@@ -289,9 +289,9 @@ void AbView::showPersonal( bool personal )
                 // to avoid unneeded load/stores.
                 m_storedDB = m_contactdb;
 
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                           addressbookPersonalVCardName() );
-                m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
+                m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 
                 m_inPersonal = true;
                 m_curr_View = CardView;
@@ -401,10 +401,10 @@ void AbView::slotSwitch(){
 
 void AbView::clearForCategory()
 {
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         // Now remove all contacts with wrong category if any category selected
 
-        OContactAccess::List allList = m_list;
+        Opie::OPimContactAccess::List allList = m_list;
         if ( m_curr_category != -1 ){
                 for ( it = allList.begin(); it != allList.end(); ++it ){
                         if ( !contactCompare( *it, m_curr_category ) ){
@@ -416,9 +416,9 @@ void AbView::clearForCategory()
 
 }
 
-bool AbView::contactCompare( const OContact &cnt, int category )
+bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
-                //qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category);
+                //qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category);
 
         bool returnMe;
         QArray<int> cats;
diff --git a/core/pim/addressbook/abview.h b/core/pim/addressbook/abview.h
index 49bb4be..b8c8a08 100644
--- a/core/pim/addressbook/abview.h
+++ b/core/pim/addressbook/abview.h
@@ -1,12 +1,13 @@
 #ifndef _ABVIEW_H_
 #define _ABVIEW_H_
 
-#include <qwidget.h>
-#include <qwidgetstack.h> 
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
 
 #include <qpe/categories.h>
-#include <opie/ocontact.h>
-#include <opie/ocontactaccess.h>
+
+#include <qwidget.h>
+#include <qwidgetstack.h>
 
 #include "contacteditor.h"
 #include "abtable.h"
@@ -37,10 +38,10 @@ public:
     void setListOrder( const QValueList<int>& ordered );
 
     // Add Entry and put to current
-    void addEntry( const OContact &newContact );
+    void addEntry( const Opie::OPimContact &newContact );
     void removeEntry( const int UID );
-    void replaceEntry( const OContact &contact );
-    OContact currentEntry();
+    void replaceEntry( const Opie::OPimContact &contact );
+    Opie::OPimContact currentEntry();
 
     void inSearch()  { m_inSearch = true; }
     void offSearch();
@@ -62,7 +63,7 @@ private:
     void updateListinViews();
     void updateView( bool newdata = false ); 
     void clearForCategory();
-    bool contactCompare( const OContact &cnt, int category );
+    bool contactCompare( const Opie::OPimContact &cnt, int category );
     void parseName( const QString& name, QString *first, QString *middle,
                     QString * last );
 
@@ -74,9 +75,9 @@ private:
     Views m_prev_View;
     int m_curr_Contact;
     
-    OContactAccess* m_contactdb;
-    OContactAccess* m_storedDB;
-    OContactAccess::List m_list;
+    Opie::OPimContactAccess* m_contactdb;
+    Opie::OPimContactAccess* m_storedDB;
+    Opie::OPimContactAccess::List m_list;
 
     QWidgetStack* m_viewStack;
     AbTable* m_abTable;
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 8a5f9d5..9ae66d1 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -23,10 +23,10 @@
 #include "addressbook.h"
 
 
-#include <opie/ofileselector.h>
-#include <opie/ofiledialog.h>
-#include <opie/ocontact.h>
-#include <opie/ocontactaccessbackend_vcard.h>
+#include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccessbackend_vcard.h>
 
 #include <qpe/resource.h>
 #include <qpe/ir.h>
@@ -317,7 +317,7 @@ void AddressbookWindow::slotSetFont( int size )
 
 
 void AddressbookWindow::importvCard() {
-        QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
+        QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() ){
                 setDocument((const QString&) str );
         }
@@ -326,14 +326,14 @@ void AddressbookWindow::importvCard() {
 void AddressbookWindow::exportvCard()
 {
         qWarning(" void AddressbookWindow::exportvCard()");
-        QString filename = OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
+        QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
                 qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
-                OContact curCont = m_abView->currentEntry();
+                Opie::OPimContact curCont = m_abView->currentEntry();
                 if ( !curCont.isEmpty() ){
-                        OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+                        Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                                 filename );
-                        OContactAccess* access = new OContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
+                        Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
                         if ( access ){
                                 access->add( curCont );
                                 access->save();
@@ -371,10 +371,10 @@ void AddressbookWindow::setDocument( const QString &filename )
                 }
         }
 
-        OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+        Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                          filename );
-        OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
-        OContactAccess::List allList = access->allRecords();
+        Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
+        Opie::OPimContactAccess::List allList = access->allRecords();
         qWarning( "Found number of contacts in File: %d", allList.count() );
 
         if ( !allList.count() ) {
@@ -384,7 +384,7 @@ void AddressbookWindow::setDocument( const QString &filename )
         }
 
         bool doAsk = true;
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
                 qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
                 if ( doAsk ){
@@ -433,13 +433,13 @@ AddressbookWindow::~AddressbookWindow()
 
 void AddressbookWindow::slotUpdateToolbar()
 {
-         OContact ce = m_abView->currentEntry();
+         Opie::OPimContact ce = m_abView->currentEntry();
         actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
 }
 
 void AddressbookWindow::slotListNew()
 {
-        OContact cnt;
+        Opie::OPimContact cnt;
         if( !syncing ) {
                 editEntry( NewEntry );
         } else {
@@ -458,7 +458,7 @@ void AddressbookWindow::slotListNew()
 void AddressbookWindow::slotListDelete()
 {
         if(!syncing) {
-                OContact tmpEntry = m_abView ->currentEntry();
+                Opie::OPimContact tmpEntry = m_abView ->currentEntry();
 
                 // get a name, do the best we can...
                 QString strName = tmpEntry.fullName();
@@ -525,7 +525,7 @@ void AddressbookWindow::slotViewEdit()
 
 void AddressbookWindow::writeMail()
 {
-        OContact c = m_abView -> currentEntry();
+        Opie::OPimContact c = m_abView -> currentEntry();
         QString name = c.fileAs();
         QString email = c.defaultEmail();
 
@@ -565,16 +565,16 @@ static const char * beamfile = "/tmp/obex/contact.vcf";
 void AddressbookWindow::slotBeam()
 {
         QString beamFilename;
-        OContact c;
+        Opie::OPimContact c;
         if ( actionPersonal->isOn() ) {
                 beamFilename = addressbookPersonalVCardName();
                 if ( !QFile::exists( beamFilename ) )
                         return; // can't beam a non-existent file
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamFilename );
-                OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
-                OContactAccess::List allList = access->allRecords();
-                OContactAccess::List::Iterator it = allList.begin();  // Just take first
+                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
+                Opie::OPimContactAccess::List allList = access->allRecords();
+                Opie::OPimContactAccess::List::Iterator it = allList.begin();  // Just take first
                 c = *it;
 
                 delete access;
@@ -582,9 +582,9 @@ void AddressbookWindow::slotBeam()
                 unlink( beamfile ); // delete if exists
                 mkdir("/tmp/obex/", 0755);
                 c = m_abView -> currentEntry();
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                         beamfile );
-                OContactAccess* access = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
+                Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
                 access->add( c );
                 access->save();
                 delete access;
@@ -652,7 +652,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 QString name, email;
                 stream >> name >> email;
 
-                OContact cnt;
+                Opie::OPimContact cnt;
                 QString fn, mn, ln;
                 parseName( name, &fn, &mn, &ln );
                 //  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
@@ -722,7 +722,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
-        OContact entry;
+        Opie::OPimContact entry;
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
         }
@@ -738,12 +738,12 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
         if ( QPEApplication::execDialog( abEditor ) ) {
                 setFocus();
                 if ( entryMode == NewEntry ) {
-                        OContact insertEntry = abEditor->entry();
+                        Opie::OPimContact insertEntry = abEditor->entry();
                         insertEntry.assignUid();
                         m_abView -> addEntry( insertEntry );
                         m_abView -> setCurrentUid( insertEntry.uid() );
                 } else {
-                        OContact replEntry = abEditor->entry();
+                        Opie::OPimContact replEntry = abEditor->entry();
 
                         if ( !replEntry.isValidUid() )
                                 replEntry.assignUid();
@@ -757,7 +757,7 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 
 void AddressbookWindow::editPersonal()
 {
-        OContact entry;
+        Opie::OPimContact entry;
 
         // Switch to personal view if not selected
         // but take care of the menu, too
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index afd3b92..05f02c3 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -23,6 +23,6 @@ INTERFACES	= configdlg_base.ui
         TARGET  = addressbook
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/addressbook/config.in b/core/pim/addressbook/config.in
index 3377763..7ecf14c 100644
--- a/core/pim/addressbook/config.in
+++ b/core/pim/addressbook/config.in
@@ -1,4 +1,4 @@
   config ADDRESSBOOK
     boolean "opie-addressbook (a simple addressbook)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM && LIBOPIE2DB
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index dee0f11..6c98b5d 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,19 +1,19 @@
 #include "configdlg.h"
 
+#include <opie2/opimcontact.h>
+#include "opie2/opimcontactfields.h"
+
+#include <qpe/resource.h>
+
 #include <qcheckbox.h>
 #include <qradiobutton.h>
 #include <qlistbox.h>
 #include <qpushbutton.h>
 
-#include <qpe/resource.h>
-
-#include <opie/ocontact.h>
-#include "opie/ocontactfields.h"
-
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         ConfigDlg_Base(parent, name, true )
 {
-        contFields = OContactFields::trfields();
+        contFields = Opie::OPimContactFields::trfields();
 
         // We add all Fields into the Listbox
         for (uint i=0; i < contFields.count(); i++) {
@@ -31,8 +31,8 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         
 
         // Get the translation maps between Field ID and translated strings
-        m_mapStrToID = OContactFields::trFieldsToId();
-        m_mapIDToStr = OContactFields::idToTrFields();
+        m_mapStrToID = Opie::OPimContactFields::trFieldsToId();
+        m_mapIDToStr = Opie::OPimContactFields::idToTrFields();
 
         connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
         connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 8acf570..534666d 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -21,10 +21,11 @@
 
 #include "contacteditor.h"
 
+#include <opie2/opimcontact.h>
+
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
-#include <opie/ocontact.h>
 #include <qpe/resource.h>
 
 #include <qlabel.h>
@@ -51,7 +52,7 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 void parseEmailTo( const QString &strDefaultEmail,
                    const QString &strOtherEmail, QString &strBack );
 
-        ContactEditor::ContactEditor(const OContact &entry,
+        ContactEditor::ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent,
                                 const char *name,
                                 WFlags )
@@ -87,10 +88,10 @@ void ContactEditor::init() {
                 slBusinessAddress.append( "" );
         }
 
-        trlChooserNames   = OContactFields::trphonefields( false );
-        slChooserNames    = OContactFields::untrphonefields( false );
-        slDynamicEntries  = OContactFields::untrdetailsfields( false );
-        trlDynamicEntries = OContactFields::trdetailsfields( false );
+        trlChooserNames   = Opie::OPimContactFields::trphonefields( false );
+        slChooserNames    = Opie::OPimContactFields::untrphonefields( false );
+        slDynamicEntries  = Opie::OPimContactFields::untrdetailsfields( false );
+        trlDynamicEntries = Opie::OPimContactFields::trdetailsfields( false );
 
         // Ok, we have to remove elements from the list of dynamic entries
         // which are now stored in special (not dynamic) widgets..
@@ -101,7 +102,7 @@ void ContactEditor::init() {
 
         // The same with translated fields.. But I will
         // use the translation map to avoid mismatches..
-        QMap<int, QString> translMap = OContactFields::idToTrFields();
+        QMap<int, QString> translMap = Opie::OPimContactFields::idToTrFields();
         trlDynamicEntries.remove( translMap[Qtopia::Anniversary] );
         trlDynamicEntries.remove( translMap[Qtopia::Birthday] );
         trlDynamicEntries.remove( translMap[Qtopia::Gender] );
@@ -578,8 +579,8 @@ void ContactEditor::init() {
 
         // Create Labels and lineedit fields for every dynamic entry
         QStringList::ConstIterator it = slDynamicEntries.begin();
-        QMap<QString, int> mapStrToID = OContactFields::untrFieldsToId();
-        QMap<int, QString> mapIdToStr = OContactFields::idToTrFields();
+        QMap<QString, int> mapStrToID = Opie::OPimContactFields::untrFieldsToId();
+        QMap<int, QString> mapIdToStr = Opie::OPimContactFields::idToTrFields();
         for (i = counter; it != slDynamicEntries.end(); i++, ++it ) {
           
           if (((*it) == "Anniversary") || 
@@ -1250,7 +1251,7 @@ void ContactEditor::cleanupFields() {
         
 }
 
-void ContactEditor::setEntry( const OContact &entry ) {
+void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         
         initializing = true;
         
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index 72d14a9..1b86e6f 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -21,8 +21,8 @@
 #ifndef CONTACTEDITOR_H
 #define CONTACTEDITOR_H
 
-#include <opie/ocontact.h>
-#include <opie/ocontactfields.h>
+#include <opie2/opimcontact.h>
+#include <opie2/opimcontactfields.h>
 
 #include <qpe/datebookmonth.h>
 
@@ -56,19 +56,19 @@ class ContactEditor : public QDialog {
         Q_OBJECT
 
         public:
-                        ContactEditor(const OContact &entry,
+                        ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent = 0,
                                 const char *name = 0,
                                 WFlags fl = 0 );
                 ~ContactEditor();
                 void setNameFocus();
                 void setPersonalView( bool personal = true );
-                OContact entry() const { return ent; }
+                Opie::OPimContact entry() const { return ent; }
 
         public slots:
                 void slotNote();
                 void slotName();
-                void setEntry(const OContact &entry);
+                void setEntry(const Opie::OPimContact &entry);
 
         protected slots:
                 void accept();
@@ -113,9 +113,9 @@ class ContactEditor : public QDialog {
                 void populateDefaultEmailCmb();
                 void chooserChange( const QString&, int , QLineEdit*, int );
                 bool cmbChooserChange( int , QWidgetStack*, int );
-                OContactFields contactfields;
+                Opie::OPimContactFields contactfields;
 
-                OContact ent;
+                Opie::OPimContact ent;
 
                 QDialog *dlgNote;
                 QDialog *dlgName;
diff --git a/core/pim/addressbook/main.cpp b/core/pim/addressbook/main.cpp
index 47d370a..660fae6 100644
--- a/core/pim/addressbook/main.cpp
+++ b/core/pim/addressbook/main.cpp
@@ -21,7 +21,7 @@
 #include "addressbook.h"
 
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
-OPIE_EXPORT_APP( OApplicationFactory<AddressbookWindow> )
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<AddressbookWindow> )
 
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 2d30dc5..18a3791 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -5,7 +5,7 @@ Section: opie/pim
 Conflicts: qpe-tkcaddressbook
 Maintainer: Stefan Eilers <eilers.stefan@epost.de>
 Architecture: arm
-Depends: task-opie-minimal, libopie1, opie-pics
+Depends: task-opie-minimal, opie-pics, libopiecore2, libopieui2, libopiepim2, libopiedb2
 Description: Contacts
  A simple addressbook for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION