diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@
set(KCALENDARCORE_LIB_VERSION "5.11.40")
-set(KCONTACTS_LIB_VERSION "5.11.40")
+set(KCONTACTS_LIB_VERSION "5.11.44")
ecm_setup_version(PROJECT
VARIABLE_PREFIX KGAPI
diff --git a/src/contacts/contact.h b/src/contacts/contact.h
--- a/src/contacts/contact.h
+++ b/src/contacts/contact.h
@@ -136,90 +136,6 @@
*/
QDateTime updated() const;
- /**
- * @brief Sets name of contact's spouse.
- *
- * @param name
- */
- void setSpousesName(const QString &name);
-
- /**
- * @brief Returns name of contacts' spouse
- */
- QString spousesName() const;
-
- /**
- * @brief Sets name of contact's manager.
- *
- * @param name
- */
- void setManagersName(const QString &name);
-
- /**
- * @brief Returns name of contact's manager.
- */
- QString managersName() const;
-
- /**
- * @brief Sets assistant's name.
- *
- * @param name
- */
- void setAssistantsName(const QString &name);
-
- /**
- * @brief Returns name of contact's assistant.
- */
- QString assistantsName() const;
-
- /**
- * @brief Sets contact's profession.
- *
- * @param profession
- */
- void setProfession(const QString &profession);
-
- /**
- * @brief Returns contact's profession.
- */
- QString profession() const;
-
- /**
- * @brief Sets address of contact's office.
- *
- * @param office
- */
- void setOffice(const QString &office);
-
- /**
- * @brief Returns address of contacts' office.
- */
- QString office() const;
-
- /**
- * @brief Sets date of contact's anniversary.
- *
- * @param anniversary
- */
- void setAnniversary(const QString &anniversary);
-
- /**
- * @brief Returns date of contact's anniversary
- */
- QString anniversary() const;
-
- /**
- * @brief Sets URL of contact's blog.
- *
- * @param url
- */
- void setBlogFeed(const QString &url);
-
- /**
- * @brief Returns URL of contact's blog.
- */
- QString blogFeed() const;
-
/**
* @brief Set list of groups the contact is member of.
*
diff --git a/src/contacts/contact.cpp b/src/contacts/contact.cpp
--- a/src/contacts/contact.cpp
+++ b/src/contacts/contact.cpp
@@ -173,76 +173,6 @@
return d->updated;
}
-void Contact::setSpousesName(const QString &name)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-SpousesName"), name);
-}
-
-QString Contact::spousesName() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-SpousesName"));
-}
-
-void Contact::setManagersName(const QString &name)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-ManagersName"), name);
-}
-
-QString Contact::managersName() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-ManagersName"));
-}
-
-void Contact::setAssistantsName(const QString &name)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-AssistantsName"), name);
-}
-
-QString Contact::assistantsName() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-AssistantsName"));
-}
-
-void Contact::setProfession(const QString &profession)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Profession"), profession);
-}
-
-QString Contact::profession() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Profession"));
-}
-
-void Contact::setOffice(const QString &office)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Office"), office);
-}
-
-QString Contact::office() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Office"));
-}
-
-void Contact::setAnniversary(const QString &anniversary)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Anniversary"), anniversary);
-}
-
-QString Contact::anniversary() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-Anniversary"));
-}
-
-void Contact::setBlogFeed(const QString &url)
-{
- insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("BlogFeed"), url);
-}
-
-QString Contact::blogFeed() const
-{
- return custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("BlogFeed"));
-}
-
void Contact::addGroup(const QString &group)
{
if (d->groups.contains(group))
diff --git a/src/contacts/contactsservice.cpp b/src/contacts/contactsservice.cpp
--- a/src/contacts/contactsservice.cpp
+++ b/src/contacts/contactsservice.cpp
@@ -420,7 +420,7 @@
if (event.value(QStringLiteral("rel")).toString() == QLatin1String("anniversary")) {
QVariantMap when = event.value(QStringLiteral("gd$when")).toMap();
- contact->setAnniversary(when.value(QStringLiteral("startTime")).toString());
+ contact->setAnniversary(QDate::fromString(when.value(QStringLiteral("startTime")).toString(), Qt::ISODate));
}
}
}
@@ -448,7 +448,7 @@
locator.setParameters({ { QStringLiteral("TYPE"), { QStringLiteral("PROFILE") } } });
contact->insertExtraUrl(locator);
} else if (rel == QLatin1String("blog")) {
- contact->setBlogFeed(url.toString(QUrl::PrettyDecoded));
+ contact->setBlogFeed(url);
} else {
KContacts::ResourceLocatorUrl locator;
locator.setUrl(url);
@@ -674,14 +674,14 @@
}
/* Anniversary */
- const QString anniversary = contact->anniversary();
+ const QString anniversary = contact->anniversary().toString(Qt::ISODate);
if (!anniversary.isEmpty()) {
output.append("");
parsedCustoms << QStringLiteral("KADDRESSBOOK-X-Anniversary");
}
/* Blog */
- const QString blog = contact->blogFeed();
+ const QString blog = contact->blogFeed().url();
if (!blog.isEmpty()) {
output.append("");
parsedCustoms << QStringLiteral("KADDRESSBOOK-BlogFeed");
@@ -1009,16 +1009,16 @@
if (e.tagName() == QLatin1String("gContact:event")) {
if (e.attribute(QStringLiteral("rel"), QString()) == QLatin1String("anniversary")) {
QDomElement w = e.firstChildElement(QStringLiteral("gd:when"));
- contact->setAnniversary(w.attribute(QStringLiteral("startTime"), QString()));
+ contact->setAnniversary(QDate::fromString(w.attribute(QStringLiteral("startTime"), QString()), Qt::ISODate));
}
continue;
}
/* Websites */
if (e.tagName() == QLatin1String("gContact:website")) {
if (e.attribute(QStringLiteral("rel"), QString()) == QLatin1String("blog")) {
- contact->setBlogFeed(e.attribute(QStringLiteral("href"), QString()));
+ contact->setBlogFeed(QUrl(e.attribute(QStringLiteral("href"), QString())));
continue;
}