Skip to content
This repository has been archived by the owner on Sep 4, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
[libcontacts] Remove formerly-unsupported types from exclusion list
QContactFamily and QContactGeoLocation types are now supported by the
qtcontacts-sqlite backend.
  • Loading branch information
matthewvogt committed Jul 22, 2014
1 parent 0e4d0f6 commit 0bdd795
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/seasideimport.cpp
Expand Up @@ -45,6 +45,8 @@
#include <QContactAvatar>
#include <QContactBirthday>
#include <QContactEmailAddress>
#include <QContactFamily>
#include <QContactGeoLocation>
#include <QContactGuid>
#include <QContactHobby>
#include <QContactName>
Expand Down Expand Up @@ -255,6 +257,8 @@ bool mergeIntoExistingContact(QContact *updateContact, const QContact &importedC
rv |= updateExistingDetails<QContactAvatar>(updateContact, importedContact);
rv |= updateExistingDetails<QContactBirthday>(updateContact, importedContact, true);
rv |= updateExistingDetails<QContactEmailAddress>(updateContact, importedContact);
rv |= updateExistingDetails<QContactFamily>(updateContact, importedContact);
rv |= updateExistingDetails<QContactGeoLocation>(updateContact, importedContact);
rv |= updateExistingDetails<QContactGuid>(updateContact, importedContact);
rv |= updateExistingDetails<QContactHobby>(updateContact, importedContact);
rv |= updateExistingDetails<QContactNickname>(updateContact, importedContact);
Expand Down Expand Up @@ -314,8 +318,6 @@ QList<QContact> SeasideImport::buildImportContacts(const QList<QVersitDocument>
QHash<QString, int> importLabels;

QSet<QContactDetail::DetailType> unimportableDetailTypes;
unimportableDetailTypes.insert(QContactDetail::TypeFamily);
unimportableDetailTypes.insert(QContactDetail::TypeGeoLocation);
unimportableDetailTypes.insert(QContactDetail::TypeGlobalPresence);
unimportableDetailTypes.insert(QContactDetail::TypeVersion);

Expand Down

0 comments on commit 0bdd795

Please sign in to comment.