1 files changed, 18 insertions, 18 deletions

diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index f67a40c..c12e138 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -57,5 +57,5 @@ namespace Opie {
 
-OContactAccess::OContactAccess ( const QString appname, const QString ,
-                         OContactAccessBackend* end, bool autosync ):
-        OPimAccessTemplate<OContact>( end )
+OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
+                         OPimContactAccessBackend* end, bool autosync ):
+        OPimAccessTemplate<OPimContact>( end )
 {
@@ -66,3 +66,3 @@ OContactAccess::OContactAccess ( const QString appname, const QString ,
                 qWarning ("Using BackendFactory !");
-                end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname );
+                end = OBackendFactory<OPimContactAccessBackend>::Default( "contact", appname );
         }
@@ -70,3 +70,3 @@ OContactAccess::OContactAccess ( const QString appname, const QString ,
         m_backEnd = end;
-        OPimAccessTemplate<OContact>::setBackEnd (end);
+        OPimAccessTemplate<OPimContact>::setBackEnd (end);
 
@@ -85,3 +85,3 @@ OContactAccess::OContactAccess ( const QString appname, const QString ,
 }
-OContactAccess::~OContactAccess ()
+OPimContactAccess::~OPimContactAccess ()
 {
@@ -95,3 +95,3 @@ OContactAccess::~OContactAccess ()
 
-bool OContactAccess::save ()
+bool OPimContactAccess::save ()
 {
@@ -101,6 +101,6 @@ bool OContactAccess::save ()
          */
-        if ( OPimAccessTemplate<OContact>::wasChangedExternally() )
+        if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
                 reload();
 
-        bool status = OPimAccessTemplate<OContact>::save();
+        bool status = OPimAccessTemplate<OPimContact>::save();
         if ( !status ) return false;
@@ -114,3 +114,3 @@ bool OContactAccess::save ()
 
-const uint OContactAccess::querySettings()
+const uint OPimContactAccess::querySettings()
 {
@@ -119,3 +119,3 @@ const uint OContactAccess::querySettings()
 
-bool OContactAccess::hasQuerySettings ( int querySettings ) const
+bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
@@ -123,6 +123,6 @@ bool OContactAccess::hasQuerySettings ( int querySettings ) const
 }
-ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
+OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
         QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
-        return ( ORecordList<OContact>(matchingContacts, this) );
+        return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
@@ -130,3 +130,3 @@ ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int
 
-bool OContactAccess::wasChangedExternally()const
+bool OPimContactAccess::wasChangedExternally()const
 {
@@ -136,12 +136,12 @@ bool OContactAccess::wasChangedExternally()const
 
-void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
+void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
         if ( msg == "addressbookUpdated()" ){
-                qWarning ("OContactAccess: Received addressbokUpdated()");
+                qWarning ("OPimContactAccess: Received addressbokUpdated()");
                 emit signalChanged ( this );
         } else if ( msg == "flush()" ) {
-                qWarning ("OContactAccess: Received flush()");
+                qWarning ("OPimContactAccess: Received flush()");
                 save ();
         } else if ( msg == "reload()" ) {
-                qWarning ("OContactAccess: Received reload()");
+                qWarning ("OPimContactAccess: Received reload()");
                 reload ();