1 files changed, 26 insertions, 26 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index f85cf38..b569f8b 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -41,3 +41,3 @@ namespace Opie {
 
-OContactAccessBackend_VCard::OContactAccessBackend_VCard ( const QString& , const QString& filename ):
+OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ):
         m_dirty( false ),
@@ -49,3 +49,3 @@ OContactAccessBackend_VCard::OContactAccessBackend_VCard ( const QString& , cons
 
-bool OContactAccessBackend_VCard::load ()
+bool OPimContactAccessBackend_VCard::load ()
 {
@@ -66,3 +66,3 @@ bool OContactAccessBackend_VCard::load ()
         while ( obj ) {
-                OContact con = parseVObject( obj );
+                OPimContact con = parseVObject( obj );
                 /*
@@ -87,3 +87,3 @@ bool OContactAccessBackend_VCard::load ()
 }
-bool OContactAccessBackend_VCard::reload()
+bool OPimContactAccessBackend_VCard::reload()
 {
@@ -91,3 +91,3 @@ bool OContactAccessBackend_VCard::reload()
 }
-bool OContactAccessBackend_VCard::save()
+bool OPimContactAccessBackend_VCard::save()
 {
@@ -105,3 +105,3 @@ bool OContactAccessBackend_VCard::save()
         VObject *vo;
-        for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
+        for(QMap<int, OPimContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                 vo = createVObject( *it );
@@ -118,3 +118,3 @@ bool OContactAccessBackend_VCard::save()
 }
-void OContactAccessBackend_VCard::clear ()
+void OPimContactAccessBackend_VCard::clear ()
 {
@@ -124,3 +124,3 @@ void OContactAccessBackend_VCard::clear ()
 
-bool OContactAccessBackend_VCard::add ( const OContact& newcontact )
+bool OPimContactAccessBackend_VCard::add ( const OPimContact& newcontact )
 {
@@ -131,3 +131,3 @@ bool OContactAccessBackend_VCard::add ( const OContact& newcontact )
 
-bool OContactAccessBackend_VCard::remove ( int uid )
+bool OPimContactAccessBackend_VCard::remove ( int uid )
 {
@@ -138,3 +138,3 @@ bool OContactAccessBackend_VCard::remove ( int uid )
 
-bool OContactAccessBackend_VCard::replace ( const OContact &contact )
+bool OPimContactAccessBackend_VCard::replace ( const OPimContact &contact )
 {
@@ -145,3 +145,3 @@ bool OContactAccessBackend_VCard::replace ( const OContact &contact )
 
-OContact OContactAccessBackend_VCard::find ( int uid ) const
+OPimContact OPimContactAccessBackend_VCard::find ( int uid ) const
 {
@@ -150,6 +150,6 @@ OContact OContactAccessBackend_VCard::find ( int uid ) const
 
-QArray<int> OContactAccessBackend_VCard::allRecords() const
+QArray<int> OPimContactAccessBackend_VCard::allRecords() const
 {
         QArray<int> ar( m_map.count() );
-        QMap<int, OContact>::ConstIterator it;
+        QMap<int, OPimContact>::ConstIterator it;
         int i = 0;
@@ -163,3 +163,3 @@ QArray<int> OContactAccessBackend_VCard::allRecords() const
 // Not implemented
-QArray<int> OContactAccessBackend_VCard::queryByExample ( const OContact&, int, const QDateTime& )
+QArray<int> OPimContactAccessBackend_VCard::queryByExample ( const OPimContact&, int, const QDateTime& )
 {
@@ -170,3 +170,3 @@ QArray<int> OContactAccessBackend_VCard::queryByExample ( const OContact&, int,
 // Not implemented
-QArray<int> OContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
+QArray<int> OPimContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
 {
@@ -176,3 +176,3 @@ QArray<int> OContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
 
-const uint OContactAccessBackend_VCard::querySettings()
+const uint OPimContactAccessBackend_VCard::querySettings()
 {
@@ -181,3 +181,3 @@ const uint OContactAccessBackend_VCard::querySettings()
 
-bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
+bool OPimContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
@@ -186,3 +186,3 @@ bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const
 
-bool OContactAccessBackend_VCard::wasChangedExternally()
+bool OPimContactAccessBackend_VCard::wasChangedExternally()
 {
@@ -192,3 +192,3 @@ bool OContactAccessBackend_VCard::wasChangedExternally()
 // Not implemented
-QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int )
+QArray<int> OPimContactAccessBackend_VCard::sorted( bool , int, int, int )
 {
@@ -201,5 +201,5 @@ QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int )
 
-OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
+OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
-        OContact c;
+        OPimContact c;
 
@@ -429,3 +429,3 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 
-VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
+VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
 {
@@ -535,3 +535,3 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
 
-QString OContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
+QString OPimContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
 {
@@ -549,3 +549,3 @@ QString OContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
 
-QDate OContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
+QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 {
@@ -574,3 +574,3 @@ QDate OContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 
-VObject* OContactAccessBackend_VCard::safeAddPropValue( VObject *o, const char *prop, const QString &value )
+VObject* OPimContactAccessBackend_VCard::safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
@@ -582,3 +582,3 @@ VObject* OContactAccessBackend_VCard::safeAddPropValue( VObject *o, const char *
 
-VObject* OContactAccessBackend_VCard::safeAddProp( VObject *o, const char *prop)
+VObject* OPimContactAccessBackend_VCard::safeAddProp( VObject *o, const char *prop)
 {