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

Use new akonadi calendar install include

parent d6369985
Pipeline #140533 failed with stage
in 31 seconds
......@@ -86,7 +86,7 @@ set(KPIMTEXTEDIT_LIB_VERSION "5.19.40")
set(KIMAP_LIB_VERSION "5.19.40")
set(LIBKSIEVE_LIB_VERSION "5.19.40")
set(KMAILTRANSPORT_LIB_VERSION "5.19.41")
set(AKONADICONTACT_LIB_VERSION "5.19.40")
set(AKONADICONTACT_LIB_VERSION "5.19.41")
set(IMPORTWIZARD_LIB_VERSION "5.19.40")
set(MAILIMPORTER_LIB_VERSION "5.19.40")
set(KPIMPKPASS_LIB_VERSION "5.19.40")
......
......@@ -7,7 +7,7 @@
#pragma once
#include <ContactEditor/ContactEditorPagePlugin>
#include <Akonadi/ContactEditorPagePlugin>
namespace Kleo
{
......
......@@ -5,7 +5,7 @@
*/
#include "vcardviewerdialog.h"
#include <Akonadi/Contact/GrantleeContactViewer>
#include <Akonadi/GrantleeContactViewer>
#include <KConfigGroup>
#include <KLocalizedString>
#include <KSharedConfig>
......
......@@ -9,8 +9,8 @@
#include "../searchduplicate/searchduplicateresultwidget.h"
#include "../widgets/mergecontactloseinformationwarning.h"
#include <Akonadi/CollectionComboBox>
#include <Akonadi/Contact/GrantleeContactViewer>
#include <Akonadi/EntityTreeModel>
#include <Akonadi/GrantleeContactViewer>
#include <KContacts/Addressee>
#include <QLabel>
#include <QLayout>
......
......@@ -10,7 +10,7 @@
#include "resultduplicatetreewidget.h"
#include <Akonadi/CollectionComboBox>
#include <Akonadi/Contact/GrantleeContactViewer>
#include <Akonadi/GrantleeContactViewer>
#include <KLocalizedString>
#include <QHBoxLayout>
#include <QLabel>
......
......@@ -5,7 +5,7 @@
*/
#include "mergecontactinfowidget.h"
#include <Akonadi/Contact/GrantleeContactViewer>
#include <Akonadi/GrantleeContactViewer>
#include <QHBoxLayout>
#include <QLabel>
......
......@@ -7,7 +7,7 @@
#include "sendvcardsjob.h"
#include "kaddressbook_sendvcardsplugin_debug.h"
#include <Akonadi/Contact/ContactGroupExpandJob>
#include <Akonadi/ContactGroupExpandJob>
#include <Akonadi/ItemFetchJob>
#include <Akonadi/ItemFetchScope>
#include <KEMailClientLauncherJob>
......
......@@ -9,7 +9,7 @@
#include <QHBoxLayout>
#include <QTreeView>
#include <Akonadi/Contact/EmailAddressSelectionWidget>
#include <Akonadi/EmailAddressSelectionWidget>
SelectMailWidget::SelectMailWidget(QWidget *parent)
: QWidget(parent)
......
......@@ -11,8 +11,9 @@
#include <Akonadi/AgentTypeDialog>
#include <Akonadi/CollectionFetchJob>
#include <Akonadi/CollectionFetchScope>
#include <Akonadi/Contact/ContactSearchJob>
#include <Akonadi/ContactSearchJob>
#include <Akonadi/ItemCreateJob>
#include <Akonadi/SelectAddressBookDialog>
#include <KContacts/Addressee>
#include <KContacts/ContactGroup>
#include <KEmailAddress>
......@@ -20,7 +21,6 @@
#include <KMessageBox>
#include <PimCommon/PimUtil>
#include <QPointer>
#include <akonadi/contact/selectaddressbookdialog.h>
AutomaticAddContactsJob::AutomaticAddContactsJob(QObject *parent)
: QObject(parent)
......
......@@ -5,7 +5,7 @@
*/
#include "emailaddressselectionldapdialog.h"
#include <Akonadi/Contact/RecipientsPickerWidget>
#include <Akonadi/RecipientsPickerWidget>
#include <KConfigGroup>
#include <KLocalizedString>
#include <KPluginFactory>
......
......@@ -5,7 +5,7 @@
*/
#pragma once
#include <Akonadi/Contact/AbstractEmailAddressSelectionDialog>
#include <Akonadi/AbstractEmailAddressSelectionDialog>
namespace Akonadi
{
class RecipientsPickerWidget;
......
......@@ -25,10 +25,10 @@
#include <MimeTreeParser/NodeHelper>
using MimeTreeParser::Interface::BodyPart;
#include <Akonadi/Contact/AddContactJob>
#include <Akonadi/AddContactJob>
#include <Akonadi/Contact/ContactViewer>
#include <Akonadi/Contact/StandardContactFormatter>
#include <Akonadi/ContactViewer>
#include <Akonadi/StandardContactFormatter>
#include <KIO/FileCopyJob>
#include <KIO/StatJob>
......
......@@ -5,7 +5,7 @@
*/
#include "updatecontactjob.h"
#include <Akonadi/Contact/ContactSearchJob>
#include <Akonadi/ContactSearchJob>
#include <Akonadi/ItemModifyJob>
#include <KLocalizedString>
#include <KMessageBox>
......
......@@ -6,7 +6,7 @@
#include "vcardmemento.h"
#include "vcard_debug.h"
#include <Akonadi/Contact/ContactSearchJob>
#include <Akonadi/ContactSearchJob>
using namespace MessageViewer;
VcardMemento::VcardMemento(const QStringList &emails)
......
......@@ -6,7 +6,7 @@
#include "templateparseremailaddressrequesterakonaditest.h"
#include "../templateparseremailaddressrequesterakonadi.h"
#include <Akonadi/Contact/EmailAddressRequester>
#include <Akonadi/EmailAddressRequester>
#include <QHBoxLayout>
#include <QSignalSpy>
#include <QTest>
......
......@@ -5,7 +5,7 @@
*/
#include "templateparseremailaddressrequesterakonadi.h"
#include <Akonadi/Contact/EmailAddressRequester>
#include <Akonadi/EmailAddressRequester>
#include <KPluginFactory>
#include <QHBoxLayout>
......
......@@ -6,7 +6,7 @@
#include "emaillineedit.h"
#include "sieveeditoremaillineditplugin_debug.h"
#include <Akonadi/Contact/EmailAddressSelectionDialog>
#include <Akonadi/EmailAddressSelectionDialog>
#include <KPluginFactory>
#include <KColorScheme>
......
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