6 files changed, 6 insertions, 9 deletions

diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 4705c78..70330c7 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -483,8 +483,8 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch )
 
 void AbTable::fitColumns()
 {
-                //qWarning( "void AbTable::fitColumns()" );
-        int contentsWidth = visibleWidth() / 2; // :SX Why too low
+        qWarning( "void AbTable::fitColumns()" );
+        int contentsWidth = visibleWidth() / 2; 
         // Fix to better value
         // contentsWidth = 130; 
 
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 6cbd556..670cdb0 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -53,7 +53,8 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
 {
         qWarning("AbView::c'tor");
         // Load default database and handle syncing myself.. !
-        m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ),
+        m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false );
+        m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
         mCat.load( categoryFileName() );
 
         // Create Layout and put WidgetStack into it.
diff --git a/core/pim/addressbook/addressbook.pro b/core/pim/addressbook/addressbook.pro
index 1637cac..c90568a 100644
--- a/core/pim/addressbook/addressbook.pro
+++ b/core/pim/addressbook/addressbook.pro
@@ -4,7 +4,6 @@ CONFIG		= qt warn_on debug
         DESTDIR         = $(OPIEDIR)/bin
         HEADERS= addressbook.h \
                   contacteditor.h \
-                  ocontactfields.h \
                   ablabel.h \
                   abtable.h \
                   picker.h \
@@ -15,7 +14,6 @@ HEADERS	= addressbook.h \
         SOURCES= main.cpp \
                   addressbook.cpp \
                   contacteditor.cpp \
-                  ocontactfields.cpp \
                   ablabel.cpp \
                   abtable.cpp \
                   picker.cpp \
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index 629feef..981f5e0 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -1,5 +1,4 @@
 #include "configdlg.h"
-#include "ocontactfields.h"
 
 #include <qcheckbox.h>
 #include <qradiobutton.h>
@@ -10,6 +9,7 @@
 #include <qpe/resource.h>
 
 #include <opie/ocontact.h>
+#include "opie/ocontactfields.h"
 
 ConfigDlg::ConfigDlg( QWidget *parent, const char *name):
         ConfigDlg_Base(parent, name, true )
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 9d1a1c7..8fbd065 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -21,7 +21,6 @@
 
 #include "contacteditor.h"
 #include "addresspicker.h"
-#include "ocontactfields.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
diff --git a/core/pim/addressbook/contacteditor.h b/core/pim/addressbook/contacteditor.h
index e7432ee..72d14a9 100644
--- a/core/pim/addressbook/contacteditor.h
+++ b/core/pim/addressbook/contacteditor.h
@@ -22,6 +22,7 @@
 #define CONTACTEDITOR_H
 
 #include <opie/ocontact.h>
+#include <opie/ocontactfields.h>
 
 #include <qpe/datebookmonth.h>
 
@@ -31,8 +32,6 @@
 #include <qstringlist.h>
 #include <qwidgetstack.h> 
 
-#include "ocontactfields.h"
-
 const int NAME_LF  = 0;
 const int NAME_LFM = 1;
 const int NAME_FL  = 2;