Argh.. Sorry for making problems !

CVS committed stuff which had merging conflicts... :(

2 files changed, 228 insertions, 439 deletions

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index b9a491e..92f89cf 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -149,51 +149,51 @@ 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().utf8(),&call_back, &query, &err)  > 0 ) {
-        qWarning("OSQLiteDriver::query: Error while executing %s",err);
-        free(err );
-        // FixMe Errors
+	    owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl;
+	    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** ) {
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index caf3c6e..6b66814 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -45,49 +45,49 @@
 #undef protected
 
 namespace Opie {
 
 OPimContactAccessBackend_VCard::OPimContactAccessBackend_VCard ( const QString& , const QString& filename ):
     m_dirty( false ),
     m_file( filename )
 {
     load();
 }
 
 
 bool OPimContactAccessBackend_VCard::load ()
 {
     m_map.clear();
     m_dirty = false;
 
     VObject* obj = 0l;
 
     if ( QFile::exists(m_file) ){
         obj = Parse_MIME_FromFileName( QFile::encodeName(m_file).data() );
         if ( !obj )
             return false;
     }else{
-        owarn << "File \"" << m_file << "\" not found !" << oendl;
+        odebug << "File \"" << m_file << "\" not found !" << oendl;
         return false;
     }
 
     while ( obj ) {
         OPimContact con = parseVObject( obj );
         /*
          * if uid is 0 assign a new one
          * this at least happens on
          * Nokia6210
          */
         if ( con.uid() == 0 ){
             con.setUid( 1 );
             owarn << "assigned new uid " << con.uid() << "" << oendl;
         }
 
         m_map.insert( con.uid(), con );
 
         VObject *t = obj;
         obj = nextVObjectInList(obj);
         cleanVObject( t );
     }
 
     return true;
 
@@ -189,489 +189,278 @@ const uint OPimContactAccessBackend_VCard::querySettings()
 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 )
-                    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;
-
-                                owarn << "value " << value.data() << " " << type << "" << oendl;
-                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
+	    VObject *o = nextVObject( &it );
+	    QCString name = vObjectName( o );
+	    QString value = QString::fromUtf8( vObjectStringZValue( o ) );
+	    odebug << "(1)Read: %s" << QString( value ).latin1() << oendl;
+	    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 ) );
+			    odebug << "(2)Read: %s" << value.latin1() << oendl;
+			    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;
+			    
+			    owarn << "value %s %d" << value.data() << type << oendl;
+			    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 );
+	    }
 #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(), 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() );
-            }
+		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() );