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
@@ -13,31 +13,33 @@
 **
 ** 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.
 **
 **********************************************************************/
 
 #ifndef ABTABLE_H
 #define ABTABLE_H
 
 #include <qpe/categories.h>
-#include <qpe/contact.h>
+#include <opie/ocontact.h>
 
 #include <qmap.h>
 #include <qtable.h>
 #include <qstringlist.h>
 #include <qcombobox.h>
 
+#include <opie/ocontactaccess.h>
+
 class AbTableItem : public QTableItem
 {
 public:
     AbTableItem( QTable *t, EditType et, const QString &s,
                  const QString &secondSortKey);
     QString entryKey() const;
     void setEntryKey( const QString & k );
     virtual int alignment() const;
     virtual QString key() const;
     void setItem( const QString &txt, const QString &secondKey );
 
 private:
@@ -55,52 +57,55 @@ public:
 private:
     QGuardedPtr<QComboBox> cb;
 };
 
 class AbTable : public QTable
 {
     Q_OBJECT
 
 public:
     AbTable( const QValueList<int> *ordered, QWidget *parent, const char *name=0 );
     ~AbTable();
     // 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 );
 
     void init();
 
     void deleteCurrentEntry();
     void clear();
     void clearFindRow() { currFindRow = -2; }
     void loadFields();
     void refresh();
     bool save( const QString &fn );
     void load( const QString &fn );
 
     // addresspicker mode
     void setChoiceNames( const QStringList& list);
     QStringList choiceNames() const;
     void setChoiceSelection(int index, const QStringList& list);
     QStringList choiceSelection(int index) const;
-    void setShowCategory( const QString &c );
+    void setShowCategory( const QString &b, const QString &c );
     void setShowByLetter( char c );
     QString showCategory() const;
     QStringList categories();
-    void resizeRows( int size );
+
+    void resizeRows();
 
     void show();
     void setPaintingEnabled( bool e );
 
+    QString showBook() const;
+
 public slots:
     void slotDoFind( const QString &str, bool caseSensitive, bool backwards,
                      int category );
 signals:
     void empty( bool );
     void details();
     void signalNotFound();
     void signalWrapAround();
 
 protected:
     virtual void keyPressEvent( QKeyEvent *e );
 
@@ -110,34 +115,39 @@ protected:
 
 
 protected slots:
     void moveTo( char );
     virtual void columnClicked( int col );
     void itemClicked(int,int col);
     void rowHeightChanged( int row );
 
 private:
     void loadFile( const QString &strFile, bool journalFile );
     void fitColumns();
     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 );
     void realignTable( int );
     void updateVisible();
     int lastSortCol;
     bool asc;
     char showChar;
-    QMap<AbTableItem*, Contact> contactList;
+    QMap<AbTableItem*, OContact> contactList;
     const QValueList<int> *intFields;
     int currFindRow;
     QString showCat;
     QStringList choicenames;
     bool enablePainting;
     Categories mCat;
+
+    QString showBk;
+    bool columnVisible;
+
+    OContactAccess m_contactdb;
+
 };
 #endif // ABTABLE_H