1 files changed, 12 insertions, 11 deletions

diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index b9ebe27..927a5a9 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -24,5 +24,6 @@
 
+#include <opie2/opimcontact.h>
+#include <opie2/ocontactaccess.h>
+
 #include <qpe/categories.h>
-#include <opie/ocontact.h>
-#include <opie/ocontactaccess.h>
 
@@ -32,3 +33,3 @@
 #include <qcombobox.h>
-#include <qpixmap.h> 
+#include <qpixmap.h>
 
@@ -85,3 +86,3 @@ public:
     // Set the contacts shown in the table
-    void setContacts( const OContactAccess::List& viewList );
+    void setContacts( const Opie::OPimContactAccess::List& viewList );
 
@@ -92,5 +93,5 @@ public:
     bool selectContact( int UID );
-    
+
     // Get the current selected entry
-    OContact currentEntry();
+    Opie::OPimContact currentEntry();
 
@@ -99,3 +100,3 @@ public:
 
-    // QString findContactName( const OContact &entry );
+    // QString findContactName( const Opie::OPimContact &entry );
 
@@ -137,4 +138,4 @@ protected slots:
 private:
-    // void insertIntoTable( const OContact &cnt, int row );
-    ContactItem findContactContact( const OContact &entry, int row );
+    // void insertIntoTable( const Opie::OPimContact &cnt, int row );
+    ContactItem findContactContact( const Opie::OPimContact &entry, int row );
     void fitColumns();
@@ -147,3 +148,3 @@ private:
     bool asc;
-    // QMap<AbTableItem*, OContact> contactList;
+    // QMap<AbTableItem*, Opie::OPimContact> contactList;
     QValueList<int> intFields;
@@ -154,3 +155,3 @@ private:
 
-    OContactAccess::List m_viewList;
+    Opie::OPimContactAccess::List m_viewList;