Commit 303f4b2a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new API

parent 9ed38c58
Pipeline #23731 passed with stage
in 20 minutes and 4 seconds
......@@ -42,6 +42,7 @@ set(EVENTVIEW_LIB_VERSION "5.14.40")
set(AKONADI_VERSION "5.14.40")
set(AKONADICONTACT_LIB_VERSION "5.14.40")
set(AKONADICALENDAR_LIB_VERSION "5.14.41")
set(PIMCOMMON_LIB_VERSION_LIB "5.14.46")
set(KDIAGRAM_LIB_VERSION "1.4.0")
find_package(KGantt ${KDIAGRAM_LIB_VERSION} CONFIG REQUIRED)
......@@ -53,12 +54,14 @@ find_package(KF5IconThemes ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5AkonadiMime ${AKONADI_MIMELIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5Ldap ${KLDAP_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarUtils ${CALENDARUTILS_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5CalendarCore ${KF5_MIN_VERSION} CONFIG REQUIRED)
find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED)
......
......@@ -113,7 +113,6 @@ PUBLIC
KF5::EventViews
PRIVATE
KGantt # For FreeBusy Editor
KF5::LibkdepimAkonadi
KF5::Codecs
KF5::Ldap
KF5::AkonadiWidgets
......@@ -123,6 +122,9 @@ PRIVATE
KF5::TextWidgets
KF5::WidgetsAddons
KF5::XmlGui
KF5::Contacts
KF5::Libkdepim
KF5::PimCommonAkonadi
)
target_include_directories(KF5IncidenceEditor INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/IncidenceEditor/;${KDE_INSTALL_INCLUDEDIR_KF5}/incidenceeditor>")
target_include_directories(KF5IncidenceEditor PUBLIC "$<BUILD_INTERFACE:${incidenceeditor_SOURCE_DIR}/src;${incidenceeditor_BINARY_DIR}/src;>")
......
......@@ -123,7 +123,7 @@ void AttendeeLineEdit::keyPressEvent(QKeyEvent *ev)
if ((ev->key() == Qt::Key_Enter || ev->key() == Qt::Key_Return)
&& !completionBox()->isVisible()) {
Q_EMIT downPressed();
KPIM::AddresseeLineEdit::keyPressEvent(ev);
PimCommon::AddresseeLineEdit::keyPressEvent(ev);
} else if (ev->key() == Qt::Key_Backspace && text().isEmpty()) {
ev->accept();
Q_EMIT deleteMe();
......@@ -140,7 +140,7 @@ void AttendeeLineEdit::keyPressEvent(QKeyEvent *ev)
} else if (ev->key() == Qt::Key_Up) {
Q_EMIT upPressed();
} else {
KPIM::AddresseeLineEdit::keyPressEvent(ev);
PimCommon::AddresseeLineEdit::keyPressEvent(ev);
}
}
......
......@@ -21,7 +21,7 @@
#ifndef INCIDENCEEDITOR_ATTENDEELINE_H
#define INCIDENCEEDITOR_ATTENDEELINE_H
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
#include <Libkdepim/MultiplyingLine>
#include <KCalendarCore/Attendee>
......@@ -65,7 +65,7 @@ private:
int mCurrentIndex;
};
class AttendeeLineEdit : public KPIM::AddresseeLineEdit
class AttendeeLineEdit : public PimCommon::AddresseeLineEdit
{
Q_OBJECT
public:
......
......@@ -441,7 +441,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="KPIM::AddresseeLineEdit" name="mEmailAddress">
<widget class="PimCommon::AddresseeLineEdit" name="mEmailAddress">
<property name="toolTip">
<string>Specify a list of addresses to send email when the reminder triggers.
If the 'To:' field stays empty the email reminder will be sent to the
......@@ -483,9 +483,9 @@ default email configured in Kmail (Settings menu/Configure Kmail/Identities).</s
</widget>
<customwidgets>
<customwidget>
<class>KPIM::AddresseeLineEdit</class>
<class>PimCommon::AddresseeLineEdit</class>
<extends>KLineEdit</extends>
<header>LibkdepimAkonadi/AddresseeLineEdit</header>
<header>PimCommonAkonadi/AddresseeLineEdit</header>
</customwidget>
<customwidget>
<class>KLineEdit</class>
......@@ -510,7 +510,7 @@ default email configured in Kmail (Settings menu/Configure Kmail/Identities).</s
</customwidget>
</customwidgets>
<includes>
<include location="global">LibkdepimAkonadi/AddresseeLineEdit</include>
<include location="global">PimCommonAkonadi/AddresseeLineEdit</include>
</includes>
<resources/>
<connections>
......
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