libopie -> libopie2

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
@@ -27,46 +27,46 @@ AbLabel::AbLabel( QWidget *parent, const char *name ):
 	m_empty( false )
 {
 }
 
 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){
 		m_empty = false;
 		m_itCurContact = m_viewList.begin();
 		sync();
 	}else{
 		// m_itCurContact.clear();
 		m_empty = true;
 		setText( "" );
 	}
 }
 
 int AbLabel::currentEntry_UID()
 {
-	OContact contact = currentEntry();
+	Opie::OPimContact contact = currentEntry();
 
 	if ( contact.isEmpty() )
 		return 0;
 	else
 		return ( contact.uid() );
 }
 
-OContact AbLabel::currentEntry()
+Opie::OPimContact AbLabel::currentEntry()
 {
 	if ( ! m_empty )
 		return ( *m_itCurContact );
 	else
-		return OContact();
+		return Opie::OPimContact();
 }
 
 
 bool AbLabel::selectContact( int UID )
 {
 
 	for ( int r = 0; r < m_viewList.count(); ++r ) {
 		if ( m_viewList.uidAt( r ) == UID ){
@@ -104,34 +104,34 @@ void AbLabel::keyPressEvent( QKeyEvent *e )
 			break;
 		case Qt::Key_Up:
 			qWarning( "UP..");
 			if ( ( visibleHeight() < contentsHeight() ) &&
 			     ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) )
 				scrollBy( 0, -(visibleHeight()-20) );
 			else {
 				--m_itCurContact;
-				if ( *m_itCurContact != OContact() )
+				if ( *m_itCurContact != Opie::OPimContact() )
 					sync();
 				else
 					m_itCurContact = m_viewList.end();
 			}
 
 			break;
 		case Qt::Key_Down:
 			qWarning( "DOWN..");
-// 			qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight()); 
+// 			qWarning( "visible: %d, content: %d",visibleHeight(),contentsHeight());
 // 			qWarning( "value: %d; barMaxValue: %d", verticalScrollBar()->value()
 // 				  , verticalScrollBar()->maxValue() );
 			if ( ( visibleHeight() < contentsHeight() ) &&
 			     ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) )
 				scrollBy( 0, visibleHeight()-20 );
 			else {
 				++m_itCurContact;
-				if ( *m_itCurContact != OContact() )
+				if ( *m_itCurContact != Opie::OPimContact() )
 					sync();
 				else
 					m_itCurContact = m_viewList.begin();
 			}
 			break;
                 case Qt::Key_Return: // fall through
                 case Qt::Key_Space: // fall through
                 case Qt::Key_Enter: // we want to switch back
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
@@ -15,50 +15,50 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #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
 {
     Q_OBJECT
 
 public:
     AbLabel( QWidget *parent, const char *name = 0 );
     ~AbLabel();
 
     // Set the contacts
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
     // Selects a contact
     bool selectContact( int UID );
 
     // Get the UID of the current selected Entry
     int currentEntry_UID();
 
     //
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
 signals:
     void signalOkPressed();
 
 protected:
     void sync();
     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;
 
 };
 
 #endif // ABLABEL_H
 
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
@@ -15,36 +15,35 @@
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <ctype.h> //toupper() for key hack
 
 #if 0
 
 /*!
   \class AbTableItem abtable.h
-  
+
   \brief QTableItem based class for showing a field of an entry
 */
 
 AbTableItem::AbTableItem( QTable *t, EditType et, const QString &s,
 			  const QString &secondSortKey)
 	: QTableItem( t, et, s )
 {
 	//    sortKey = s.lower() + QChar( '\0' ) + secondSortKey.lower();
@@ -61,23 +60,23 @@ QString AbTableItem::key() const
 	return sortKey;
 }
 
 // A way to reset the item, without out doing a delete or a new...
 void AbTableItem::setItem( const QString &txt, const QString &secondKey )
 {
 	setText( txt );
 	sortKey = Qtopia::buildSortKey( txt, secondKey );
-	
+
 	//    sortKey = txt.lower() + QChar( '\0' ) + secondKey.lower();
 }
 
 /*!
   \class AbPickItem abtable.h
-  
+
   \brief QTableItem based class for showing slection of an entry
 */
 
 AbPickItem::AbPickItem( QTable *t ) :
 	QTableItem(t, WhenCurrent, "?")
 {
 }
 
@@ -104,17 +103,17 @@ void AbPickItem::setContentFromEditor( QWidget *w )
 	else
 		QTableItem::setContentFromEditor( w );
 }
 
 #endif
 
 /*!
   \class AbTable abtable.h
-  
+
   \brief QTable based class for showing a list of entries
 */
 
 AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name )
 	: QTable( parent, name ),
 	  lastSortCol( -1 ),
 	  asc( TRUE ),
 	  intFields( order ),
@@ -138,40 +137,40 @@ AbTable::~AbTable()
 {
 }
 
 void AbTable::init()
 {
 	// :SX showChar = '\0';
 	setNumRows( 0 );
 	setNumCols( 2 );
-	
+
 	horizontalHeader()->setLabel( 0, tr( "Full Name" ));
 	horizontalHeader()->setLabel( 1, tr( "Contact" ));
 	setLeftMargin( 0 );
 	verticalHeader()->hide();
 	columnVisible = true;
 }
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
 	qWarning("AbTable::setContacts()");
 
 	clear();
 	m_viewList = 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 )
 // 		insertIntoTable( *it, row++ );
-	
+
 // 	setSorting( true );
 
 // 	resort();
 
 	updateVisible();
 
 	setPaintingEnabled( TRUE );
 
@@ -182,17 +181,17 @@ void AbTable::setOrderedList( const QValueList<int> ordered )
 	intFields = ordered;
 }
 
 
 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 );
 	qWarning( "search start" );
 	for ( int r = 0; r < rows; ++r ) {
 		if ( m_viewList.uidAt( r ) == UID ){
 			ensureCellVisible( r, 0 );
 			setCurrentCell( r, 0 );
@@ -208,49 +207,49 @@ bool AbTable::selectContact( int UID )
 	}
 
 	setPaintingEnabled( TRUE );
 
 	return true;
 }
 
 #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;
 	ati = new AbTableItem( this, QTableItem::Never, strName, contactItem.value );
 	contactList.insert( ati, cnt );
 	setItem( row, 0, ati );
 	ati = new AbTableItem( this, QTableItem::Never, contactItem.value, strName);
 	if ( !contactItem.icon.isNull() )
 		ati->setPixmap( contactItem.icon );
 	setItem( row, 1, ati );
-	
+
 	//### cannot do this; table only has two columns at this point
 	//    setItem( row, 2, new AbPickItem( this ) );
-	
+
 }
 #endif
 
 
 void AbTable::columnClicked( int col )
 {
 	if ( !sorting() )
 		return;
-	
+
 	if ( lastSortCol == -1 )
 		lastSortCol = col;
-	
+
 	if ( col == lastSortCol ) {
 		asc = !asc;
 	} else {
 		lastSortCol = col;
 		asc = TRUE;
 	}
 	//QMessageBox::information( this, "resort", "columnClicked" );
 	resort();
@@ -267,18 +266,18 @@ void AbTable::resort()
 		sortColumn( lastSortCol, asc, TRUE );
 		//QMessageBox::information( this, "resort", "resort" );
 		updateVisible();
 	}
 	setPaintingEnabled( TRUE );
 #endif
 }
 
-OContact AbTable::currentEntry()
-{	
+Opie::OPimContact AbTable::currentEntry()
+{
 	return m_viewList[currentRow()];
 }
 
 int AbTable::currentEntry_UID()
 {
 	return ( currentEntry().uid() );
 }
 
@@ -326,20 +325,20 @@ void AbTable::refresh()
 	setPaintingEnabled( TRUE );
 
 #endif
 }
 
 void AbTable::keyPressEvent( QKeyEvent *e )
 {
 	char key = toupper( e->ascii() );
-	
+
 	if ( key >= 'A' && key <= 'Z' )
 		moveTo( key );
-	
+
 	//	qWarning("Received key ..");
 	switch( e->key() ) {
 	case Qt::Key_Space:
 	case Qt::Key_Return:
 	case Qt::Key_Enter:
 		emit signalSwitch();
 		break;
 // 	case Qt::Key_Up:
@@ -348,23 +347,23 @@ void AbTable::keyPressEvent( QKeyEvent *e )
 // 		break;
 // 	case Qt::Key_Down:
 // 		qWarning("b");
 // 		emit signalKeyDown();
 // 		break;
 	default:
 		QTable::keyPressEvent( e );
 	}
-		
+
 }
 
 void AbTable::moveTo( char c )
 {
 	qWarning( "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" );
-	
+
 #if 0
 	int rows = numRows();
 	QString value;
 	AbTableItem *abi;
 	int r;
 	if ( asc ) {
 		r = 0;
 		while ( r < rows-1) {
@@ -389,17 +388,17 @@ void AbTable::moveTo( char c )
 	}
 	setCurrentCell( r, currentColumn() );
 
 #endif
 }
 
 #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;
 	str = entry.fileAs();
 	if ( str.isEmpty() ) {
 		str = entry.company();
 		if ( str.isEmpty() ) {
 			str = entry.defaultEmail();
@@ -470,27 +469,27 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 //     return QMIN( pos/18, numRows()-1 );
 // }
 
 
 
 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 ){
 		showColumn(0);
 		columnVisible = true;
 	}
-	
+
 	//	qWarning("Width: %d", contentsWidth);
 
 	setColumnWidth( 0, contentsWidth );
 	adjustColumn(1);
 	if ( columnWidth(1) < contentsWidth )
 		setColumnWidth( 1, contentsWidth );
 
 	setPaintingEnabled( TRUE );
@@ -542,41 +541,41 @@ void AbTable::setChoiceSelection( const QValueList<int>& list )
 {
 	intFields = list;
 }
 
 QStringList AbTable::choiceSelection(int /*index*/) const
 {
 	QStringList r;
 	/* ######
-	   
+
 	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);
 	}
 	}
-	
+
 	*/
 	return r;
 }
 
 
 void AbTable::updateVisible()
 {
 	//	qWarning("void AbTable::updateVisible()");
 
 	int visible,
 		totalRows,
 		row,
 		selectedRow = 0;
-		
+
 	visible = 0;
-	
+
 	setPaintingEnabled( FALSE );
 
 	realignTable();
 
 	totalRows = numRows();
 	for ( row = 0; row < totalRows; row++ ) {
 		if ( rowHeight(row) == 0 ) {
 			showRow( row );
@@ -587,17 +586,17 @@ void AbTable::updateVisible()
 		visible++;
 	}
 
 	if ( selectedRow )
 		setCurrentCell( selectedRow, 0 );
 
 	if ( !visible )
 		setCurrentCell( -1, 0 );
-	
+
 	setPaintingEnabled( TRUE );
 }
 
 
 void AbTable::setPaintingEnabled( bool e )
 {
 	//	qWarning("IN void AbTable::setPaintingEnabled( %d )->Nested: %d", e, countNested );
 
@@ -626,17 +625,17 @@ void AbTable::viewportPaintEvent( QPaintEvent* e ) {
 
 void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool ) {
     const QColorGroup &cg = colorGroup();
 
     p->save();
 
     //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 ) {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) );
         p->setPen( QPen( cg.text() ) );
     }
     else {
         p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Background ) );
@@ -648,29 +647,29 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
     int marg = 2;
     int x = 0;
     int y = ( cr.height() - 14 ) / 2;
 
     QString nameText    = act_contact.fileAs();
 
     switch( col ){
-	    case 0: 
+	    case 0:
 		    p->drawText( x + marg,2 + fm.ascent(), nameText );
 	    break;
 	    case 1:{
 
 		    ContactItem contactItem = findContactContact( act_contact, 0 );
 		    QPixmap contactPic  = contactItem.icon; /* pixmap( row, col ); */
 		    QString contactText = contactItem.value;
-			    
+
 		    if ( !contactPic.isNull() )
 			    {
 				    p->drawPixmap( x + marg, y, contactPic );
-				    p->drawText( x + marg + contactPic.width() 
+				    p->drawText( x + marg + contactPic.width()
 						 + 4,2 + fm.ascent(), contactText );
 			    }
 		    else
 			    {
 				    p->drawText( x + marg,2 + fm.ascent(), contactText );
 			    }
 	    }
 	    break;
@@ -679,17 +678,17 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     p->restore();
 }
 
 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;
 
 	item.value = "";
 
 	for ( QValueList<int>::ConstIterator it = intFields.begin();
 	      it != intFields.end(); ++it ) {
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
@@ -17,25 +17,26 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #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>
 #include <qstringlist.h>
 #include <qcombobox.h>
-#include <qpixmap.h> 
+#include <qpixmap.h>
 
 #if 0
 class AbTableItem : public QTableItem
 {
 public:
     AbTableItem( QTable *t, EditType et, const QString &s,
 		 const QString &secondSortKey);
     QString entryKey() const;
@@ -78,31 +79,31 @@ class AbTable : public QTable
 {
     Q_OBJECT
 
 public:
     AbTable( const QValueList<int> ordered, QWidget *parent, const char *name=0 );
     ~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 );
 
     // Selects a contact of a specific UID
     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();
     void refresh();
 
     void show();
     void setPaintingEnabled( bool e );
     void viewportPaintEvent( QPaintEvent* e);
@@ -130,29 +131,29 @@ protected:
 
 protected slots:
     void moveTo( char );
     virtual void columnClicked( int col );
     void itemClicked(int,int col);
     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();
     void resort();
     void updateVisible();
 
     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
@@ -11,21 +11,21 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 **
 **********************************************************************/
 
 #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>
 
 
 // Is defined in LibQPE
 extern QString categoryFileName();
 
 QString addressbookPersonalVCardName()
@@ -48,17 +48,17 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
 	m_contactdb ( 0l ),
 	m_storedDB ( 0l ),
 	m_viewStack( 0l ),
 	m_abTable( 0l ),
 	m_orderedFields( 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() );
 
 	// Create Layout and put WidgetStack into it.
   	QVBoxLayout *vb = new QVBoxLayout( this );
  	m_viewStack = new QWidgetStack( this );
 	vb->addWidget( m_viewStack );
 
@@ -99,41 +99,41 @@ AbView::~AbView()
 
 void AbView::setView( Views view )
 {
 	qWarning("AbView::setView( Views view )");
  	m_curr_View = view;
  	load();
 }
 
-void AbView::addEntry( const OContact &newContact )
+void AbView::addEntry( const Opie::OPimContact &newContact )
 {
 	qWarning("abview:AddContact");
 	m_contactdb->add ( newContact );
 	load();
 
 }
 void AbView::removeEntry( const int UID )
 {
 	qWarning("abview:RemoveContact");
 	m_contactdb->remove( UID );
 	load();
 }
 
-void AbView::replaceEntry( const OContact &contact )
+void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
 	qWarning("abview:ReplaceContact");
 	m_contactdb->replace( contact );
 	load();
 
 }
 
-OContact AbView::currentEntry()
+Opie::OPimContact AbView::currentEntry()
 {
-	OContact currentContact;
+	Opie::OPimContact currentContact;
 
 	switch ( (int) m_curr_View ) {
 	case TableView:
 		currentContact = m_abTable -> currentEntry();
 		break;
 	case CardView:
 		currentContact = m_ablabel -> currentEntry();
 		break;
@@ -152,17 +152,17 @@ bool AbView::save()
 void AbView::load()
 {
 	qWarning("abView:Load data");
 
 	// Letter Search is stopped at this place
 	emit signalClearLetterPicker();
 
 	if ( m_inPersonal )
-		// VCard Backend does not sort.. 
+		// VCard Backend does not sort..
 		m_list = m_contactdb->allRecords();
 	else{
 		m_list = m_contactdb->sorted( true, 0, 0, 0 );
 		if ( m_curr_category != -1 )
 			clearForCategory();
 	}
 
 	qWarning ("Number of contacts: %d", m_list.count());
@@ -223,40 +223,40 @@ void AbView::setShowToView( Views view )
 }
 
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
 	qWarning("void AbView::setShowByLetter( %c, %d )", c, 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 
+		// 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;
 		}
 
 		switch( mode ){
 		case AbConfig::LastName:
 			query.setLastName( QString("%1*").arg(c) );
 			break;
 		case AbConfig::FileAs:
 			query.setFileAs( QString("%1*").arg(c) );
 			break;
 		default:
 			qWarning( "Unknown Searchmode for AbView::setShowByLetter ! -> %d", 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;
 	}
 	updateView( true );
 }
 
 void AbView::setListOrder( const QValueList<int>& ordered )
@@ -284,19 +284,19 @@ void AbView::showPersonal( bool personal )
 		if ( m_inPersonal )
 			return;
 
 		// Now switch to vCard Backend and load data.
 		// The current default backend will be stored
 		// 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;
 
 	}else{
 
 		if ( !m_inPersonal )
 			return;
@@ -313,17 +313,17 @@ void AbView::showPersonal( bool personal )
 
 	}
 	load();
 }
 
 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 !
 }
 
 
 QStringList AbView::categories()
 {
 	mCat.load( categoryFileName() );
 	QStringList categoryList = mCat.labels( "Contacts" );
 	return categoryList;
@@ -396,34 +396,34 @@ void AbView::slotSwitch(){
 	updateView();
 
 }
 
 // END: Slots
 
 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 ) ){
 				//				qWarning("Removing %d", (*it).uid());
 				m_list.remove( (*it).uid() );
 			}
 		}
 	}
 
 }
 
-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;
 	cats = cnt.categories();
 
 	//	qWarning ("Number of categories: %d", cats.count() );
 
 	returnMe = false;
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,17 +1,18 @@
 #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"
 #include "ablabel.h"
 #include "abconfig.h"
 
 class AbView: public QWidget
 {
@@ -32,56 +33,56 @@ public:
     void showPersonal( bool personal );
     void setCurrentUid( int uid );
     void setShowByCategory( const QString& cat );
     void setShowToView( Views view );
     void setShowByLetter( char c, AbConfig::LPSearchMode mode = AbConfig::LastName );
     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();
 
     QString showCategory() const;
     QStringList categories();
 
 signals:
 	void signalNotFound();
 	void signalClearLetterPicker();
 	void signalViewSwitched ( int );
 
 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();
 
 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,
 		    QString * last );
 
     Categories mCat;
     bool m_inSearch;
     bool m_inPersonal;
     int m_curr_category;
     Views m_curr_View;
     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;
     AbLabel* m_ablabel;
 
     QValueList<int> m_orderedFields;
 };
 
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
@@ -18,20 +18,20 @@
 **********************************************************************/
 
 #define QTOPIA_INTERNAL_FD
 
 // #include "addresssettings.h"
 #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>
 #include <qpe/qpemessagebox.h>
 #include <qmenubar.h>
 // #include <qtoolbar.h>
 // #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
@@ -312,33 +312,33 @@ void AddressbookWindow::slotSetFont( int size )
 // 		abList->resizeRows();
 		break;
 	}
 }
 
 
 
 void AddressbookWindow::importvCard() {
-        QString str = OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
+        QString str = Opie::Ui::OFileDialog::getOpenFileName( 1,"/");//,"", "*", this );
         if(!str.isEmpty() ){
 		setDocument((const QString&) str );
 	}
 
 }
 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();
 			}
 			delete access;
 		}else
 			QMessageBox::critical( 0, "Export VCard",
                            QString( tr( "You have to select a contact !") ) );
@@ -366,30 +366,30 @@ void AddressbookWindow::setDocument( const QString &filename )
 			break;
 		case 1:
 			qWarning("NO clicked");
 			return;
 			break;
 		}
 	}
 
-	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() ) {
 		QMessageBox::information( this, "Import VCard",
 					  "It was impossible to import\nthe VCard.\n"
 					  "The VCard may be corrupted!" );
 	}
 
 	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 ){
 			switch( QMessageBox::information( this, tr ( "Add Contact?" ),
 							  tr( "Do you really want add contact for \n%1?" )
 							  .arg( (*it).fullName().latin1() ),
 							  tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
 							  0,      // Enter == button 0
@@ -428,23 +428,23 @@ AddressbookWindow::~AddressbookWindow()
 	bool bDummy;
 	getLocation ( listTools, dock, dummy, bDummy, dummy );
 	m_config.setToolBarDock( dock );
 	m_config.save();
 }
 
 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 {
 		QMessageBox::warning(this, tr("Contacts"),
 				     tr("Can not edit data, currently syncing"));
 	}
 }
 
@@ -453,17 +453,17 @@ void AddressbookWindow::slotListNew()
 // 	m_abView -> init( abList->currentEntry() );
 // 	// :SX mView->sync();
 // 	//:SX	showView();
 // }
 
 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();
 		if ( strName.isEmpty() ) {
 			strName = tmpEntry.company();
 			if ( strName.isEmpty() )
 				strName = "No Name";
 		}
@@ -520,17 +520,17 @@ void AddressbookWindow::slotViewEdit()
 				      tr("Can not edit data, currently syncing") );
 	}
 }
 
 
 
 void AddressbookWindow::writeMail()
 {
-	OContact c = m_abView -> currentEntry();
+	Opie::OPimContact c = m_abView -> currentEntry();
 	QString name = c.fileAs();
 	QString email = c.defaultEmail();
 
 	// I prefer the OPIE-Environment variable before the
 	// QPE-one..
 	QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
 	if ( basepath.isEmpty() )
 		basepath = QString::fromLatin1( getenv("QPEDIR") );
@@ -560,36 +560,36 @@ void AddressbookWindow::writeMail()
 
 }
 
 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;
 	} else {
 		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;
 
 		beamFilename = beamfile;
 	}
 
 	qWarning("Beaming: %s", beamFilename.latin1() );
@@ -647,17 +647,17 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 	} else if (msg == "editPersonalAndClose()") {
 		editPersonal();
 		close();
 	} else if ( msg == "addContact(QString,QString)" ) {
 		QDataStream stream(data,IO_ReadOnly);
 		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() );
 		cnt.setFirstName( fn );
 		cnt.setMiddleName( mn );
 		cnt.setLastName( ln );
 		cnt.insertEmails( email );
 		cnt.setDefaultEmail( email );
@@ -717,52 +717,52 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
         if (needShow)
             QPEApplication::setKeepRunning();
 
 }
 
 void AddressbookWindow::editEntry( EntryMode entryMode )
 {
-	OContact entry;
+	Opie::OPimContact entry;
 	if ( !abEditor ) {
 		abEditor = new ContactEditor( entry, this, "editor" );
 	}
 	if ( entryMode == EditEntry )
 		abEditor->setEntry( m_abView -> currentEntry() );
 	else if ( entryMode == NewEntry )
 		abEditor->setEntry( entry );
 	// other things may change the caption.
 	abEditor->setCaption( tr("Edit Address") );
 
 	// fix the foxus...
 	abEditor->setNameFocus();
 	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();
 
 			m_abView -> replaceEntry( replEntry );
 		}
 	}
 	// populateCategories();
 
 }
 
 void AddressbookWindow::editPersonal()
 {
-	OContact entry;
+	Opie::OPimContact entry;
 
 	// Switch to personal view if not selected
 	// but take care of the menu, too
 	if ( ! actionPersonal->isOn() ){
 		qWarning("*** ++++");
 		actionPersonal->setOn( true );
 		slotPersonalView();
 	}
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
@@ -18,11 +18,11 @@ SOURCES	= main.cpp \
                   configdlg.cpp \
                   abconfig.cpp \
                   abview.cpp
 
 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,43 +1,43 @@
 #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++) {
 		allFieldListBox->insertItem( contFields[i] );
 	}
 
 	// Reset Widget Flags: This was not changeable by designer :(
-	setWFlags ( WStyle_ContextHelp );	
+	setWFlags ( WStyle_ContextHelp );
 
 	// Set Pics to Buttons and Tabs
 	m_upButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/up" ) ) );
 	m_downButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/down" ) ) );
 	m_addButton->setIconSet( QIconSet( Resource::loadPixmap( "addressbook/add" ) ) );
 	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();
 
 	connect ( m_addButton, SIGNAL( clicked() ), this, SLOT( slotItemAdd() ) );
 	connect ( m_removeButton, SIGNAL( clicked() ), this, SLOT( slotItemRemove() ) );
 	connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) );
 	connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) );
 }
 
 void ConfigDlg::slotItemUp()
@@ -71,67 +71,67 @@ void ConfigDlg::slotItemAdd()
 {
 	qWarning( "void ConfigDlg::slotItemAdd()" );
 
 	int i = allFieldListBox->currentItem();
 	if ( i > 0 ) {
 		QString item = allFieldListBox->currentText();
 		qWarning("ADding %s", item.latin1());
 		fieldListBox->insertItem( item );
-	}	
+	}
 }
 
 void ConfigDlg::slotItemRemove()
 {
 	qWarning( "void ConfigDlg::slotItemRemove()" );
 
 	int i = fieldListBox->currentItem();
 	if ( i > 0 ) {
 		fieldListBox->removeItem( i );
-	}	
+	}
 }
-    
+
 void ConfigDlg::setConfig( const AbConfig& cnf )
-{ 
-	m_config = cnf; 
+{
+	m_config = cnf;
 
 	m_useRegExp->setChecked( m_config.useRegExp() );
 	m_useWildCard->setChecked( m_config.useWildCards() );
 	m_useQtMail->setChecked( m_config.useQtMail() );
 	m_useOpieMail->setChecked( m_config.useOpieMail() );
 	m_useCaseSensitive->setChecked( m_config.beCaseSensitive() );
 
 	switch( m_config.fontSize() ){
 	case 0:
 		m_smallFont->setChecked( true );
 		m_normalFont->setChecked( false );
 		m_largeFont->setChecked( false );
 		break;
-	case 1: 
+	case 1:
 		m_smallFont->setChecked( false );
 		m_normalFont->setChecked( true );
 		m_largeFont->setChecked( false );
 		break;
-	case 2: 
+	case 2:
 		m_smallFont->setChecked( false );
 		m_normalFont->setChecked( false );
 		m_largeFont->setChecked( true );
 		break;
 	}
 
 	for( uint i = 0; i < m_config.orderList().count(); i++ ) {
 	        fieldListBox -> insertItem ( m_mapIDToStr[ m_config.orderList()[i] ] );
 	}
 
 	m_fixedBars->setChecked( m_config.fixedBars() );
 	m_moveBars->setChecked( !m_config.fixedBars() );
 }
-    
+
 AbConfig ConfigDlg::getConfig()
-{ 
+{
 	m_config.setUseRegExp( m_useRegExp->isOn() );
 	m_config.setUseWildCards( m_useWildCard->isOn() );
 	m_config.setUseQtMail( m_useQtMail->isOn() );
 	m_config.setUseOpieMail( m_useOpieMail->isOn() );
 	m_config.setBeCaseSensitive( m_useCaseSensitive->isChecked() );
 
 	if ( m_smallFont->isChecked() )
 		m_config.setFontSize( 0 );
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
@@ -16,47 +16,48 @@
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #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>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qtoolbutton.h>
-#include <qlistbox.h> 
-#include <qmessagebox.h> 
+#include <qlistbox.h>
+#include <qmessagebox.h>
 #include <qwhatsthis.h>
 
 #include <assert.h>
 
 static inline bool containsAlphaNum( const QString &str );
 static inline bool constainsWhiteSpace( const QString &str );
 
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll );
 
 // helper convert from file format to comma delimited...
 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 )
 	: QDialog( parent, name, TRUE, WStyle_ContextHelp ),
 	  defaultEmailChooserPosition( -1 ),
 	  m_personalView ( false ),
 	  cmbDefaultEmail( 0 ),
 	  initializing ( false )
@@ -72,41 +73,41 @@ ContactEditor::ContactEditor(	const OContact &entry,
 	initializing = false;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
 	qWarning("init() START");
-	
+
 	uint i = 0;
 
 	QStringList trlChooserNames;
 
 	for (i = 0; i <= 6; i++) {
 		slHomeAddress.append( "" );
 		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..
 	// Otherwise we will get problems with field assignments! (se)
 	slDynamicEntries.remove("Anniversary");
 	slDynamicEntries.remove("Birthday");
 	slDynamicEntries.remove("Gender");
 
 	// 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] );
 
 	// Last Check to be sure..
 	assert( slDynamicEntries.count() == trlDynamicEntries.count() );
 	assert( slChooserNames.count() == trlChooserNames.count() );
 
@@ -159,17 +160,17 @@ void ContactEditor::init() {
 
 	l = new QLabel( tr( "Organization" ), container );
 	QWhatsThis::add( l, tr( "The working place of the contact" ) );
 	gl->addWidget( l, 3, 0 );
 	txtOrganization = new QLineEdit( container );
 	QWhatsThis::add( txtOrganization, tr( "The working place of the contact" ) );
 	gl->addWidget( txtOrganization, 3, 1 );
 
-	// Chooser 1 
+	// Chooser 1
 	cmbChooserField1 = new QComboBox( FALSE, container );
 	QWhatsThis::add( cmbChooserField1, tr( "Press to select attribute to change" ) );
 	cmbChooserField1->setMaximumWidth( 90 );
 	gl->addWidget( cmbChooserField1, 4, 0 );
 	// Textfield for chooser 1.
 	// Now use Widgetstack to contain the textfield and the default-email combo !
 	m_widgetStack1 = new QWidgetStack( container );
 	txtChooserField1 = new QLineEdit( m_widgetStack1 );
@@ -524,17 +525,17 @@ void ContactEditor::init() {
  	QPopupMenu* m1 = new QPopupMenu( container );
  	birthdayPicker = new DateBookMonth( m1, 0, TRUE );
  	m1->insertItem( birthdayPicker );
 
 	birthdayButton= new QToolButton( hBox, "buttonStart" );
  	birthdayButton->setPopup( m1 );
 	birthdayButton->setPopupDelay(0);
 
-	QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
+	QPushButton* deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
 						     tr( "Delete" ),
 						     hBox, 0 );
 
 	gl->addWidget( hBox, counter , 1  );
 
 	connect( birthdayPicker, SIGNAL( dateClicked(int,int,int) ),
 		 this, SLOT( slotBirthdayDateChanged(int,int,int) ) );
 	connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveBirthday() ) );
@@ -549,17 +550,17 @@ void ContactEditor::init() {
  	m1 = new QPopupMenu( container );
  	anniversaryPicker = new DateBookMonth( m1, 0, TRUE );
  	m1->insertItem( anniversaryPicker );
 
 	anniversaryButton= new QToolButton( hBox, "buttonStart" );
  	anniversaryButton->setPopup( m1 );
 	anniversaryButton->setPopupDelay(0);
 
-	deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ), 
+	deleteButton = new QPushButton( QIconSet( Resource::loadPixmap( "trash" ) ),
 						     tr( "Delete" ),
 						     hBox, 0 );
 	gl->addWidget( hBox, counter , 1  );
 
 	connect( anniversaryPicker, SIGNAL( dateClicked(int,int,int) ),
 		 this, SLOT( slotAnniversaryDateChanged(int,int,int) ) );
 	connect( deleteButton, SIGNAL( clicked() ), this, SLOT( slotRemoveAnniversary() ) );
 
@@ -573,21 +574,21 @@ void ContactEditor::init() {
 	cmbGender->insertItem( tr("Male"), 1);
 	cmbGender->insertItem( tr("Female"), 2);
 	gl->addWidget( cmbGender, counter, 1 );
 
 	++counter;
 
 	// 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") || 
+
+	  if (((*it) == "Anniversary") ||
 	      ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
 
 	  l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
 		listName.append( l );
 		gl->addWidget( l, i, 0 );
 		QLineEdit *e = new QLineEdit( container );
 		listValue.append( e );
 		gl->addWidget( e, i, 1);
@@ -639,21 +640,21 @@ void ContactEditor::init() {
 	cmbChooserField4->insertStringList( trlChooserNames );
 
  	cmbChooserField1->setCurrentItem( 0 );
  	cmbChooserField2->setCurrentItem( 1 );
  	cmbChooserField3->setCurrentItem( 2 );
 
 	connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
 
-	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&)) );
 	connect( txtChooserField1, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser1Change(const QString&)) );
 	connect( txtChooserField2, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser2Change(const QString&)) );
 	connect( txtChooserField3, SIGNAL(textChanged(const QString&)),
                  this, SLOT(slotChooser3Change(const QString&)) );
 	connect( txtChooserField4, SIGNAL(textChanged(const QString&)),
@@ -695,98 +696,98 @@ void ContactEditor::defaultEmailChanged(int i){
 // 	int index = cmbChooserField1->currentItem();
 // 	slChooserValues[index] = cmbDefaultEmail->text(i);
 
 	defaultEmail = cmbDefaultEmail->text(i);
 	qDebug ("Changed to: %s", defaultEmail.latin1());
 
 }
 
-void ContactEditor::populateDefaultEmailCmb(){       
+void ContactEditor::populateDefaultEmailCmb(){
 
 	// if the default-email combo was not selected and therfore not created
 	// we get a lot of trouble.. Therfore create an invisible one..
 	if ( !cmbDefaultEmail ){
-		cmbDefaultEmail = new QComboBox(this);	
+		cmbDefaultEmail = new QComboBox(this);
 		cmbDefaultEmail -> hide();
 	}
-	cmbDefaultEmail->clear();    
+	cmbDefaultEmail->clear();
 	cmbDefaultEmail->insertStringList( emails );
 	// cmbDefaultEmail->show();
 
 	// Select default email in combo..
 	bool found = false;
 	for ( int i = 0; i < cmbDefaultEmail->count(); i++){
 		qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
 		       cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
 
 		if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
 			cmbDefaultEmail->setCurrentItem( i );
 			qDebug("set");
 			found = true;
 		}
 	}
-	
+
 	// If the current default email is not found in the list, we choose the
 	// first one..
 	if ( !found )
 		defaultEmail = cmbDefaultEmail->text(0);
 }
 
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
 	QString type = slChooserNames[index];
 	qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
 
 	if ( !initializing )
 		contactfields.setFieldOrder( widgetPos-1, index );
 
-	// 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){
 			chooserError( widgetPos );
 			return true;
 		}
 
 		QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
-		if ( cmbo ){  
+		if ( cmbo ){
 			inputStack->raiseWidget( TextField );
 			inputStack -> removeWidget( cmbo );
 			delete cmbo;
 		}
 		cmbo = new QComboBox( inputStack );
 		cmbo -> insertStringList( emails );
 
 		inputStack -> addWidget( cmbo, Combo );
 		inputStack -> raiseWidget( Combo );
 
 		defaultEmailChooserPosition = widgetPos;
 		cmbDefaultEmail = cmbo;
 
 		connect( cmbo,SIGNAL( activated(int) ),
-			 SLOT( defaultEmailChanged(int) ) ); 
+			 SLOT( defaultEmailChanged(int) ) );
 
 		// Set current default email
 		populateDefaultEmailCmb();
 
-		
+
 	} else {
 		// Something else was selected: Hide combo..
 		qWarning(" Hiding default-email combo" );
 		if ( defaultEmailChooserPosition == widgetPos ){
 			defaultEmailChooserPosition = -1;
 		}
 		QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
-		if ( cmbo ){  
+		if ( cmbo ){
 			inputStack->raiseWidget( TextField );
 			inputStack -> removeWidget( cmbo );
 			cmbDefaultEmail = 0l;
 			delete cmbo;
 		}
 
 		// Caller should initialize the responsible textfield, therefore
 		// "false" is returned
@@ -796,70 +797,70 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 	// Everything is worked off ..
 	return true;
 
 }
 
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
-	qWarning("ContactEditor::chooserError( %d )", index); 
+	qWarning("ContactEditor::chooserError( %d )", index);
 	QMessageBox::warning( this, "Chooser Error",
 			      "Multiple selection of this\n"
 			      "Item is not allowed !\n\n"
 			      "First deselect the previous one !",
 			      "&OK", 0, 0,
 			      0, 0 );
 
 	// 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..
 	switch( index ){
 	case 1:
 		cmbChooserField1 -> setCurrentItem( 0 );
 		slotCmbChooser1Change( 0 );
 		break;
-	case 2: 
+	case 2:
 		cmbChooserField2 -> setCurrentItem( 0 );
 		slotCmbChooser2Change( 0 );
 		break;
-	case 3: 
+	case 3:
 		cmbChooserField3 -> setCurrentItem( 0 );
 		slotCmbChooser3Change( 0 );
 		break;
-	case 4: 
+	case 4:
 		cmbChooserField4 -> setCurrentItem( 0 );
 		slotCmbChooser4Change( 0 );
 		break;
 	}
 }
 
 // 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 ) {
 
 	QString type = slChooserNames[index]; // :SX
 	qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",
 	       type.latin1(),textChanged.latin1(), index,  widgetPos );
 
-        if ( type == "Default Email"){         
+        if ( type == "Default Email"){
 		qWarning ("??? Wozu??: %s", textChanged.latin1());
 		defaultEmail = textChanged;
 
 		populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
 		qDebug("emails");
 
 		QString de;
 		emails = QStringList::split (",", textChanged );
 
 		populateDefaultEmailCmb();
 	}
-	
+
 	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 	qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1());
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
@@ -943,17 +944,17 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
 		slHomeAddress[6] = textChanged;
 	}
 }
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
 	qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
 	if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
-		
+
 		txtChooserField1->setText( slChooserValues[index] );
 		txtChooserField1->setFocus();
 
 	}
 
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
@@ -1044,22 +1045,22 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
 void ContactEditor::slotSuffixChange( const QString& ) {
 	// Just want to update the FileAs combo if the suffix was changed..
 	slotFullNameChange( txtFullName->text() );
 }
 
 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
 	// to handle it like a person..
 	if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
 		txtFullName->setText( textChanged );
-	
+
 }
 
 void ContactEditor::accept() {
 
 	if ( isEmpty() ) {
 		cleanupFields();
 		reject();
 	} else {
@@ -1132,107 +1133,107 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
 	qWarning("Fullname: %s", simplifiedName.latin1());
 
 	commapos = simplifiedName.find( ',', 0, TRUE);
 	if ( commapos >= 0 ) {
 		qWarning(" Commapos: %d", commapos );
 
 		// 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.
 
 		strLastName = simplifiedName.left( commapos );
 		simplifiedName= simplifiedName.mid( commapos + 1 );
 		haveLastName = true;
 		qWarning("Fullname without ',': %s", simplifiedName.latin1());
 
 		// If we have any lastname, we should now split all first names.
 		// The first one will be the used as first, the rest as "middle names"
 
 		QStringList allFirstNames = QStringList::split(" ", simplifiedName);
 		QStringList::Iterator it = allFirstNames.begin();
 		strFirstName = *it++;
 		QStringList allSecondNames;
 		for ( ; it != allFirstNames.end(); ++it )
 			allSecondNames.append( *it );
-		
+
 		strMiddleName = allSecondNames.join(" ");
 
 	} else {
 
-		// 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
 
 		QStringList allNames = QStringList::split(" ", simplifiedName);
 		QStringList::Iterator it = allNames.begin();
 		strFirstName = *it++;
 		QStringList allSecondNames;
 		for ( ; it != --allNames.end(); ++it )
 			allSecondNames.append( *it );
-		
+
 		strMiddleName = allSecondNames.join(" ");
 		strLastName = *(--allNames.end());
-		
+
 	}
 
 	if ( strFirstName == strLastName )
 		strFirstName = "";
 
 	qWarning(" strFirstName: %s",  strFirstName.latin1());
 	qWarning(" strMiddleName: %s",  strMiddleName.latin1());
 	qWarning(" strLastName: %s",  strLastName.latin1());
 	qWarning(" strTitle: %s",  strTitle.latin1());
 
 	switch (type) {
 	case NAME_FL:
 		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();
-		
+
 	}
 	return QString::null;
 }
 
 void ContactEditor::cleanupFields() {
 	QStringList::Iterator it = slChooserValues.begin();
-	
+
 	for ( int i = 0; it != slChooserValues.end(); i++, ++it ) {
 		(*it) = "";
 	}
-	
+
 	for ( int i = 0; i < 7; i++ ) {
 		slHomeAddress[i] = "";
 		slBusinessAddress[i] = "";
 	}
-	
+
 	QListIterator<QLineEdit> itLV( listValue );
 	for ( ; itLV.current(); ++itLV ) {
 		(*itLV)->setText( "" );
-	} 
-        
+	}
+
 	txtFirstName->setText("");
 	txtMiddleName->setText("");
 	txtLastName->setText("");
 	txtSuffix->setText("");
 	txtNote->setText("");
 	txtFullName->setText("");
 	txtJobTitle->setText("");
 	txtOrganization->setText("");
@@ -1242,387 +1243,387 @@ void ContactEditor::cleanupFields() {
 	txtAddress->setText("");
 	txtCity->setText("");
 	txtState->setText("");
 	txtZip->setText("");
 	QLineEdit *txtTmp = cmbCountry->lineEdit();
 	txtTmp->setText("");
 	txtTmp = cmbFileAs->lineEdit();
 	txtTmp->setText("");
-	
+
 }
 
-void ContactEditor::setEntry( const OContact &entry ) {
-	
+void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
+
 	initializing = true;
-	
+
 	// Cleanup and activate the general Page ..
 	cleanupFields();
 	tabMain->setCurrentPage( 0 );
-	
+
 	ent = entry;
-	
+
 	emails = QStringList(ent.emailList());
 	defaultEmail = ent.defaultEmail();
 	if (defaultEmail.isEmpty()) defaultEmail = emails[0];
 	qDebug("default email=%s",defaultEmail.latin1());
-	
+
 	txtFirstName->setText( ent.firstName() );
 	txtMiddleName->setText( ent.middleName() );
 	txtLastName->setText( ent.lastName() );
 	txtSuffix->setText( ent.suffix() );
-	
+
 // 	QString *tmpString = new QString;
 // 	*tmpString = ent.firstName() + " " + ent.middleName() +
 // 		+ " " + ent.lastName() + " " + ent.suffix();
 //	txtFullName->setText( tmpString->simplifyWhiteSpace() );
 
 	if ( !ent.isEmpty() ){
 		// Lastnames with multiple words need to be protected by a comma !
 		if ( ent.lastName().contains( ' ', TRUE ) )
 			txtFullName->setText( ent.lastName() + ", " + ent.firstName() + " " + ent.middleName() );
 		else
 			txtFullName->setText( ent.firstName() + " " + ent.middleName() + " " + ent.lastName() );
 	}
-	
+
 	cmbFileAs->setEditText( ent.fileAs() );
-	
+
 	//	if (hasTitle)
 	txtJobTitle->setText( ent.jobTitle() );
-	
+
 	//	if (hasCompany)
 	txtOrganization->setText( ent.company() );
-	
+
 	//	if (hasNotes)
 	txtNote->setText( ent.notes() );
-	
+
 	//	if (hasStreet) {
 	slHomeAddress[0] = ent.homeStreet();
 	slBusinessAddress[0] = ent.businessStreet();
 	//	}
-	
+
 	//	if (hasCity) {
 	slHomeAddress[3] = ent.homeCity();
 	slBusinessAddress[3] = ent.businessCity();
 	//}
-	
+
 	//if (hasState) {
 	slHomeAddress[4] = ent.homeState();
 	slBusinessAddress[4] = ent.businessState();
 	//}
-	
+
 	//if (hasZip) {
 	slHomeAddress[5] = ent.homeZip();
 	slBusinessAddress[5] = ent.businessZip();
 	//}
-	
+
 	//if (hasCountry) {
 	slHomeAddress[6] = ent.homeCountry();
 	slBusinessAddress[6] = ent.businessCountry();
 	//}
-	
+
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
 	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" ){
 			qWarning("**** Nichname: %s", ent.nickname().latin1() );
 			(*itLE)->setText( ent.nickname() );
 		}
-		
+
 		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" ) )
 			*itV = ent.businessPhone();
 		/*
 		  if ( *it == "Business 2 Phone" )
 		  *itV = ent.business2Phone();
 		  */
 		if ( ( *it == "Business Fax") || ( *it == "Work Fax" ) )
 			*itV = ent.businessFax();
-		
+
 		if ( ( *it == "Business Mobile" ) || ( *it == "work Mobile" ) )
 			*itV = ent.businessMobile();
 		/*
 		  if ( *it == "Company Phone" )
 		  *itV = ent.companyPhone();
 		  */
 		if ( *it == "Default Email" )
 			*itV = ent.defaultEmail();
-		
+
 		if ( *it == "Emails" )
 			*itV = ent.emailList().join(", ");  // :SX
-		
+
 		if ( *it == "Home Phone" )
 			*itV = ent.homePhone();
 		/*
 		  if ( *it == "Home 2 Phone" )
 		  *itV = ent.home2Phone();
 		  */
 		if ( *it == "Home Fax" )
 			*itV = ent.homeFax();
-		
+
 		if ( *it == "Home Mobile" )
 			*itV = ent.homeMobile();
 		/*
 		  if ( *it == "Car Phone" )
 		  *itV = ent.carPhone();
-		  
+
 		  if ( *it == "ISDN Phone" )
 		  *itV = ent.ISDNPhone();
-		  
+
 		  if ( *it == "Other Phone" )
 		  *itV = ent.otherPhone();
 		  */
 		if ( ( *it == "Business Pager" ) || ( *it == "Work Pager" ) )
 			*itV = ent.businessPager();
 		/*
 		  if ( *it == "Home Pager")
 		  *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" )
 		  *itV = ent.yahooIM();
 		  */
 		if ( *it == "Home Web Page" )
 			*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..
 	contactfields.loadFromRecord( ent );
 	cmbChooserField1->setCurrentItem( contactfields.getFieldOrder(0, 7) );
 	cmbChooserField2->setCurrentItem( contactfields.getFieldOrder(1, 9) );
 	cmbChooserField3->setCurrentItem( contactfields.getFieldOrder(2, 0) );
 	cmbChooserField4->setCurrentItem( contactfields.getFieldOrder(3, 6) );
 	cmbAddress->setCurrentItem( contactfields.getFieldOrder(4, 1) );
 	slotCmbChooser1Change( cmbChooserField1->currentItem() );
 	slotCmbChooser2Change( cmbChooserField2->currentItem() );
 	slotCmbChooser3Change( cmbChooserField3->currentItem() );
 	slotCmbChooser4Change( cmbChooserField4->currentItem() );
 	slotAddressTypeChange( cmbAddress->currentItem() );
-	
+
 	updateDatePicker();
-	
+
 	initializing = false;
 }
 void ContactEditor::updateDatePicker()
 {
 	// Set DatePicker
 	if ( !ent.birthday().isNull() ){
 		birthdayButton->setText( TimeString::numberDateString( ent.birthday() ) );
 		birthdayPicker->setDate( ent.birthday() );
 	} else
 		birthdayButton->setText( tr ("Unknown") );
-	
+
 	if ( !ent.anniversary().isNull() ){
 		anniversaryButton->setText( TimeString::numberDateString( ent.anniversary() ) );
 		anniversaryPicker->setDate( ent.anniversary() );
 	} else
 		anniversaryButton->setText( tr ("Unknown") );
-	
+
 }
 
 void ContactEditor::saveEntry() {
-	
+
 	// Store current combo into contact
 	contactfields.saveToRecord( ent );
-	
+
 	txtFirstName->setText( parseName( txtFullName->text(), NAME_F ) );
 	txtMiddleName->setText( parseName( txtFullName->text(), NAME_M ) );
 	txtLastName->setText( parseName( txtFullName->text(), NAME_L ) );
 	// txtSuffix->setText( parseName( txtFullName->text(), NAME_S ) );
-	
+
 	ent.setFirstName( txtFirstName->text() );
 	ent.setLastName( txtLastName->text() );
 	ent.setMiddleName( txtMiddleName->text() );
 	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) {
 	ent.setHomeStreet( slHomeAddress[0] );
 	ent.setBusinessStreet( slBusinessAddress[0] );
 	//	}
-	
+
 	//	if (hasCity) {
 	ent.setHomeCity( slHomeAddress[3] );
 	ent.setBusinessCity( slBusinessAddress[3] );
 	//	}
-	
+
 	//	if (hasState) {
 	ent.setHomeState( slHomeAddress[4] );
 	ent.setBusinessState( slBusinessAddress[4] );
 	//	}
-	
+
 	//	if (hasZip) {
 	ent.setHomeZip( slHomeAddress[5] );
 	ent.setBusinessZip( slBusinessAddress[5] );
 	//	}
-	
+
 	//	if (hasCountry) {
 	ent.setHomeCountry( slHomeAddress[6] );
 	ent.setBusinessCountry( slBusinessAddress[6] );
 	//	}
-	
+
 	QStringList::ConstIterator it;
 	QListIterator<QLineEdit> itLE( listValue );
 	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" ){
  			QString allemail;
  			QString defaultmail;
 			parseEmailFrom( emails.join(","), defaultmail, allemail );
 			if ( defaultEmail.isEmpty() ){
 				qWarning("Default email was not set by user!");
 				qWarning("Using first email in list: %s", defaultmail.latin1());
 				ent.setDefaultEmail( defaultmail );
 			}
  			ent.setEmails( allemail );
 		}
-		
+
 		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();
 	if ( !str.isNull() )
 		ent.setNotes( str );
-	
+
 }
 
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
 		     QString &strAll )
 {
 	int where,
 		start;
 	if ( txt.isEmpty() )
@@ -1693,28 +1694,28 @@ static inline bool constainsWhiteSpace( const QString &str )
 		if ( str[i].isSpace() )
 			return TRUE;
 	return FALSE;
 }
 
 void ContactEditor::setPersonalView( bool personal )
 {
 	m_personalView = personal;
-	
+
 	// Currently disbled due to the fact that
 	// show will not work...
 	return;
-	
+
 	if ( personal ){
 		cmbCat->hide();
 		labCat->hide();
-		
+
 	} else{
 		cmbCat->show();
-		labCat->show();		
+		labCat->show();
 	}
 }
 
 void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
 {
 	QDate date;
 	date.setYMD( year, month, day );
 	QString dateString = TimeString::numberDateString( date );
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
@@ -16,26 +16,26 @@
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #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>
 
 #include <qdialog.h>
 #include <qlist.h>
 #include <qmap.h>
 #include <qstringlist.h>
-#include <qwidgetstack.h> 
+#include <qwidgetstack.h>
 
 const int NAME_LF  = 0;
 const int NAME_LFM = 1;
 const int NAME_FL  = 2;
 const int NAME_FML = 3;
 
 const int NAME_F = 4;
 const int NAME_M = 5;
@@ -51,29 +51,29 @@ class QComboBox;
 class QPushButton;
 class CategorySelect;
 class QLabel;
 
 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();
 
 	private:
 		void init();
 		void saveEntry();
 		bool isEmpty();
@@ -108,19 +108,19 @@ class ContactEditor : public QDialog {
 		void defaultEmailChanged(int);
 
 	private:
 		enum StackWidgets { TextField = 1, Combo };
 		int defaultEmailChooserPosition;
 		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;
 
 		QList<QLineEdit> listValue;
 		QList<QLabel> listName;
 
 		QStringList slDynamicEntries;
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
@@ -16,12 +16,12 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #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
@@ -1,11 +1,11 @@
 Package: opie-addressbook
 Files: plugins/application/libaddressbook.so* bin/addressbook apps/1Pim/addressbook.desktop
 Priority: optional
 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