1 files changed, 23 insertions, 13 deletions

diff --git a/core/pim/addressbook/abtable.h b/core/pim/addressbook/abtable.h
index d5ff279..84aef1e 100644
--- a/core/pim/addressbook/abtable.h
+++ b/core/pim/addressbook/abtable.h
@@ -24,3 +24,3 @@
 #include <qpe/categories.h>
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
 
@@ -31,2 +31,4 @@
 
+#include <opie/ocontactaccess.h>
+
 class AbTableItem : public QTableItem
@@ -66,5 +68,5 @@ public:
     // NEW
-    void addEntry( const Contact &newContact );
-    Contact currentEntry();
-    void replaceCurrentEntry( const Contact &newContact );
+    void addEntry( const OContact &newContact );
+    OContact currentEntry();
+    void replaceCurrentEntry( const OContact &newContact );
 
@@ -85,3 +87,3 @@ public:
     QStringList choiceSelection(int index) const;
-    void setShowCategory( const QString &c );
+    void setShowCategory( const QString &b, const QString &c );
     void setShowByLetter( char c );
@@ -89,3 +91,4 @@ public:
     QStringList categories();
-    void resizeRows( int size );
+
+    void resizeRows();
 
@@ -94,2 +97,4 @@ public:
 
+    QString showBook() const;
+
 public slots:
@@ -121,9 +126,8 @@ private:
     void resort();
-    void updateJournal( const Contact &contact, Contact::journal_action action,
+    void updateJournal( const OContact &contact, OContact::journal_action action,
 			int row = -1 );
-    void insertIntoTable( const Contact &contact, int row );
-    void internalAddEntries( QList<Contact> &list );
-    QString findContactName( const Contact &entry );
-    QString findContactContact( const Contact &entry );
-    void journalFreeReplace( const Contact &cnt, int row );
+    void insertIntoTable( const OContact &contact, int row );
+    QString findContactName( const OContact &entry );
+    QString findContactContact( const OContact &entry, int row );
+    void journalFreeReplace( const OContact &cnt, int row );
     void journalFreeRemove( int row );
@@ -134,3 +138,3 @@ private:
     char showChar;
-    QMap<AbTableItem*, Contact> contactList;
+    QMap<AbTableItem*, OContact> contactList;
     const QValueList<int> *intFields;
@@ -141,2 +145,8 @@ private:
     Categories mCat;
+
+    QString showBk;
+    bool columnVisible;
+
+    OContactAccess m_contactdb;
+
 };