libopie -> libopie2

14 files changed, 123 insertions, 121 deletions

diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp
index 076e2e0..70a66a0 100644
--- a/core/pim/addressbook/ablabel.cpp
+++ b/core/pim/addressbook/ablabel.cpp
@@ -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( "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,22 +15,21 @@
 ** 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
@@ -146,27 +145,27 @@ void AbTable::init()
 	
 	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();
@@ -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,19 +207,19 @@ 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 );
@@ -267,17 +266,17 @@ 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() );
 }
@@ -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();
@@ -545,17 +544,17 @@ void AbTable::setChoiceSelection( const QValueList<int>& 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;
 }
@@ -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 ) );
@@ -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,19 +17,20 @@
 ** 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> 
 
 #if 0
@@ -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;
@@ -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 
 		// 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;
@@ -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,20 +33,20 @@ 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:
@@ -57,31 +58,31 @@ public slots:
     void slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, 
 		     bool backwards, QString category = QString::null );
     void slotSwitch(); 
 
 private:
     void updateListinViews();
     void updateView( bool newdata = false ); 
     void clearForCategory();
-    bool contactCompare( const OContact &cnt, int category );
+    bool contactCompare( const Opie::OPimContact &cnt, int category );
     void parseName( const QString& name, QString *first, QString *middle,
 		    QString * last );
 
     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,24 +1,24 @@
 #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 );	
@@ -26,18 +26,18 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
 	// 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()
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,20 +16,21 @@
  * 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>
@@ -46,17 +47,17 @@ static inline bool constainsWhiteSpace( const QString &str );
 // 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 )
@@ -82,31 +83,31 @@ void ContactEditor::init() {
 
 	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() );
 
@@ -573,18 +574,18 @@ 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") || 
 	      ((*it) == "Birthday")|| ((*it) == "Gender")) continue;
 
 	  l = new QLabel( mapIdToStr[mapStrToID[*it]], container );
 		listName.append( l );
 		gl->addWidget( l, i, 0 );
@@ -1245,17 +1246,17 @@ void ContactEditor::cleanupFields() {
 	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;
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,18 +16,18 @@
  * 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> 
@@ -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