Commit 8c28846e authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Fix new api

parent c6d8193c
Pipeline #23361 failed with stage
in 109 minutes and 18 seconds
...@@ -8,11 +8,10 @@ kcoreaddons_add_plugin(kaddressbook_importexportldapplugin JSON kaddressbook_imp ...@@ -8,11 +8,10 @@ kcoreaddons_add_plugin(kaddressbook_importexportldapplugin JSON kaddressbook_imp
${kaddressbook_importexport_ldap_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin) ${kaddressbook_importexport_ldap_SRCS} INSTALL_NAMESPACE kaddressbook/importexportplugin)
target_link_libraries(kaddressbook_importexportldapplugin KF5::KaddressbookImportExport target_link_libraries(kaddressbook_importexportldapplugin KF5::KaddressbookImportExport
KF5::PimCommon
KF5::AkonadiCore KF5::AkonadiCore
KF5::I18n KF5::I18n
KF5::XmlGui KF5::XmlGui
KF5::Contacts KF5::Contacts
kaddressbookimportexportlibprivate kaddressbookimportexportlibprivate
KF5::Libkdepim KF5::PimCommonAkonadi
) )
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <KActionCollection> #include <KActionCollection>
#include <QAction> #include <QAction>
#include <QPointer> #include <QPointer>
#include <Libkdepim/LdapSearchDialog> #include <PimCommonAkonadi/LdapSearchDialog>
#include "../shared/importexportengine.h" #include "../shared/importexportengine.h"
LDapImportExportPluginInterface::LDapImportExportPluginInterface(QObject *parent) LDapImportExportPluginInterface::LDapImportExportPluginInterface(QObject *parent)
...@@ -63,7 +63,7 @@ void LDapImportExportPluginInterface::slotImportLdap() ...@@ -63,7 +63,7 @@ void LDapImportExportPluginInterface::slotImportLdap()
void LDapImportExportPluginInterface::importLdap() void LDapImportExportPluginInterface::importLdap()
{ {
KAddressBookImportExport::KAddressBookImportExportContactList contactList; KAddressBookImportExport::KAddressBookImportExportContactList contactList;
QPointer<KLDAP::LdapSearchDialog> dlg = new KLDAP::LdapSearchDialog(parentWidget()); QPointer<PimCommon::LdapSearchDialog> dlg = new PimCommon::LdapSearchDialog(parentWidget());
if (dlg->exec()) { if (dlg->exec()) {
contactList.setAddressList(dlg->selectedContacts()); contactList.setAddressList(dlg->selectedContacts());
......
...@@ -13,5 +13,5 @@ kcoreaddons_add_plugin(emailaddressselectionldapdialogplugin JSON emailaddressse ...@@ -13,5 +13,5 @@ kcoreaddons_add_plugin(emailaddressselectionldapdialogplugin JSON emailaddressse
${emailaddressselectionldapdialog_SRCS} INSTALL_NAMESPACE akonadi) ${emailaddressselectionldapdialog_SRCS} INSTALL_NAMESPACE akonadi)
target_link_libraries(emailaddressselectionldapdialogplugin target_link_libraries(emailaddressselectionldapdialogplugin
KF5::I18n KF5::AkonadiContact KF5::Libkdepim KF5::I18n KF5::AkonadiContact KF5::PimCommonAkonadi
) )
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <KConfigGroup> #include <KConfigGroup>
#include <KLocalizedString> #include <KLocalizedString>
#include <KSharedConfig> #include <KSharedConfig>
#include <Libkdepim/LdapSearchDialog> #include <PimCommonAkonadi/LdapSearchDialog>
#include <QBoxLayout> #include <QBoxLayout>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QPushButton> #include <QPushButton>
...@@ -97,8 +97,8 @@ Akonadi::EmailAddressSelectionWidget *EmailAddressSelectionLdapDialog::view() co ...@@ -97,8 +97,8 @@ Akonadi::EmailAddressSelectionWidget *EmailAddressSelectionLdapDialog::view() co
void EmailAddressSelectionLdapDialog::slotSearchLDAP() void EmailAddressSelectionLdapDialog::slotSearchLDAP()
{ {
if (!mLdapSearchDialog) { if (!mLdapSearchDialog) {
mLdapSearchDialog = new KLDAP::LdapSearchDialog(this); mLdapSearchDialog = new PimCommon::LdapSearchDialog(this);
connect(mLdapSearchDialog, &KLDAP::LdapSearchDialog::contactsAdded, this, &EmailAddressSelectionLdapDialog::ldapSearchResult); connect(mLdapSearchDialog, &PimCommon::LdapSearchDialog::contactsAdded, this, &EmailAddressSelectionLdapDialog::ldapSearchResult);
} }
mLdapSearchDialog->setSearchText(mView->emailAddressSelectionWidget()->searchLineEdit()->text()); mLdapSearchDialog->setSearchText(mView->emailAddressSelectionWidget()->searchLineEdit()->text());
......
...@@ -24,7 +24,7 @@ namespace Akonadi { ...@@ -24,7 +24,7 @@ namespace Akonadi {
class RecipientsPickerWidget; class RecipientsPickerWidget;
} }
namespace KLDAP { namespace PimCommon {
class LdapSearchDialog; class LdapSearchDialog;
} }
...@@ -43,7 +43,7 @@ private: ...@@ -43,7 +43,7 @@ private:
void slotSearchLDAP(); void slotSearchLDAP();
void ldapSearchResult(); void ldapSearchResult();
Akonadi::RecipientsPickerWidget *mView = nullptr; Akonadi::RecipientsPickerWidget *mView = nullptr;
KLDAP::LdapSearchDialog *mLdapSearchDialog = nullptr; PimCommon::LdapSearchDialog *mLdapSearchDialog = nullptr;
}; };
#endif // EMAILADDRESSSELECTIONLDAPDIALOG_H #endif // EMAILADDRESSSELECTIONLDAPDIALOG_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