Commit 33a254cd authored by Laurent Montel's avatar Laurent Montel 😁

Remove dependancy against libkdepimakonadi

parent ce2ab0ec
Pipeline #23703 passed with stage
in 15 minutes and 43 seconds
......@@ -59,9 +59,9 @@ find_package(KF5Akonadi ${AKONADI_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Contacts ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Purpose ${KF5_MIN_VERSION} CONFIG REQUIRED)
......
......@@ -153,9 +153,9 @@ target_link_libraries(KF5PimCommonAkonadi
KF5::KIOCore
KF5::ConfigWidgets
KF5::IMAP
KF5::Libkdepim
PRIVATE
KF5::I18n
KF5::LibkdepimAkonadi
KF5::Codecs
KF5::PimTextEdit
KF5::XmlGui
......@@ -271,7 +271,7 @@ ecm_generate_headers(PimCommonAkonadiUtil_CamelCase_HEADERS
ecm_generate_headers(PimCommonAkonadi_Camelcaseprogresswidget_HEADERS
HEADER_NAMES
ProgressManagerAkonadi
REQUIRED_HEADERS libkdepimakonadi_progresswidget_HEADERS
REQUIRED_HEADERS PimCommonAkonadi_progresswidget_HEADERS
PREFIX PimCommonAkonadi
RELATIVE progresswidget
)
......
......@@ -20,7 +20,7 @@
#include "aclentrydialog_p.h"
#include "aclutils_p.h"
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
#include <Akonadi/Contact/EmailAddressSelectionDialog>
......@@ -54,7 +54,7 @@ public:
AclEntryDialog *q = nullptr;
QButtonGroup *mButtonGroup = nullptr;
KPIM::AddresseeLineEdit *mUserIdLineEdit = nullptr;
PimCommon::AddresseeLineEdit *mUserIdLineEdit = nullptr;
QVBoxLayout *mButtonLayout = nullptr;
KIMAP::Acl::Rights mCustomPermissions;
QPushButton *mOkButton = nullptr;
......@@ -102,7 +102,7 @@ AclEntryDialog::AclEntryDialog(QWidget *parent)
QLabel *label = new QLabel(i18n("&User identifier:"), page);
layout->addWidget(label, 0, 0);
d->mUserIdLineEdit = new KPIM::AddresseeLineEdit(page);
d->mUserIdLineEdit = new PimCommon::AddresseeLineEdit(page);
layout->addWidget(d->mUserIdLineEdit, 0, 1);
label->setBuddy(d->mUserIdLineEdit);
d->mUserIdLineEdit->setWhatsThis(
......@@ -137,7 +137,7 @@ AclEntryDialog::AclEntryDialog(QWidget *parent)
layout->addWidget(label, 2, 0, 1, 3);
layout->setRowStretch(2, 10);
connect(d->mUserIdLineEdit, &KPIM::AddresseeLineEdit::textChanged, this, [this]() {
connect(d->mUserIdLineEdit, &AddresseeLineEdit::textChanged, this, [this]() {
d->slotChanged();
});
connect(button, &QPushButton::clicked, this, [this]() {
......
......@@ -31,7 +31,7 @@
#ifndef KDEPIM_RECENTADDRESSES_H
#define KDEPIM_RECENTADDRESSES_H
#include "kdepim_export.h"
#include "pimcommonakonadi_export.h"
#include <KContacts/Addressee>
#include <QStringList>
class KConfig;
......@@ -44,7 +44,7 @@ namespace PimCommon {
* @author Carsten Pfeiffer <pfeiffer@kde.org>
*/
class KDEPIM_EXPORT RecentAddresses
class PIMCOMMONAKONADI_EXPORT RecentAddresses
{
public:
~RecentAddresses();
......
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