14 files changed, 328 insertions, 326 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
@@ -34,3 +34,3 @@ AbLabel::~AbLabel()
 
-void AbLabel::setContacts( const OContactAccess::List& viewList )
+void AbLabel::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
@@ -50,3 +50,3 @@ int AbLabel::currentEntry_UID()
 {
-        OContact contact = currentEntry();
+        Opie::OPimContact contact = currentEntry();
 
@@ -58,3 +58,3 @@ int AbLabel::currentEntry_UID()
 
-OContact AbLabel::currentEntry()
+Opie::OPimContact AbLabel::currentEntry()
 {
@@ -63,3 +63,3 @@ OContact AbLabel::currentEntry()
         else
-                return OContact();
+                return Opie::OPimContact();
 }
@@ -111,3 +111,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                                 --m_itCurContact;
-                                if ( *m_itCurContact != OContact() )
+                                if ( *m_itCurContact != Opie::OPimContact() )
                                         sync();
@@ -120,3 +120,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                         qWarning( "DOWN..");
-        //              qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 
+        //              qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight());
         //              qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
@@ -128,3 +128,3 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
                                 ++m_itCurContact;
-                                if ( *m_itCurContact != OContact() )
+                                if ( *m_itCurContact != Opie::OPimContact() )
                                         sync();
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
@@ -22,6 +22,6 @@
 
-#include <opie/ocontact.h>
-#include <qtextview.h>
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
 
-#include <opie/ocontactaccess.h>
+#include <qtextview.h>
 
@@ -36,3 +36,3 @@ public:
     // Set the contacts
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
@@ -45,3 +45,3 @@ public:
     //
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
@@ -55,4 +55,4 @@ protected:
 private:
-    OContactAccess::List m_viewList;
-    OContactAccess::List::Iterator m_itCurContact;
+    Opie::OPimContactAccess::List m_viewList;
+    Opie::OPimContactAccess::List::Iterator m_itCurContact;
 
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
@@ -22,2 +22,4 @@
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
@@ -25,5 +27,2 @@
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
@@ -41,3 +40,3 @@
   \class AbTableItem abtable.h
-  
+
   \brief QTableItem based class for showing a field of an entry
@@ -68,3 +67,3 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
         sortKey = Qtopia::buildSortKey( txt, secondKey );
-        
+
         //    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
@@ -74,3 +73,3 @@ void AbTableItem::setItem( const QString &txt, const QString &secondKey )
   \class AbPickItem abtable.h
-  
+
   \brief QTableItem based class for showing slection of an entry
@@ -111,3 +110,3 @@ void AbPickItem::setContentFromEditor( QWidget *w )
   \class AbTable abtable.h
-  
+
   \brief QTable based class for showing a list of entries
@@ -145,3 +144,3 @@ void AbTable::init()
         setNumCols( 2 );
-        
+
         horizontalHeader()->setLabel( 0, tr( "Full Name" ));
@@ -153,3 +152,3 @@ void AbTable::init()
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
@@ -162,4 +161,4 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         setPaintingEnabled( FALSE );
-        
-        OContactAccess::List::Iterator it;
+
+        Opie::OPimContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
@@ -168,3 +167,3 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         //      insertIntoTable( *it, row++ );
-        
+
         // setSorting( true );
@@ -189,3 +188,3 @@ bool AbTable::selectContact( int UID )
         int rows = numRows();
-        OContact* foundContact = 0l;
+        Opie::OPimContact* foundContact = 0l;
         bool found = false;
@@ -215,11 +214,11 @@ 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;
-        
+
         strName = findContactName( cnt );
         contactItem = findContactContact( cnt, row );
-        
+
         AbTableItem *ati;
@@ -232,6 +231,6 @@ void AbTable::insertIntoTable( const OContact& cnt, int row )
         setItem( row, 1, ati );
-        
+
         //### cannot do this; table only has two columns at this point
         //    setItem( row, 2, new AbPickItem( this ) );
-        
+
 }
@@ -244,6 +243,6 @@ void AbTable::columnClicked( int col )
                 return;
-        
+
         if ( lastSortCol == -1 )
                 lastSortCol = col;
-        
+
         if ( col == lastSortCol ) {
@@ -274,4 +273,4 @@ void AbTable::resort()
 
-OContact AbTable::currentEntry()
-        {
+Opie::OPimContact AbTable::currentEntry()
+{
         return m_viewList[currentRow()];
@@ -333,6 +332,6 @@ void AbTable::keyPressEvent( QKeyEvent *e )
         char key = toupper( e->ascii() );
-        
+
         if ( key >= 'A' && key <= 'Z' )
                 moveTo( key );
-        
+
                 //qWarning("Received key ..");
@@ -355,3 +354,3 @@ void AbTable::keyPressEvent( QKeyEvent *e )
         }
-                
+
 }
@@ -361,3 +360,3 @@ void AbTable::moveTo( char c )
         qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
-        
+
 #if 0
@@ -396,3 +395,3 @@ void AbTable::moveTo( char c )
 // Useless.. Nobody uses it .. (se)
-QString AbTable::findContactName( const OContact &entry )
+QString AbTable::findContactName( const Opie::OPimContact &entry )
 {
@@ -477,8 +476,8 @@ void AbTable::fitColumns()
         qWarning( "void AbTable::fitColumns()" );
-        int contentsWidth = visibleWidth() / 2; 
+        int contentsWidth = visibleWidth() / 2;
         // Fix to better value
-        // contentsWidth = 130; 
+        // contentsWidth = 130;
 
         setPaintingEnabled( FALSE );
-        
+
         if ( columnVisible == false ){
@@ -487,3 +486,3 @@ void AbTable::fitColumns()
         }
-        
+
                 //qWarning("Width: %d", contentsWidth);
@@ -549,6 +548,6 @@ 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 ) {
@@ -557,3 +556,3 @@ QStringList AbTable::choiceSelection(int /*index*/) const
         }
-        
+
         */
@@ -571,5 +570,5 @@ void AbTable::updateVisible()
                 selectedRow = 0;
-                
+
         visible = 0;
-        
+
         setPaintingEnabled( FALSE );
@@ -594,3 +593,3 @@ void AbTable::updateVisible()
                 setCurrentCell( -1, 0 );
-        
+
         setPaintingEnabled( TRUE );
@@ -633,3 +632,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
-    OContact act_contact = m_viewList[row];
+    Opie::OPimContact act_contact = m_viewList[row];
 
@@ -655,3 +654,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     switch( col ){
-            case 0: 
+            case 0:
                     p->drawText( x + marg,2 + fm.ascent(), nameText );
@@ -663,3 +662,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
                     QString contactText = contactItem.value;
-                            
+
                     if ( !contactPic.isNull() )
@@ -667,3 +666,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
                                     p->drawPixmap( x + marg, y, contactPic );
-                                    p->drawText( x + marg + contactPic.width() 
+                                    p->drawText( x + marg + contactPic.width()
                                                  + 4,2 + fm.ascent(), contactText );
@@ -686,3 +685,3 @@ void AbTable::rowHeightChanged( int row )
 }
-ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
+ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {
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
@@ -24,5 +24,6 @@
 
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
+
 #include <qpe/categories.h>
-#include <opie/ocontact.h>
-#include <opie/ocontactaccess.h>
 
@@ -32,3 +33,3 @@
 #include <qcombobox.h>
-#include <qpixmap.h> 
+#include <qpixmap.h>
 
@@ -85,3 +86,3 @@ public:
     // Set the contacts shown in the table
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
@@ -92,5 +93,5 @@ public:
     bool selectContact( int UID );
-    
+
     // Get the current selected entry
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
@@ -99,3 +100,3 @@ public:
 
-    // QString findContactName( const OContact &entry );
+    // QString findContactName( const Opie::OPimContact &entry );
 
@@ -137,4 +138,4 @@ protected slots:
 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();
@@ -147,3 +148,3 @@ private:
     bool asc;
-    // QMap<AbTableItem*, OContact> contactList;
+    // QMap<AbTableItem*, Opie::OPimContact> contactList;
     QValueList<int> intFields;
@@ -154,3 +155,3 @@ private:
 
-    OContactAccess::List m_viewList;
+    Opie::OPimContactAccess::List m_viewList;
 
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
@@ -18,3 +18,3 @@
 
-#include <qlayout.h>
+#include <opie2/ocontactaccessbackend_vcard.h>
 
@@ -22,3 +22,3 @@
 
-#include <opie/ocontactaccessbackend_vcard.h>
+#include <qlayout.h>
 
@@ -55,3 +55,3 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         // 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
@@ -106,3 +106,3 @@ void AbView::setView( Views view )
 
-void AbView::addEntry( const OContact &newContact )
+void AbView::addEntry( const Opie::OPimContact &newContact )
 {
@@ -120,3 +120,3 @@ void AbView::removeEntry( const int UID )
 
-void AbView::replaceEntry( const OContact &contact )
+void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
@@ -128,5 +128,5 @@ void AbView::replaceEntry( const OContact &contact )
 
-OContact AbView::currentEntry()
+Opie::OPimContact AbView::currentEntry()
 {
-        OContact currentContact;
+        Opie::OPimContact currentContact;
 
@@ -159,3 +159,3 @@ void AbView::load()
         if ( m_inPersonal )
-                // VCard Backend does not sort.. 
+                // VCard Backend does not sort..
                 m_list = m_contactdb->allRecords();
@@ -230,3 +230,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 
-        OContact query;
+        Opie::OPimContact query;
         if ( c == 0 ){
@@ -235,5 +235,5 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
         }else{
-                // If the current Backend is unable to solve the query, we will 
+                // 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;
@@ -253,3 +253,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                 }
-                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 )
@@ -291,5 +291,5 @@ void AbView::showPersonal( bool personal )
 
-                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 );
 
@@ -320,3 +320,3 @@ void AbView::setCurrentUid( int uid ){
         m_curr_Contact = uid;
-        updateView( true ); //true: Don't modificate the UID ! 
+        updateView( true ); //true: Don't modificate the UID !
 }
@@ -403,6 +403,6 @@ 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 ){
@@ -418,5 +418,5 @@ 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);
 
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
@@ -3,8 +3,9 @@
 
-#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>
 
@@ -39,6 +40,6 @@ public:
     // 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();
 
@@ -56,5 +57,5 @@ signals:
 public slots:
-    void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 
+    void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
                      bool backwards, QString category = QString::null );
-    void slotSwitch(); 
+    void slotSwitch();
 
@@ -62,5 +63,5 @@ private:
     void updateListinViews();
-    void updateView( bool newdata = false ); 
+    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,
@@ -75,6 +76,6 @@ private:
     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;
 
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
@@ -25,6 +25,6 @@
 
-#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>
 
@@ -319,3 +319,3 @@ 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() ){
@@ -328,10 +328,10 @@ 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 ){
@@ -373,6 +373,6 @@ 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() );
@@ -386,3 +386,3 @@ 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 ){
@@ -435,3 +435,3 @@ void AddressbookWindow::slotUpdateToolbar()
 {
-         OContact ce = m_abView->currentEntry();
+         Opie::OPimContact ce = m_abView->currentEntry();
         actionMail->setEnabled( !ce.defaultEmail().isEmpty() );
@@ -441,3 +441,3 @@ void AddressbookWindow::slotListNew()
 {
-        OContact cnt;
+        Opie::OPimContact cnt;
         if( !syncing ) {
@@ -460,3 +460,3 @@ void AddressbookWindow::slotListDelete()
         if(!syncing) {
-                OContact tmpEntry = m_abView ->currentEntry();
+                Opie::OPimContact tmpEntry = m_abView ->currentEntry();
 
@@ -527,3 +527,3 @@ void AddressbookWindow::writeMail()
 {
-        OContact c = m_abView -> currentEntry();
+        Opie::OPimContact c = m_abView -> currentEntry();
         QString name = c.fileAs();
@@ -567,3 +567,3 @@ void AddressbookWindow::slotBeam()
         QString beamFilename;
-        OContact c;
+        Opie::OPimContact c;
         if ( actionPersonal->isOn() ) {
@@ -572,7 +572,7 @@ void AddressbookWindow::slotBeam()
                         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;
@@ -584,5 +584,5 @@ void AddressbookWindow::slotBeam()
                 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 );
@@ -654,3 +654,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
-                OContact cnt;
+                Opie::OPimContact cnt;
                 QString fn, mn, ln;
@@ -724,3 +724,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
 {
-        OContact entry;
+        Opie::OPimContact entry;
         if ( !abEditor ) {
@@ -740,3 +740,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
                 if ( entryMode == NewEntry ) {
-                        OContact insertEntry = abEditor->entry();
+                        Opie::OPimContact insertEntry = abEditor->entry();
                         insertEntry.assignUid();
@@ -745,3 +745,3 @@ void AddressbookWindow::editEntry( EntryMode entryMode )
                 } else {
-                        OContact replEntry = abEditor->entry();
+                        Opie::OPimContact replEntry = abEditor->entry();
 
@@ -759,3 +759,3 @@ void AddressbookWindow::editPersonal()
 {
-        OContact entry;
+        Opie::OPimContact entry;
 
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
@@ -25,3 +25,3 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lopiepim2 -lopiedb2
 
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
@@ -3,2 +3,2 @@
     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
@@ -2,2 +2,7 @@
 
+#include <opie2/opimcontact.h>
+#include "opie2/opimcontactfields.h"
+
+#include <qpe/resource.h>
+
 #include <qcheckbox.h>
@@ -7,7 +12,2 @@
 
-#include <qpe/resource.h>
-
-#include <opie/ocontact.h>
-#include "opie/ocontactfields.h"
-
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
@@ -15,3 +15,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 {
-        contFields = OContactFields::trfields();
+        contFields = Opie::OPimContactFields::trfields();
 
@@ -23,3 +23,3 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         // Reset Widget Flags: This was not changeable by designer :(
-                setWFlags ( WStyle_ContextHelp );
+        setWFlags ( WStyle_ContextHelp );
 
@@ -30,7 +30,7 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         m_removeButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/sub" ) ) );
-        
+
 
         // 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();
 
@@ -78,3 +78,3 @@ void ConfigDlg::slotItemAdd()
                 fieldListBox->insertItem( item );
-                }
+        }
 }
@@ -88,8 +88,8 @@ void ConfigDlg::slotItemRemove()
                 fieldListBox->removeItem( i );
-                }
+        }
 }
-    
+
 void ConfigDlg::setConfig( const AbConfig& cnf )
-{ 
-        m_config = cnf; 
+{
+        m_config = cnf;
 
@@ -107,3 +107,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
                 break;
-        case 1: 
+        case 1:
                 m_smallFont->setChecked( false );
@@ -112,3 +112,3 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
                 break;
-        case 2: 
+        case 2:
                 m_smallFont->setChecked( false );
@@ -126,5 +126,5 @@ void ConfigDlg::setConfig( const AbConfig& cnf )
 }
-    
+
 AbConfig ConfigDlg::getConfig()
-{ 
+{
         m_config.setUseRegExp( m_useRegExp->isOn() );
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
@@ -23,2 +23,4 @@
 
+#include <opie2/opimcontact.h>
+
 #include <qpe/categoryselect.h>
@@ -26,3 +28,2 @@
 #include <qpe/qpedialog.h>
-#include <opie/ocontact.h>
 #include <qpe/resource.h>
@@ -35,4 +36,4 @@
 #include <qtoolbutton.h>
-#include <qlistbox.h> 
-#include <qmessagebox.h> 
+#include <qlistbox.h>
+#include <qmessagebox.h>
 #include <qwhatsthis.h>
@@ -53,3 +54,3 @@ void parseEmailTo( const QString &strDefaultEmail,
 
-        ContactEditor::ContactEditor(const OContact &entry,
+        ContactEditor::ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent,
@@ -79,3 +80,3 @@ void ContactEditor::init() {
         qWarning("init() START");
-        
+
         uint i = 0;
@@ -89,6 +90,6 @@ void ContactEditor::init() {
 
-        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 );
 
@@ -103,3 +104,3 @@ void ContactEditor::init() {
         // 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] );
@@ -166,3 +167,3 @@ void ContactEditor::init() {
 
-        // Chooser 1 
+        // Chooser 1
         cmbChooserField1 = new QComboBox( FALSE, container );
@@ -531,3 +532,3 @@ void ContactEditor::init() {
 
-        QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
+        QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
                                                      tr( "Delete" ),
@@ -556,3 +557,3 @@ void ContactEditor::init() {
 
-        deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
+        deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
                                                      tr( "Delete" ),
@@ -580,7 +581,7 @@ void ContactEditor::init() {
         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") || 
+
+          if (((*it) == "Anniversary") ||
               ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
@@ -646,7 +647,7 @@ void ContactEditor::init() {
 
-        connect( txtFullName, SIGNAL(textChanged(const QString&)), 
+        connect( txtFullName, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotFullNameChange(const QString&)) );
-        connect( txtSuffix, SIGNAL(textChanged(const QString&)), 
+        connect( txtSuffix, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotSuffixChange(const QString&)) );
-         connect( txtOrganization, SIGNAL(textChanged(const QString&)), 
+         connect( txtOrganization, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotOrganizationChange(const QString&)) );
@@ -702,3 +703,3 @@ void ContactEditor::defaultEmailChanged(int i){
 
-void ContactEditor::populateDefaultEmailCmb(){       
+void ContactEditor::populateDefaultEmailCmb(){
 
@@ -707,6 +708,6 @@ void ContactEditor::populateDefaultEmailCmb(){
         if ( !cmbDefaultEmail ){
-                        cmbDefaultEmail = new QComboBox(this);
+                cmbDefaultEmail = new QComboBox(this);
                 cmbDefaultEmail -> hide();
         }
-        cmbDefaultEmail->clear();    
+        cmbDefaultEmail->clear();
         cmbDefaultEmail->insertStringList( emails );
@@ -726,3 +727,3 @@ void ContactEditor::populateDefaultEmailCmb(){
         }
-        
+
         // If the current default email is not found in the list, we choose the
@@ -743,8 +744,8 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
-        // Create and connect combobox for selecting the default email 
-        if ( type == "Default Email"){         
+        // Create and connect combobox for selecting the default email
+        if ( type == "Default Email"){
                 qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
-                
+
                 // More than one default-email chooser is not allowed !
-                if ( ( defaultEmailChooserPosition != -1 ) && 
+                if ( ( defaultEmailChooserPosition != -1 ) &&
                      defaultEmailChooserPosition != widgetPos && !initializing){
@@ -755,3 +756,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
-                if ( cmbo ){  
+                if ( cmbo ){
                         inputStack->raiseWidget( TextField );
@@ -770,3 +771,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 connect( cmbo,SIGNAL( activated(int) ),
-                         SLOT( defaultEmailChanged(int) ) ); 
+                         SLOT( defaultEmailChanged(int) ) );
 
@@ -775,3 +776,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
-                
+
         } else {
@@ -783,3 +784,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
-                if ( cmbo ){  
+                if ( cmbo ){
                         inputStack->raiseWidget( TextField );
@@ -803,3 +804,3 @@ void ContactEditor::chooserError( int index )
 {
-        qWarning("ContactEditor::chooserError( %d )", index); 
+        qWarning("ContactEditor::chooserError( %d )", index);
         QMessageBox::warning( this, "Chooser Error",
@@ -812,3 +813,3 @@ void ContactEditor::chooserError( int index )
         // Reset the selected Chooser. Unfortunately the chooser
-        // generates no signal, therfore we have to 
+        // generates no signal, therfore we have to
         // call the cmbChooserChange function manually..
@@ -819,3 +820,3 @@ void ContactEditor::chooserError( int index )
                 break;
-        case 2: 
+        case 2:
                 cmbChooserField2 -> setCurrentItem( 0 );
@@ -823,3 +824,3 @@ void ContactEditor::chooserError( int index )
                 break;
-        case 3: 
+        case 3:
                 cmbChooserField3 -> setCurrentItem( 0 );
@@ -827,3 +828,3 @@ void ContactEditor::chooserError( int index )
                 break;
-        case 4: 
+        case 4:
                 cmbChooserField4 -> setCurrentItem( 0 );
@@ -835,3 +836,3 @@ void ContactEditor::chooserError( int index )
 // Called when something was changed in a textfield (shouldn't it called textchanged? (se))
-void ContactEditor::chooserChange( const QString &textChanged, int index, 
+void ContactEditor::chooserChange( const QString &textChanged, int index,
                                    QLineEdit* , int widgetPos ) {
@@ -842,3 +843,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 
-        if ( type == "Default Email"){         
+        if ( type == "Default Email"){
                 qWarning ("??? Wozu??: %s", textChanged.latin1());
@@ -856,3 +857,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
         }
-        
+
         slChooserValues[index] = textChanged;
@@ -950,3 +951,3 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
         if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
-                
+
                 txtChooserField1->setText( slChooserValues[index] );
@@ -1051,3 +1052,3 @@ void ContactEditor::slotOrganizationChange( const QString &textChanged ){
         qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
-        // Special handling for storing Companies: 
+        // Special handling for storing Companies:
         // If no Fullname is given, we store the Company-Name as lastname
@@ -1056,3 +1057,3 @@ void ContactEditor::slotOrganizationChange( const QString &textChanged ){
                 txtFullName->setText( textChanged );
-        
+
 }
@@ -1139,3 +1140,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                 // A comma (",") separates the lastname from one or
-                // many first names. Thus, remove the lastname from the 
+                // many first names. Thus, remove the lastname from the
                 // String and parse the firstnames.
@@ -1156,3 +1157,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                         allSecondNames.append( *it );
-                
+
                 strMiddleName = allSecondNames.join(" ");
@@ -1161,3 +1162,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
-                // No comma separator used: We use the first word as firstname, the 
+                // No comma separator used: We use the first word as firstname, the
                 // last as second/lastname and everything in the middle as middlename
@@ -1170,6 +1171,6 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                         allSecondNames.append( *it );
-                
+
                 strMiddleName = allSecondNames.join(" ");
                 strLastName = *(--allNames.end());
-                
+
         }
@@ -1187,24 +1188,24 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                 return strFirstName + " " + strLastName;
-                
+
         case NAME_LF:
                 return strLastName + ", " + strFirstName;
-                
+
         case NAME_LFM:
                 return strLastName + ", " + strFirstName + " " + strMiddleName;
-                
+
         case NAME_FML:
                 return strFirstName + " " + strMiddleName + " " + strLastName ;
-                
+
         case NAME_F:
                 return strFirstName;
-                
+
         case NAME_M:
                 return strMiddleName;
-                
+
         case NAME_L:
                 return strLastName;
-                
+
         case NAME_S:
                 return txtSuffix->text();
-                
+
         }
@@ -1215,3 +1216,3 @@ void ContactEditor::cleanupFields() {
         QStringList::Iterator it = slChooserValues.begin();
-        
+
         for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
@@ -1219,3 +1220,3 @@ void ContactEditor::cleanupFields() {
         }
-        
+
         for ( int i = 0; i < 7; i++ ) {
@@ -1224,3 +1225,3 @@ void ContactEditor::cleanupFields() {
         }
-        
+
         QListIterator<QLineEdit> itLV( listValue );
@@ -1228,4 +1229,4 @@ void ContactEditor::cleanupFields() {
                 (*itLV)->setText( "" );
-        } 
-        
+        }
+
         txtFirstName->setText("");
@@ -1249,9 +1250,9 @@ void ContactEditor::cleanupFields() {
         txtTmp->setText("");
-        
+
 }
 
-void ContactEditor::setEntry( const OContact &entry ) {
-        
+void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
+
         initializing = true;
-        
+
         // Cleanup and activate the general Page ..
@@ -1259,5 +1260,5 @@ void ContactEditor::setEntry( const OContact &entry ) {
         tabMain->setCurrentPage( 0 );
-        
+
         ent = entry;
-        
+
         emails = QStringList(ent.emailList());
@@ -1266,3 +1267,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         qDebug("default email=%s",defaultEmail.latin1());
-        
+
         txtFirstName->setText( ent.firstName() );
@@ -1271,3 +1272,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         txtSuffix->setText( ent.suffix() );
-        
+
         // QString *tmpString = new QString;
@@ -1284,14 +1285,14 @@ void ContactEditor::setEntry( const OContact &entry ) {
         }
-        
+
         cmbFileAs->setEditText( ent.fileAs() );
-        
+
                 //if (hasTitle)
         txtJobTitle->setText( ent.jobTitle() );
-        
+
                 //if (hasCompany)
         txtOrganization->setText( ent.company() );
-        
+
                 //if (hasNotes)
         txtNote->setText( ent.notes() );
-        
+
                 //if (hasStreet) {
@@ -1300,3 +1301,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
                 //}
-        
+
                 //if (hasCity) {
@@ -1305,3 +1306,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         //}
-        
+
         //if (hasState) {
@@ -1310,3 +1311,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         //}
-        
+
         //if (hasZip) {
@@ -1315,3 +1316,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         //}
-        
+
         //if (hasCountry) {
@@ -1320,3 +1321,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
         //}
-        
+
         QStringList::ConstIterator it;
@@ -1324,26 +1325,26 @@ void ContactEditor::setEntry( const OContact &entry ) {
         for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
-                
+
                 qWarning(" Filling dynamic Field: %s", (*it).latin1() );
-                
+
                 if ( *it ==  "Department"  )
                         (*itLE)->setText( ent.department() );
-                
+
                 if ( *it == "Company" )
                         (*itLE)->setText( ent.company() );
-                
+
                 if ( *it ==  "Office" )
                         (*itLE)->setText( ent.office() );
-                
+
                 if ( *it ==  "Profession" )
                         (*itLE)->setText( ent.profession() );
-                
+
                 if ( *it == "Assistant" )
                         (*itLE)->setText( ent.assistant() );
-                
+
                 if ( *it == "Manager" )
                         (*itLE)->setText( ent.manager() );
-                
+
                 if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
-                
+
                 if ( *it == "Nickname" ){
@@ -1352,11 +1353,11 @@ void ContactEditor::setEntry( const OContact &entry ) {
                 }
-                
+
                 if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
-                
+
         }
-        
+
         QStringList::Iterator itV;
         for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
-                
+
                 if ( ( *it == "Business Phone") || ( *it == "Work Phone" ) )
@@ -1369,3 +1370,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
                         *itV = ent.businessFax();
-                
+
                 if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) )
@@ -1378,6 +1379,6 @@ void ContactEditor::setEntry( const OContact &entry ) {
                         *itV = ent.defaultEmail();
-                
+
                 if ( *it == "Emails" )
                         *itV = ent.emailList().join(", ");  // :SX
-                
+
                 if ( *it == "Home Phone" )
@@ -1390,3 +1391,3 @@ void ContactEditor::setEntry( const OContact &entry ) {
                         *itV = ent.homeFax();
-                
+
                 if ( *it == "Home Mobile" )
@@ -1396,6 +1397,6 @@ void ContactEditor::setEntry( const OContact &entry ) {
                   *itV = ent.carPhone();
-                  
+
                   if ( *it == "ISDN Phone" )
                   *itV = ent.ISDNPhone();
-                  
+
                   if ( *it == "Other Phone" )
@@ -1408,15 +1409,15 @@ void ContactEditor::setEntry( const OContact &entry ) {
                   *itV = ent.homePager();
-                  
+
                   if ( *it == "AIM IM" )
                   *itV = ent.AIMIM();
-                  
+
                   if ( *it == "ICQ IM" )
                   *itV = ent.ICQIM();
-                  
+
                   if ( *it == "Jabber IM" )
                   *itV = ent.jabberIM();
-                  
+
                   if ( *it == "MSN IM" )
                   *itV = ent.MSNIM();
-                  
+
                   if ( *it == "Yahoo IM" )
@@ -1426,19 +1427,19 @@ void ContactEditor::setEntry( const OContact &entry ) {
                         *itV = ent.homeWebpage();
-                
+
                 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
                         *itV = ent.businessWebpage();
-                
-                
+
+
         }
-        
-        
+
+
         cmbCat->setCategories( ent.categories(), "Contacts", tr("Contacts") );
-        
+
         QString gender = ent.gender();
         cmbGender->setCurrentItem( gender.toInt() );
-        
+
         txtNote->setText( ent.notes() );
-        
+
         slotAddressTypeChange( cmbAddress->currentItem() );
-        
+
         // Get combo-settings from contact and set preset..
@@ -1455,5 +1456,5 @@ void ContactEditor::setEntry( const OContact &entry ) {
         slotAddressTypeChange( cmbAddress->currentItem() );
-        
+
         updateDatePicker();
-        
+
         initializing = false;
@@ -1468,3 +1469,3 @@ void ContactEditor::updateDatePicker()
                 birthdayButton->setText( tr ("Unknown") );
-        
+
         if ( !ent.anniversary().isNull() ){
@@ -1474,3 +1475,3 @@ void ContactEditor::updateDatePicker()
                 anniversaryButton->setText( tr ("Unknown") );
-        
+
 }
@@ -1478,6 +1479,6 @@ void ContactEditor::updateDatePicker()
 void ContactEditor::saveEntry() {
-        
+
         // Store current combo into contact
         contactfields.saveToRecord( ent );
-        
+
         txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
@@ -1486,3 +1487,3 @@ void ContactEditor::saveEntry() {
         // txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
-        
+
         ent.setFirstName( txtFirstName->text() );
@@ -1491,17 +1492,17 @@ void ContactEditor::saveEntry() {
         ent.setSuffix( txtSuffix->text() );
-        
+
         ent.setFileAs( cmbFileAs->currentText() );
-        
+
         ent.setCategories( cmbCat->currentCategories() );
-        
-        
+
+
         //if (hasTitle)
         ent.setJobTitle( txtJobTitle->text() );
-        
+
         //if (hasCompany)
         ent.setCompany( txtOrganization->text() );
-        
+
                 //if (hasNotes)
         ent.setNotes( txtNote->text() );
-        
+
         //if (hasStreet) {
@@ -1510,3 +1511,3 @@ void ContactEditor::saveEntry() {
                 //}
-        
+
                 //if (hasCity) {
@@ -1515,3 +1516,3 @@ void ContactEditor::saveEntry() {
                 //}
-        
+
                 //if (hasState) {
@@ -1520,3 +1521,3 @@ void ContactEditor::saveEntry() {
                 //}
-        
+
                 //if (hasZip) {
@@ -1525,3 +1526,3 @@ void ContactEditor::saveEntry() {
                 //}
-        
+
                 //if (hasCountry) {
@@ -1530,3 +1531,3 @@ void ContactEditor::saveEntry() {
                 //}
-        
+
         QStringList::ConstIterator it;
@@ -1534,45 +1535,45 @@ void ContactEditor::saveEntry() {
         for ( it = slDynamicEntries.begin(); itLE.current() && it != slDynamicEntries.end(); ++it, ++itLE) {
-                
+
                 if ( *it == "Department" )
                         ent.setDepartment( (*itLE)->text() );
-                
+
                 if ( *it == "Company" )
                         ent.setCompany( (*itLE)->text() );
-                
+
                 if ( *it == "Office" )
                         ent.setOffice( (*itLE)->text() );
-                
+
                 if ( *it == "Profession" )
                         ent.setProfession( (*itLE)->text() );
-                
+
                 if ( *it == "Assistant" )
                         ent.setAssistant( (*itLE)->text() );
-                
+
                 if ( *it == "Manager" )
                         ent.setManager( (*itLE)->text() );
-                
+
                 if ( *it == "Spouse" )
                         ent.setSpouse( (*itLE)->text() );
-                
+
                 if ( *it == "Nickname" )
                         ent.setNickname( (*itLE)->text() );
-                
+
                 if ( *it == "Children" )
                         ent.setChildren( (*itLE)->text() );
-                
+
         }
-        
-        
+
+
         QStringList::ConstIterator itV;
         for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
-                
+
                 if ( ( *it == "Business Phone" ) || ( *it == "Work Phone"  ) )
                         ent.setBusinessPhone( *itV );
-                
+
                 if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
                         ent.setBusinessFax( *itV );
-                
+
                 if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
                         ent.setBusinessMobile( *itV );
-                
+
                 if ( *it == "Emails" ){
@@ -1588,30 +1589,30 @@ void ContactEditor::saveEntry() {
                 }
-                
+
                 if ( *it == "Default Email")
                         ent.setDefaultEmail( defaultEmail /* *itV */ );
-                
+
                 if ( *it == "Home Phone" )
                         ent.setHomePhone( *itV );
-                
+
                 if ( *it == "Home Fax" )
                         ent.setHomeFax( *itV );
-                
+
                 if ( *it == "Home Mobile" )
                         ent.setHomeMobile( *itV );
-                
+
                 if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
                         ent.setBusinessPager( *itV );
-                
+
                 if ( *it == "Home Web Page" )
                         ent.setHomeWebpage( *itV );
-                
+
                 if ( ( *it == "Business WebPage" ) || ( *it == "Work Web Page" ) )
                         ent.setBusinessWebpage( *itV );
-                
-                
+
+
         }
-        
+
         int gender = cmbGender->currentItem();
         ent.setGender( QString::number( gender ) );
-        
+
         QString str = txtNote->text();
@@ -1619,3 +1620,3 @@ void ContactEditor::saveEntry() {
                 ent.setNotes( str );
-        
+
 }
@@ -1700,3 +1701,3 @@ void ContactEditor::setPersonalView( bool personal )
         m_personalView = personal;
-        
+
         // Currently disbled due to the fact that
@@ -1704,3 +1705,3 @@ void ContactEditor::setPersonalView( bool personal )
         return;
-        
+
         if ( personal ){
@@ -1708,6 +1709,6 @@ void ContactEditor::setPersonalView( bool personal )
                 labCat->hide();
-                
+
         } else{
                 cmbCat->show();
-                        labCat->show();         
+                labCat->show();
         }
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
@@ -23,4 +23,4 @@
 
-#include <opie/ocontact.h>
-#include <opie/ocontactfields.h>
+#include <opie2/opimcontact.h>
+#include <opie2/opimcontactfields.h>
 
@@ -32,3 +32,3 @@
 #include <qstringlist.h>
-#include <qwidgetstack.h> 
+#include <qwidgetstack.h>
 
@@ -58,3 +58,3 @@ class ContactEditor : public QDialog {
         public:
-                        ContactEditor(const OContact &entry,
+                        ContactEditor(const Opie::OPimContact &entry,
                                 QWidget *parent = 0,
@@ -65,3 +65,3 @@ class ContactEditor : public QDialog {
                 void setPersonalView( bool personal = true );
-                OContact entry() const { return ent; }
+                Opie::OPimContact entry() const { return ent; }
 
@@ -70,3 +70,3 @@ class ContactEditor : public QDialog {
                 void slotName();
-                void setEntry(const OContact &entry);
+                void setEntry(const Opie::OPimContact &entry);
 
@@ -115,5 +115,5 @@ class ContactEditor : public QDialog {
                 bool cmbChooserChange( int , QWidgetStack*, int );
-                OContactFields contactfields;
+                Opie::OPimContactFields contactfields;
 
-                OContact ent;
+                Opie::OPimContact ent;
 
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
@@ -23,5 +23,5 @@
 
-#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
@@ -7,3 +7,3 @@ 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