Fixing Bug #1328:

VCards: Real encoding in UTF-8. Now even chars > 0xff are supported.
SQL: Switching form latin1 encoding to UTF-8 encoding. We are now fully
Unicode compliant !
Sorry for all users already using the SQL interface for loosing their special
characters. There was no other way !
All other should export its SQL database to xml before updating and reimporting afterwards !

2 files changed, 235 insertions, 21 deletions

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 69eddfe..b9a491e 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -1,238 +1,228 @@
 /*
                              This file is part of the Opie Project
 
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "osqlquery.h"
 #include "osqlitedriver.h"
 
 #include <opie2/odebug.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 
-// fromLocal8Bit() does not work as expected. Thus it
-// is replaced by fromLatin1() (eilers)
-#define __BUGGY_LOCAL8BIT_
-
-namespace Opie {
-namespace DB {
+namespace Opie { 
+namespace DB { 
 namespace Internal {
 
 namespace {
     struct Query {
         OSQLError::ValueList errors;
         OSQLResultItem::ValueList items;
         OSQLiteDriver *driver;
     };
 }
 
 
 OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
     : OSQLDriver( lib )
 {
     m_sqlite = 0l;
 }
 
 
 OSQLiteDriver::~OSQLiteDriver() {
     close();
 }
 
 
 QString OSQLiteDriver::id()const {
     return QString::fromLatin1("SQLite");
 }
 
 void OSQLiteDriver::setUserName( const QString& ) {}
 
 
 void OSQLiteDriver::setPassword( const QString& ) {}
 
 
 void OSQLiteDriver::setUrl( const QString& url ) {
     m_url = url;
 }
 
 
 void OSQLiteDriver::setOptions( const QStringList& ) {
 }
 
 /*
  * Functions to patch a regex search into sqlite
  */
 int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
     int res;
     if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
         if (reg->regex_raw != NULL) {
             free(reg->regex_raw);
             regfree(&reg->regex_c);
         }
         reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
         strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1);
         res = regcomp(&reg->regex_c, zPattern, REG_EXTENDED);
         if ( res != 0 ) {
             printf("Regcomp failed with code %u on string %s\n",res,zPattern);
             free(reg->regex_raw);
             reg->regex_raw=NULL;
         return 0;
         }
     }
     res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0);
     return res;
 }
 
 void rlikeFunc(sqlite_func *context, int arg, const char **argv){
     if( argv[0]==0 || argv[1]==0 ){
         printf("One of arguments Null!!\n");
         return;
     }
         sqlite_set_result_int(context,
         sqliteRlikeCompare((const char*)argv[0],
     (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
 }
 
 /*
  * try to open a db specified via setUrl
  * and options
  */
 bool OSQLiteDriver::open() {
     char *error;
 
     odebug << "OSQLiteDriver::open: about to open" << oendl; 
     m_sqlite = sqlite_open(m_url.local8Bit(),
                            0,
                            &error );
 
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
         owarn << "OSQLiteDriver::open: " << error << "" << oendl; 
         free( error );
         return false;
     }
     if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
         odebug << "Unable to create user defined function!" << oendl;
     if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0)
         odebug << "Unable to set rlike function result type!" << oendl;
     sqreg.regex_raw = NULL;
     return true;
 }
 
 
 /* close the db
  * sqlite closes them without
  * telling failure or success
  */
 bool OSQLiteDriver::close() {
     if (m_sqlite )
         sqlite_close( m_sqlite ), m_sqlite=0l;
     if (sqreg.regex_raw != NULL){
         odebug << "Freeing regex on close" << oendl;
         free(sqreg.regex_raw);
         sqreg.regex_raw=NULL;
         regfree(&sqreg.regex_c);
     }
     return true;
 }
 
 
 /* Query */
 OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     if ( !m_sqlite ) {
         // FIXME set error code
         OSQLResult result( OSQLResult::Failure );
         return result;
     }
     Query query;
     query.driver = this;
     char *err;
     /* SQLITE_OK 0 if return code > 0 == failure */
-    if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err)  > 0 ) {
-        owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; 
+    if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err)  > 0 ) {
+        qWarning("OSQLiteDriver::query: Error while executing %s",err);
         free(err );
         // FixMe Errors
     }
 
     OSQLResult result(OSQLResult::Success,
                       query.items,
                       query.errors );
     return result;
 }
 
 
 OSQLTable::ValueList OSQLiteDriver::tables() const {
 
 }
 
 
 OSQLError OSQLiteDriver::lastError() {
     OSQLError error;
     return error;
 };
 
 
 /* handle a callback add the row to the global
  * OSQLResultItem
  */
 int OSQLiteDriver::handleCallBack( int, char**, char** ) {
     return 0;
 }
 
 
 /* callback_handler add the values to the list*/
 int OSQLiteDriver::call_back( void* voi, int argc,
                               char** argv, char** columns) {
     Query* qu = (Query*)voi;
 
     //copy them over to a OSQLResultItem
     QMap<QString, QString> tableString;
     QMap<int, QString> tableInt;
     for (int i = 0; i < argc; i++ ) {
 
-#ifdef __BUGGY_LOCAL8BIT_
-        tableInt.insert( i, QString::fromLatin1( argv[i] ) );
-        tableString.insert( QString::fromLatin1( columns[i] ),
-                            QString::fromLatin1( argv[i] ) );
-#else
-        tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) );
-        tableString.insert( QString::fromLocal8Bit( columns[i] ),
-                            QString::fromLocal8Bit( argv[i] ) );
-#endif
+        tableInt.insert( i, QString::fromUtf8( argv[i] ) );
+        tableString.insert( QString::fromUtf8( columns[i] ),
+                            QString::fromUtf8( argv[i] ) );
     }
     OSQLResultItem item( tableString, tableInt );
     qu->items.append( item );
 
     return ((Query*)voi)->driver->handleCallBack( argc,
                                                   argv,
                                                   columns );
 
 
 }
 
 }}} // namespace OPIE::DB::Internal
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index b6ea461..caf3c6e 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -117,192 +117,401 @@ bool OPimContactAccessBackend_VCard::save()
     }
     cleanStrTbl();
     deleteVObject( obj );
 
     m_dirty = false;
     return true;
 
 
 }
 void OPimContactAccessBackend_VCard::clear ()
 {
     m_map.clear();
     m_dirty = true; // ??? sure ? (se)
 }
 
 bool OPimContactAccessBackend_VCard::add ( const OPimContact& newcontact )
 {
     m_map.insert( newcontact.uid(), newcontact );
     m_dirty = true;
     return true;
 }
 
 bool OPimContactAccessBackend_VCard::remove ( int uid )
 {
     m_map.remove( uid );
     m_dirty = true;
     return true;
 }
 
 bool OPimContactAccessBackend_VCard::replace ( const OPimContact &contact )
 {
     m_map.replace( contact.uid(), contact );
     m_dirty = true;
     return true;
 }
 
 OPimContact OPimContactAccessBackend_VCard::find ( int uid ) const
 {
     return m_map[uid];
 }
 
 QArray<int> OPimContactAccessBackend_VCard::allRecords() const
 {
     QArray<int> ar( m_map.count() );
     QMap<int, OPimContact>::ConstIterator it;
     int i = 0;
     for ( it = m_map.begin(); it != m_map.end(); ++it ) {
         ar[i] = it.key();
         i++;
     }
     return ar;
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::queryByExample ( const OPimContact&, int, const QDateTime& )
 {
     QArray<int> ar(0);
     return ar;
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::matchRegexp(  const QRegExp&  ) const
 {
     QArray<int> ar(0);
     return ar;
 }
 
 const uint OPimContactAccessBackend_VCard::querySettings()
 {
     return 0; // No search possible
 }
 
 bool OPimContactAccessBackend_VCard::hasQuerySettings (uint ) const
 {
     return false; // No search possible, therefore all settings invalid ;)
 }
 
 bool OPimContactAccessBackend_VCard::wasChangedExternally()
 {
     return false; // Don't expect concurrent access
 }
 
 // Not implemented
 QArray<int> OPimContactAccessBackend_VCard::sorted( bool , int, int, int )
 {
     QArray<int> ar(0);
     return ar;
 }
 
 // *** Private stuff ***
 
 
 OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
 {
     OPimContact c;
 
+<<<<<<< ocontactaccessbackend_vcard.cpp
+	VObjectIterator it;
+	initPropIterator( &it, obj );
+	while( moreIteration( &it ) ) {
+		VObject *o = nextVObject( &it );
+		QCString name = vObjectName( o );
+		QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+		qDebug( "(1)Read: %s", QString( value ).latin1() );
+		if ( name == VCNameProp ) {
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectTypeInfo( o );
+				QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+				qDebug( "(2)Read: %s", value.latin1() );
+				if ( name == VCNamePrefixesProp )
+					c.setTitle( value );
+				else if ( name == VCNameSuffixesProp )
+					c.setSuffix( value );
+				else if ( name == VCFamilyNameProp )
+					c.setLastName( value );
+				else if ( name == VCGivenNameProp )
+					c.setFirstName( value );
+				else if ( name == VCAdditionalNamesProp )
+					c.setMiddleName( value );
+			}
+		}
+		else if ( name == VCAdrProp ) {
+			bool work = TRUE; // default address is work address
+			QString street;
+			QString city;
+			QString region;
+			QString postal;
+			QString country;
+
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectName( o );
+				QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+				if ( name == VCHomeProp )
+					work = FALSE;
+				else if ( name == VCWorkProp )
+					work = TRUE;
+				else if ( name == VCStreetAddressProp )
+					street = value;
+				else if ( name == VCCityProp )
+					city = value;
+				else if ( name == VCRegionProp )
+					region = value;
+				else if ( name == VCPostalCodeProp )
+					postal = value;
+				else if ( name == VCCountryNameProp )
+					country = value;
+			}
+			if ( work ) {
+				c.setBusinessStreet( street );
+				c.setBusinessCity( city );
+				c.setBusinessCountry( country );
+				c.setBusinessZip( postal );
+				c.setBusinessState( region );
+			} else {
+				c.setHomeStreet( street );
+				c.setHomeCity( city );
+				c.setHomeCountry( country );
+				c.setHomeZip( postal );
+				c.setHomeState( region );
+			}
+		}
+		else if ( name == VCTelephoneProp ) {
+			enum {
+				HOME = 0x01,
+				WORK = 0x02,
+				VOICE = 0x04,
+				CELL = 0x08,
+				FAX = 0x10,
+				PAGER = 0x20,
+				UNKNOWN = 0x80
+			};
+			int type = 0;
+
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectTypeInfo( o );
+				if ( name == VCHomeProp )
+					type |= HOME;
+				else if ( name == VCWorkProp )
+					type |= WORK;
+				else if ( name == VCVoiceProp )
+					type |= VOICE;
+				else if ( name == VCCellularProp )
+					type |= CELL;
+				else if ( name == VCFaxProp )
+					type |= FAX;
+				else if ( name == VCPagerProp )
+					type |= PAGER;
+				else  if ( name == VCPreferredProp )
+					;
+				else
+					type |= UNKNOWN;
+			}
+			if ( (type & UNKNOWN) != UNKNOWN ) {
+				if ( ( type & (HOME|WORK) ) == 0 ) // default
+					type |= HOME;
+				if ( ( type & (VOICE|CELL|FAX|PAGER) ) == 0 ) // default
+					type |= VOICE;
+
+                                qWarning("value %s %d", value.data(), type );
+				if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) )
+					c.setHomePhone( value );
+				if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
+					c.setHomeFax( value );
+				if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
+					c.setHomeMobile( value );
+				if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) && (type & (CELL|WORK) ) != (CELL|WORK) )
+					c.setBusinessPhone( value );
+				if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
+					c.setBusinessFax( value );
+				if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
+					c.setBusinessMobile( value );
+				if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
+					c.setBusinessPager( value );
+			}
+		}
+		else if ( name == VCEmailAddressProp ) {
+			QString email = QString::fromUtf8( vObjectStringZValue( o ) );
+			bool valid = TRUE;
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectTypeInfo( o );
+				if ( name != VCInternetProp && name != VCHomeProp &&
+				     name != VCWorkProp &&
+				     name != VCPreferredProp )
+					// ### preffered should map to default email
+					valid = FALSE;
+			}
+			if ( valid ) {
+				c.insertEmail( email );
+			}
+		}
+		else if ( name == VCURLProp ) {
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectTypeInfo( o );
+				if ( name == VCHomeProp )
+					c.setHomeWebpage( value );
+				else if ( name == VCWorkProp )
+					c.setBusinessWebpage( value );
+			}
+		}
+		else if ( name == VCOrgProp ) {
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectName( o );
+				QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+				if ( name == VCOrgNameProp )
+					c.setCompany( value );
+				else if ( name == VCOrgUnitProp )
+					c.setDepartment( value );
+				else if ( name == VCOrgUnit2Prop )
+					c.setOffice( value );
+			}
+		}
+		else if ( name == VCTitleProp ) {
+			c.setJobTitle( value );
+		}
+		else if ( name == "X-Qtopia-Profession" ) {
+			c.setProfession( value );
+		}
+		else if ( name == "X-Qtopia-Manager" ) {
+			c.setManager( value );
+		}
+		else if ( name == "X-Qtopia-Assistant" ) {
+			c.setAssistant( value );
+		}
+		else if ( name == "X-Qtopia-Spouse" ) {
+			c.setSpouse( value );
+		}
+		else if ( name == "X-Qtopia-Gender" ) {
+			c.setGender( value );
+		}
+		else if ( name == "X-Qtopia-Anniversary" ) {
+			c.setAnniversary( convVCardDateToDate( value ) );
+		}
+		else if ( name == "X-Qtopia-Nickname" ) {
+			c.setNickname( value );
+		}
+		else if ( name == "X-Qtopia-Children" ) {
+			c.setChildren( value );
+		}
+		else if ( name == VCBirthDateProp ) {
+			// Reading Birthdate regarding RFC 2425 (5.8.4)
+			c.setBirthday( convVCardDateToDate( value ) );
+
+		}
+		else if ( name == VCCommentProp ) {
+			c.setNotes( value );
+		}
+=======
     VObjectIterator it;
     initPropIterator( &it, obj );
     while( moreIteration( &it ) ) {
         VObject *o = nextVObject( &it );
         QCString name = vObjectName( o );
         QCString value = vObjectStringZValue( o );
         if ( name == VCNameProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCNamePrefixesProp )
                     c.setTitle( value );
                 else if ( name == VCNameSuffixesProp )
                     c.setSuffix( value );
                 else if ( name == VCFamilyNameProp )
                     c.setLastName( value );
                 else if ( name == VCGivenNameProp )
                     c.setFirstName( value );
                 else if ( name == VCAdditionalNamesProp )
                     c.setMiddleName( value );
             }
         }
         else if ( name == VCAdrProp ) {
             bool work = TRUE; // default address is work address
             QString street;
             QString city;
             QString region;
             QString postal;
             QString country;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCHomeProp )
                     work = FALSE;
                 else if ( name == VCWorkProp )
                     work = TRUE;
                 else if ( name == VCStreetAddressProp )
                     street = value;
                 else if ( name == VCCityProp )
                     city = value;
                 else if ( name == VCRegionProp )
                     region = value;
                 else if ( name == VCPostalCodeProp )
                     postal = value;
                 else if ( name == VCCountryNameProp )
                     country = value;
             }
             if ( work ) {
                 c.setBusinessStreet( street );
                 c.setBusinessCity( city );
                 c.setBusinessCountry( country );
                 c.setBusinessZip( postal );
                 c.setBusinessState( region );
             } else {
                 c.setHomeStreet( street );
                 c.setHomeCity( city );
                 c.setHomeCountry( country );
                 c.setHomeZip( postal );
                 c.setHomeState( region );
             }
         }
         else if ( name == VCTelephoneProp ) {
             enum {
                 HOME = 0x01,
                 WORK = 0x02,
                 VOICE = 0x04,
                 CELL = 0x08,
                 FAX = 0x10,
                 PAGER = 0x20,
                 UNKNOWN = 0x80
             };
             int type = 0;
 
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     type |= HOME;
                 else if ( name == VCWorkProp )
                     type |= WORK;
                 else if ( name == VCVoiceProp )
                     type |= VOICE;
                 else if ( name == VCCellularProp )
                     type |= CELL;
                 else if ( name == VCFaxProp )
                     type |= FAX;
                 else if ( name == VCPagerProp )
@@ -322,277 +531,292 @@ OPimContact OPimContactAccessBackend_VCard::parseVObject( VObject *obj )
                 if ( (type & (VOICE|HOME) ) == (VOICE|HOME) && (type & (CELL|HOME) ) != (CELL|HOME) )
                     c.setHomePhone( value );
                 if ( ( type & (FAX|HOME) ) == (FAX|HOME) )
                     c.setHomeFax( value );
                 if ( ( type & (CELL|HOME) ) == (CELL|HOME) )
                     c.setHomeMobile( value );
                 if ( ( type & (VOICE|WORK) ) == (VOICE|WORK) && (type & (CELL|WORK) ) != (CELL|WORK) )
                     c.setBusinessPhone( value );
                 if ( ( type & (FAX|WORK) ) == (FAX|WORK) )
                     c.setBusinessFax( value );
                 if ( ( type & (CELL|WORK) ) == (CELL|WORK) )
                     c.setBusinessMobile( value );
                 if ( ( type & (PAGER|WORK) ) == (PAGER|WORK) )
                     c.setBusinessPager( value );
             }
         }
         else if ( name == VCEmailAddressProp ) {
             QString email = vObjectStringZValue( o );
             bool valid = TRUE;
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name != VCInternetProp && name != VCHomeProp &&
                      name != VCWorkProp &&
                      name != VCPreferredProp )
                     // ### preffered should map to default email
                     valid = FALSE;
             }
             if ( valid ) {
                 c.insertEmail( email );
             }
         }
         else if ( name == VCURLProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectTypeInfo( o );
                 if ( name == VCHomeProp )
                     c.setHomeWebpage( value );
                 else if ( name == VCWorkProp )
                     c.setBusinessWebpage( value );
             }
         }
         else if ( name == VCOrgProp ) {
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 if ( name == VCOrgNameProp )
                     c.setCompany( value );
                 else if ( name == VCOrgUnitProp )
                     c.setDepartment( value );
                 else if ( name == VCOrgUnit2Prop )
                     c.setOffice( value );
             }
         }
         else if ( name == VCTitleProp ) {
             c.setJobTitle( value );
         }
         else if ( name == "X-Qtopia-Profession" ) {
             c.setProfession( value );
         }
         else if ( name == "X-Qtopia-Manager" ) {
             c.setManager( value );
         }
         else if ( name == "X-Qtopia-Assistant" ) {
             c.setAssistant( value );
         }
         else if ( name == "X-Qtopia-Spouse" ) {
             c.setSpouse( value );
         }
         else if ( name == "X-Qtopia-Gender" ) {
             c.setGender( value );
         }
         else if ( name == "X-Qtopia-Anniversary" ) {
             c.setAnniversary( convVCardDateToDate( value ) );
         }
         else if ( name == "X-Qtopia-Nickname" ) {
             c.setNickname( value );
         }
         else if ( name == "X-Qtopia-Children" ) {
             c.setChildren( value );
         }
         else if ( name == VCBirthDateProp ) {
             // Reading Birthdate regarding RFC 2425 (5.8.4)
             c.setBirthday( convVCardDateToDate( value ) );
 
         }
         else if ( name == VCCommentProp ) {
             c.setNotes( value );
         }
+>>>>>>> 1.15
 #if 0
+<<<<<<< ocontactaccessbackend_vcard.cpp
+		else {
+			printf("Name: %s, value=%s\n", name.data(), QString::fromUtf8( vObjectStringZValue( o ) ) );
+			VObjectIterator nit;
+			initPropIterator( &nit, o );
+			while( moreIteration( &nit ) ) {
+				VObject *o = nextVObject( &nit );
+				QCString name = vObjectName( o );
+				QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+				printf(" subprop: %s = %s\n", name.data(), value.latin1() );
+			}
+		}
+=======
         else {
             printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
             VObjectIterator nit;
             initPropIterator( &nit, o );
             while( moreIteration( &nit ) ) {
                 VObject *o = nextVObject( &nit );
                 QCString name = vObjectName( o );
                 QString value = vObjectStringZValue( o );
                 printf(" subprop: %s = %s\n", name.data(), value.latin1() );
             }
         }
+>>>>>>> 1.15
 #endif
     }
     c.setFileAs();
     return c;
 }
 
 
 VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
 {
     VObject *vcard = newVObject( VCCardProp );
     safeAddPropValue( vcard, VCVersionProp, "2.1" );
     safeAddPropValue( vcard, VCLastRevisedProp, TimeConversion::toISO8601( QDateTime::currentDateTime() ) );
     safeAddPropValue( vcard, VCUniqueStringProp, QString::number(c.uid()) );
 
     // full name
     safeAddPropValue( vcard, VCFullNameProp, c.fullName() );
 
     // name properties
     VObject *name = safeAddProp( vcard, VCNameProp );
     safeAddPropValue( name, VCFamilyNameProp, c.lastName() );
     safeAddPropValue( name, VCGivenNameProp, c.firstName() );
     safeAddPropValue( name, VCAdditionalNamesProp, c.middleName() );
     safeAddPropValue( name, VCNamePrefixesProp, c.title() );
     safeAddPropValue( name, VCNameSuffixesProp, c.suffix() );
 
     // home properties
     VObject *home_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( home_adr, VCHomeProp );
     safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
     safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
     safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
     safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
     safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
 
     VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
     safeAddProp( home_phone, VCHomeProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCCellularProp );
     home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
     safeAddProp( home_phone, VCHomeProp );
     safeAddProp( home_phone, VCFaxProp );
 
     VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
     safeAddProp( url, VCHomeProp );
 
     // work properties
     VObject *work_adr= safeAddProp( vcard, VCAdrProp );
     safeAddProp( work_adr, VCWorkProp );
     safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
     safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
     safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
     safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
     safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
 
     VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
     safeAddProp( work_phone, VCWorkProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCCellularProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCFaxProp );
     work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
     safeAddProp( work_phone, VCWorkProp );
     safeAddProp( work_phone, VCPagerProp );
 
     url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
     safeAddProp( url, VCWorkProp );
 
     VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
     safeAddProp( title, VCWorkProp );
 
 
     QStringList emails = c.emailList();
     // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
     for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
         safeAddProp( email, VCInternetProp );
     }
 
     safeAddPropValue( vcard, VCNoteProp, c.notes() );
 
     // Exporting Birthday regarding RFC 2425 (5.8.4)
     if ( c.birthday().isValid() ){
         owarn << "Exporting birthday as: " << convDateToVCardDate( c.birthday() ) << "" << oendl;
         safeAddPropValue( vcard, VCBirthDateProp, convDateToVCardDate( c.birthday() ) );
     }
 
     if ( !c.company().isEmpty() || !c.department().isEmpty() || !c.office().isEmpty() ) {
         VObject *org = safeAddProp( vcard, VCOrgProp );
         safeAddPropValue( org, VCOrgNameProp, c.company() );
         safeAddPropValue( org, VCOrgUnitProp, c.department() );
         safeAddPropValue( org, VCOrgUnit2Prop, c.office() );
     }
 
     // some values we have to export as custom fields
     safeAddPropValue( vcard, "X-Qtopia-Profession", c.profession() );
     safeAddPropValue( vcard, "X-Qtopia-Manager", c.manager() );
     safeAddPropValue( vcard, "X-Qtopia-Assistant", c.assistant() );
 
     safeAddPropValue( vcard, "X-Qtopia-Spouse", c.spouse() );
     safeAddPropValue( vcard, "X-Qtopia-Gender", c.gender() );
     if ( c.anniversary().isValid() ){
         owarn << "Exporting anniversary as: " << convDateToVCardDate( c.anniversary() ) << "" << oendl;
         safeAddPropValue( vcard, "X-Qtopia-Anniversary", convDateToVCardDate( c.anniversary() ) );
     }
     safeAddPropValue( vcard, "X-Qtopia-Nickname", c.nickname() );
     safeAddPropValue( vcard, "X-Qtopia-Children", c.children() );
 
     return vcard;
 }
 
 QString OPimContactAccessBackend_VCard::convDateToVCardDate( const QDate& d ) const
 {
         QString str_rfc2425 = QString("%1-%2-%3")
             .arg( d.year() )
             .arg( d.month(), 2 )
             .arg( d.day(), 2 );
         // Now replace spaces with "0"...
         int pos = 0;
         while ( ( pos = str_rfc2425.find (' ')  ) > 0 )
             str_rfc2425.replace( pos, 1, "0" );
 
         return str_rfc2425;
 }
 
 QDate OPimContactAccessBackend_VCard::convVCardDateToDate( const QString& datestr )
 {
     int monthPos = datestr.find('-');
     int dayPos = datestr.find('-', monthPos+1 );
     int sep_ignore = 1;
     if ( monthPos == -1 || dayPos == -1 ) {
         odebug << "fromString didn't find - in str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
         // Ok.. No "-" found, therefore we will try to read other format ( YYYYMMDD )
         if ( datestr.length() == 8 ){
             monthPos   = 4;
             dayPos     = 6;
             sep_ignore = 0;
             odebug << "Try with follwing positions str = " << datestr << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
         } else {
             return QDate();
         }
     }
     int y = datestr.left( monthPos ).toInt();
     int m = datestr.mid( monthPos + sep_ignore, dayPos - monthPos - sep_ignore ).toInt();
     int d = datestr.mid( dayPos + sep_ignore ).toInt();
     odebug << "TimeConversion::fromString ymd = " << datestr << " => " << y << " " << m << " " << d << "; mpos = " << monthPos << " ypos = " << dayPos << "" << oendl;
     QDate date ( y,m,d );
     return date;
 }
 
 VObject* OPimContactAccessBackend_VCard::safeAddPropValue( VObject *o, const char *prop, const QString &value )
 {
-    VObject *ret = 0;
-    if ( o && !value.isEmpty() )
-        ret = addPropValue( o, prop, value.latin1() );
-    return ret;
+	VObject *ret = 0;
+	if ( o && !value.isEmpty() )
+		ret = addPropValue( o, prop, value.utf8() );
+	return ret;
 }
 
 VObject* OPimContactAccessBackend_VCard::safeAddProp( VObject *o, const char *prop)
 {
     VObject *ret = 0;
     if ( o )
         ret = addProp( o, prop );
     return ret;
 }
 
 }