1 files changed, 19 insertions, 19 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 8d61582..aa242b7 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -18,3 +18,3 @@
 
-#include <qlayout.h>
+#include <opie2/ocontactaccessbackend_vcard.h>
 
@@ -22,3 +22,3 @@
 
-#include <opie/ocontactaccessbackend_vcard.h>
+#include <qlayout.h>
 
@@ -55,3 +55,3 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         // Load default database and handle syncing myself.. !
-        m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false );
+        m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
         m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available
@@ -106,3 +106,3 @@ void AbView::setView( Views view )
 
-void AbView::addEntry( const OContact &newContact )
+void AbView::addEntry( const Opie::OPimContact &newContact )
 {
@@ -120,3 +120,3 @@ void AbView::removeEntry( const int UID )
 
-void AbView::replaceEntry( const OContact &contact )
+void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
@@ -128,5 +128,5 @@ void AbView::replaceEntry( const OContact &contact )
 
-OContact AbView::currentEntry()
+Opie::OPimContact AbView::currentEntry()
 {
-        OContact currentContact;
+        Opie::OPimContact currentContact;
 
@@ -159,3 +159,3 @@ void AbView::load()
         if ( m_inPersonal )
-                // VCard Backend does not sort.. 
+                // VCard Backend does not sort..
                 m_list = m_contactdb->allRecords();
@@ -230,3 +230,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 
-        OContact query;
+        Opie::OPimContact query;
         if ( c == 0 ){
@@ -235,5 +235,5 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
         }else{
-                // If the current Backend is unable to solve the query, we will 
+                // If the current Backend is unable to solve the query, we will
                 // ignore the request ..
-                if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){
+                if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){
                         return;
@@ -253,3 +253,3 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                 }
-                m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase );
+                m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase );
                 if ( m_curr_category != -1 )
@@ -291,5 +291,5 @@ void AbView::showPersonal( bool personal )
 
-                OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null,
+                Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                           addressbookPersonalVCardName() );
-                m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true );
+                m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
 
@@ -320,3 +320,3 @@ void AbView::setCurrentUid( int uid ){
         m_curr_Contact = uid;
-        updateView( true ); //true: Don't modificate the UID ! 
+        updateView( true ); //true: Don't modificate the UID !
 }
@@ -403,6 +403,6 @@ void AbView::clearForCategory()
 {
-        OContactAccess::List::Iterator it;
+        Opie::OPimContactAccess::List::Iterator it;
         // Now remove all contacts with wrong category if any category selected
 
-        OContactAccess::List allList = m_list;
+        Opie::OPimContactAccess::List allList = m_list;
         if ( m_curr_category != -1 ){
@@ -418,5 +418,5 @@ void AbView::clearForCategory()
 
-bool AbView::contactCompare( const OContact &cnt, int category )
+bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
-                //qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category);
+                //qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category);