1 files changed, 12 insertions, 13 deletions

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
@@ -21,10 +21,9 @@
 
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
 #include <qpe/resource.h>
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
 
@@ -152,5 +151,5 @@ void AbTable::init()
 }
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
         qWarning("AbTable::setContacts()");
@@ -162,5 +161,5 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         setPaintingEnabled( FALSE );
         
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
         //int row = 0;
@@ -188,5 +187,5 @@ bool AbTable::selectContact( int UID )
         qWarning( "AbTable::selectContact( %d )", UID );
         int rows = numRows();
-        OContact* foundContact = 0l;
+        Opie::OPimContact* foundContact = 0l;
         bool found = false;
 
@@ -214,7 +213,7 @@ bool AbTable::selectContact( int UID )
 
 #if 0
-void AbTable::insertIntoTable( const OContact& cnt, int row )
+void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row )
 {
-        qWarning( "void AbTable::insertIntoTable( const OContact& cnt, %d )", row );
+        qWarning( "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, %d )", row );
         QString strName;
         ContactItem contactItem;
@@ -273,5 +272,5 @@ void AbTable::resort()
 }
 
-OContact AbTable::currentEntry()
+Opie::OPimContact AbTable::currentEntry()
         {
         return m_viewList[currentRow()];
@@ -395,5 +394,5 @@ void AbTable::moveTo( char c )
 #if 0
 // Useless.. Nobody uses it .. (se)
-QString AbTable::findContactName( const OContact &entry )
+QString AbTable::findContactName( const Opie::OPimContact &entry )
 {
         // We use the fileAs, then company, defaultEmail
@@ -551,5 +550,5 @@ QStringList AbTable::choiceSelection(int /*index*/) const
         QString selname = choicenames.at(index);
         for (each row) {
-        OContact *c = contactForRow(row);
+        Opie::OPimContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
         r.append(c->email);
@@ -632,5 +631,5 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
     //qWarning( "Paint row: %d", row );
 
-    OContact act_contact = m_viewList[row];
+    Opie::OPimContact act_contact = m_viewList[row];
 
     // Paint alternating background bars
@@ -685,5 +684,5 @@ void AbTable::rowHeightChanged( int row )
                 QTable::rowHeightChanged( row );
 }
-ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
+ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {