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
@@ -22,2 +22,4 @@
 
+#include <opie2/opimrecordlist.h>
+
 #include <qpe/timestring.h>
@@ -25,5 +27,2 @@
 
-#include <opie/orecordlist.h>
-
-
 #include "abtable.h"
@@ -153,3 +152,3 @@ void AbTable::init()
 
-void AbTable::setContacts( const OContactAccess::List& viewList )
+void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList )
 {
@@ -163,3 +162,3 @@ void AbTable::setContacts( const OContactAccess::List& viewList )
         
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         setNumRows( m_viewList.count() );
@@ -189,3 +188,3 @@ bool AbTable::selectContact( int UID )
         int rows = numRows();
-        OContact* foundContact = 0l;
+        Opie::OPimContact* foundContact = 0l;
         bool found = false;
@@ -215,5 +214,5 @@ 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;
@@ -274,3 +273,3 @@ void AbTable::resort()
 
-OContact AbTable::currentEntry()
+Opie::OPimContact AbTable::currentEntry()
         {
@@ -396,3 +395,3 @@ void AbTable::moveTo( char c )
 // Useless.. Nobody uses it .. (se)
-QString AbTable::findContactName( const OContact &entry )
+QString AbTable::findContactName( const Opie::OPimContact &entry )
 {
@@ -552,3 +551,3 @@ QStringList AbTable::choiceSelection(int /*index*/) const
         for (each row) {
-        OContact *c = contactForRow(row);
+        Opie::OPimContact *c = contactForRow(row);
         if ( text(row,2) == selname ) {
@@ -633,3 +632,3 @@ void AbTable::paintCell(QPainter* p,  int row, int col, const QRect& cr, bool )
 
-    OContact act_contact = m_viewList[row];
+    Opie::OPimContact act_contact = m_viewList[row];
 
@@ -686,3 +685,3 @@ void AbTable::rowHeightChanged( int row )
 }
-ContactItem AbTable::findContactContact( const OContact &entry, int /* row */ )
+ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* row */ )
 {