Commit 8596aa59 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new API

parent 92bbefff
Pipeline #23724 passed with stage
in 90 minutes and 28 seconds
cmake_minimum_required(VERSION 3.5)
set(PIM_VERSION "5.14.47")
set(PIM_VERSION "5.14.48")
if (POLICY CMP0053)
cmake_policy(SET CMP0053 NEW)
......@@ -32,7 +32,7 @@ set(KMIME_LIB_VERSION "5.14.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.14.45")
set(LIBKDEPIM_LIB_VERSION "5.14.45")
set(LIBKLEO_LIB_VERSION "5.14.40")
set(PIMCOMMON_LIB_VERSION "5.14.44")
set(PIMCOMMON_LIB_VERSION "5.14.46")
set(GPGME_LIB_VERSION "1.11.1")
set(AKONADI_CONTACT_VERSION "5.14.40")
......@@ -92,13 +92,13 @@ find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IdentityManagement ${IDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Mbox ${KMBOX_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiSearch "5.14.40" CONFIG REQUIRED)
set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://kde.org/" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi")
......
......@@ -230,7 +230,6 @@ target_link_libraries(KF5MessageComposer
KF5::PimTextEdit
KF5::TemplateParser
KF5::AkonadiWidgets
KF5::LibkdepimAkonadi
KF5::PimCommonAkonadi
KF5::KIOCore
KF5::I18n
......
......@@ -28,7 +28,7 @@
using namespace MessageComposer;
ComposerLineEdit::ComposerLineEdit(bool useCompletion, QWidget *parent)
: KPIM::AddresseeLineEdit(parent, useCompletion)
: PimCommon::AddresseeLineEdit(parent, useCompletion)
{
allowSemicolonAsSeparator(MessageComposerSettings::allowSemicolonAsAddressSeparator());
setShowRecentAddresses(MessageComposerSettings::self()->showRecentAddressesInComposer());
......
......@@ -23,12 +23,12 @@
#define MESSAGECOMPOSER_COMPOSERLINEEDIT_H
#include "messagecomposer_export.h"
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
namespace MessageComposer {
/**
* @brief The ComposerLineEdit class
*/
class MESSAGECOMPOSER_EXPORT ComposerLineEdit : public KPIM::AddresseeLineEdit
class MESSAGECOMPOSER_EXPORT ComposerLineEdit : public PimCommon::AddresseeLineEdit
{
Q_OBJECT
......
......@@ -40,7 +40,7 @@
#include "sendlater/sendlaterinfo.h"
#include "sendlater/sendlatercreatejob.h"
#include <Libkdepim/RecentAddresses>
#include <PimCommonAkonadi/RecentAddresses>
#include "helper/messagehelper.h"
#include <MessageComposer/RecipientsEditor>
......@@ -945,15 +945,15 @@ void ComposerViewBase::saveRecentAddresses(const KMime::Message::Ptr &msg)
KConfig *config = MessageComposer::MessageComposerSettings::self()->config();
const QVector<QByteArray> toAddresses = msg->to()->addresses();
for (const QByteArray &address : toAddresses) {
KPIM::RecentAddresses::self(config)->add(QLatin1String(address));
PimCommon::RecentAddresses::self(config)->add(QLatin1String(address));
}
const QVector<QByteArray> ccAddresses = msg->cc()->addresses();
for (const QByteArray &address : ccAddresses) {
KPIM::RecentAddresses::self(config)->add(QLatin1String(address));
PimCommon::RecentAddresses::self(config)->add(QLatin1String(address));
}
const QVector<QByteArray> bccAddresses = msg->bcc()->addresses();
for (const QByteArray &address : bccAddresses) {
KPIM::RecentAddresses::self(config)->add(QLatin1String(address));
PimCommon::RecentAddresses::self(config)->add(QLatin1String(address));
}
}
......
......@@ -10,5 +10,6 @@ target_link_libraries(recipienteditortest KF5::KIOCore KF5::AkonadiContact KF5::
set(composerlineedittest_SRCS testcomposerlineedit.cpp)
add_executable(composerlineedittest ${composerlineedittest_SRCS})
ecm_mark_as_test(composerlineedittest)
target_link_libraries(composerlineedittest KF5::MessageComposer KF5::LibkdepimAkonadi KF5::Completion KF5::Ldap KF5::I18n)
target_link_libraries(composerlineedittest KF5::MessageComposer KF5::PimCommonAkonadi KF5::Completion KF5::Ldap KF5::I18n)
......@@ -321,7 +321,6 @@ target_link_libraries(KF5MessageViewer
KF5::ItemViews
Qt5::Network
KF5::WebEngineViewer
KF5::LibkdepimAkonadi
KF5::GrantleeTheme
KF5::KaddressbookGrantlee
KF5::MailTransportAkonadi
......@@ -334,6 +333,7 @@ target_link_libraries(KF5MessageViewer
KF5::KIOFileWidgets
KF5::KIOWidgets
KF5::XmlGui
KF5::AkonadiContact
Grantlee5::Templates
Qt5::PrintSupport
QGpgme
......
......@@ -26,7 +26,7 @@
using KContacts::VCardConverter;
using KContacts::Addressee;
#include <ContactDefaultActions>
#include <Akonadi/Contact/ContactDefaultActions>
#include <KLocalizedString>
#include <Akonadi/Contact/AddContactJob>
......
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