Commit 2e99b037 authored by Laurent Montel's avatar Laurent Montel 😁

Adapt to new api

parent 231907dc
......@@ -60,7 +60,7 @@ set(KDEPIMRUNTIME_LIB_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}.0")
set(KDEPIMRUNTIME_LIB_SOVERSION "5")
set(KCONTACTS_LIB_VERSION "4.89.0")
set(KCONTACTS_LIB_VERSION "4.91.0")
set(KCALENDARCORE_LIB_VERSION "4.79.0")
set(IDENTITYMANAGEMENT_LIB_VERSION "4.78.0")
set(KMAILTRANSPORT_LIB_VERSION "4.78.0")
......
......@@ -264,7 +264,7 @@ void SerializerPluginAddressee::compare(Akonadi::AbstractDifferencesReporter *re
if (leftContact.url() != rightContact.url())
reporter->addProperty(AbstractDifferencesReporter::ConflictMode, KContacts::Addressee::urlLabel(),
leftContact.url().toDisplayString(), rightContact.url().toDisplayString());
leftContact.url().url().toDisplayString(), rightContact.url().url().toDisplayString());
compareList(reporter, i18n("Emails"), leftContact.emails(), rightContact.emails());
compareVector(reporter, i18n("Phone Numbers"), leftContact.phoneNumbers(), rightContact.phoneNumbers());
......
......@@ -9,7 +9,7 @@ find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED)
# Extra package
find_package(KF5GAPI "4.72.0" CONFIG)
find_package(KF5GAPI "4.74.0" CONFIG)
......
......@@ -169,7 +169,9 @@ void OXA::ContactUtils::parseContact(const QDomElement &propElement, Object &obj
} else if (tagName == QLatin1String("note")) {
contact.setNote(text);
} else if (tagName == QLatin1String("url")) {
contact.setUrl(QUrl(text));
KContacts::ResourceLocatorUrl url;
url.setUrl(QUrl(text));
contact.setUrl(url);
} else if (tagName == QLatin1String("image1")) {
const QByteArray data = text.toUtf8();
contact.setPhoto(KContacts::Picture(QImage::fromData(QByteArray::fromBase64(data))));
......@@ -322,7 +324,7 @@ void OXA::ContactUtils::addContactElements(QDomDocument &document, QDomElement &
// further information
DAVUtils::addOxElement(document, propElement, QStringLiteral("note"), OXUtils::writeString(contact.note()));
DAVUtils::addOxElement(document, propElement, QStringLiteral("url"), OXUtils::writeString(contact.url().url()));
DAVUtils::addOxElement(document, propElement, QStringLiteral("url"), OXUtils::writeString(contact.url().url().url()));
// image
const KContacts::Picture photo = contact.photo();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment