Commit d1f09a9e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new API

parent a89fa00e
Pipeline #23732 failed with stage
in 18 minutes and 32 seconds
......@@ -121,7 +121,7 @@ find_package(KF5KontactInterface ${KONTACTINTERFACE_LIB_VERSION} CONFIG REQUIRED
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Gravatar ${LIBGRAVATAR_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
......
......@@ -343,7 +343,6 @@ target_link_libraries(kmailprivate
KF5::KCMUtils
KF5::Libkleo
KF5::KSieveUi
KF5::LibkdepimAkonadi
KF5::KIOCore
KF5::Contacts
KF5::PimTextEdit
......@@ -384,7 +383,6 @@ add_library(kmailpart MODULE ${kmailpart_PART_SRCS})
target_link_libraries(kmailpart
kmailprivate
KF5::PimCommon
KF5::LibkdepimAkonadi
KF5::KCMUtils
KF5::Parts
KF5::IconThemes
......
......@@ -33,10 +33,10 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
#include <TemplateParser/CustomTemplates>
#include "globalsettings_templateparser.h"
#include <Libkdepim/RecentAddresses>
#include <PimCommonAkonadi/RecentAddresses>
#include <KLDAP/LdapClientSearch>
#include <LibkdepimAkonadi/CompletionOrderEditor>
using KPIM::RecentAddresses;
#include <PimCommonAkonadi/CompletionOrderEditor>
using PimCommon::RecentAddresses;
#include <KLocalizedString>
#include <KSeparator>
......@@ -57,7 +57,7 @@ using KPIM::RecentAddresses;
#include <QRegularExpression>
#include <QRegularExpressionValidator>
#include <LibkdepimAkonadi/CompletionConfigureDialog>
#include <PimCommonAkonadi/CompletionConfigureDialog>
#ifdef KDEPIM_ENTERPRISE_BUILD
#include <QComboBox>
#endif
......@@ -578,8 +578,8 @@ void ComposerPage::GeneralTab::save()
void ComposerPage::GeneralTab::slotConfigureAddressCompletion()
{
KLDAP::LdapClientSearch search;
QPointer<KPIM::CompletionConfigureDialog> dlg(new KPIM::CompletionConfigureDialog(this));
dlg->setRecentAddresses(KPIM::RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->addresses());
QPointer<PimCommon::CompletionConfigureDialog> dlg(new PimCommon::CompletionConfigureDialog(this));
dlg->setRecentAddresses(PimCommon::RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->addresses());
dlg->setLdapClientSearch(&search);
KSharedConfig::Ptr config = KSharedConfig::openConfig(QStringLiteral("kpimbalooblacklist"));
KConfigGroup group(config, "AddressLineEdit");
......@@ -589,7 +589,7 @@ void ComposerPage::GeneralTab::slotConfigureAddressCompletion()
dlg->load();
if (dlg->exec()) {
if (dlg->recentAddressWasChanged()) {
KPIM::RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->clear();
PimCommon::RecentAddresses::self(MessageComposer::MessageComposerSettings::self()->config())->clear();
dlg->storeAddresses(MessageComposer::MessageComposerSettings::self()->config());
}
}
......
......@@ -66,7 +66,7 @@
#include <PimCommon/AutoCorrectionLanguage>
#include <PimCommon/PimUtil>
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
#include <Libkdepim/LineEditCatchReturnKey>
// libkleopatra:
#include <Libkleo/KeySelectionCombo>
......@@ -506,7 +506,7 @@ IdentityDialog::IdentityDialog(QWidget *parent)
// "Reply-To Address" line edit and label:
++row;
mReplyToEdit = new KPIM::AddresseeLineEdit(tab, true);
mReplyToEdit = new PimCommon::AddresseeLineEdit(tab, true);
mReplyToEdit->setClearButtonEnabled(true);
mReplyToEdit->setObjectName(QStringLiteral("mReplyToEdit"));
glay->addWidget(mReplyToEdit, row, 1);
......@@ -528,7 +528,7 @@ IdentityDialog::IdentityDialog(QWidget *parent)
// "CC addresses" line edit and label:
++row;
mCcEdit = new KPIM::AddresseeLineEdit(tab, true);
mCcEdit = new PimCommon::AddresseeLineEdit(tab, true);
mCcEdit->setClearButtonEnabled(true);
mCcEdit->setObjectName(QStringLiteral("mCcEdit"));
glay->addWidget(mCcEdit, row, 1);
......@@ -548,7 +548,7 @@ IdentityDialog::IdentityDialog(QWidget *parent)
// "BCC addresses" line edit and label:
++row;
mBccEdit = new KPIM::AddresseeLineEdit(tab, true);
mBccEdit = new PimCommon::AddresseeLineEdit(tab, true);
mBccEdit->setClearButtonEnabled(true);
mBccEdit->setObjectName(QStringLiteral("mBccEdit"));
glay->addWidget(mBccEdit, row, 1);
......
......@@ -18,8 +18,8 @@ using PimCommon::BroadcastStatus;
#include "kmmainwidget.h"
#include "search/checkindexingmanager.h"
#include <Libkdepim/RecentAddresses>
using KPIM::RecentAddresses;
#include <PimCommonAkonadi/RecentAddresses>
using PimCommon::RecentAddresses;
#include "configuredialog/configuredialog.h"
#include "kmcommands.h"
#include "unityservicemanager.h"
......
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