Commit 81cee250 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new API

parent a73a518d
Pipeline #23733 failed with stage
in 48 minutes and 10 seconds
......@@ -66,7 +66,7 @@ find_package(KF5Holidays ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(MAILCOMMON_LIB_VERSION "5.14.44")
set(GRAVATAR_LIB_VERSION "5.14.41")
set(PIMCOMMON_LIB_VERSION "5.14.43")
set(PIMCOMMON_LIB_VERSION "5.14.46")
set(GRANTLEETHEME_LIB_VERSION "5.14.40")
set(CALENDARSUPPORT_LIB_VERSION "5.14.40")
set(EVENTVIEW_LIB_VERSION "5.14.40")
......@@ -101,7 +101,7 @@ find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUI
find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED)
......
......@@ -31,7 +31,7 @@ macro(add_messageviewer_bodyformatter_class_unittest _source _additional)
ecm_add_test(${_test}
TEST_NAME ${_name}
NAME_PREFIX "messageviewerplugins-"
LINK_LIBRARIES KF5::MessageViewer Qt5::Test KF5::PimTextEdit KF5::I18n KF5::Completion KF5::LibkdepimAkonadi
LINK_LIBRARIES KF5::MessageViewer Qt5::Test KF5::PimTextEdit KF5::I18n KF5::Completion KF5::PimCommonAkonadi
)
endmacro ()
add_messageviewer_bodyformatter_class_unittest(reactiontoinvitationdialogtest.cpp "../calendar/reactiontoinvitationdialog.cpp")
......
......@@ -24,7 +24,7 @@
#include <QCheckBox>
#include <QPushButton>
#include <QDialogButtonBox>
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
DelegateSelectorTest::DelegateSelectorTest(QObject *parent)
: QObject(parent)
......@@ -42,7 +42,7 @@ void DelegateSelectorTest::shouldHaveDefaultValue()
QVERIFY(label);
QVERIFY(!label->text().isEmpty());
KPIM::AddresseeLineEdit *mDelegate = w.findChild<KPIM::AddresseeLineEdit *>(QStringLiteral("delegate"));
PimCommon::AddresseeLineEdit *mDelegate = w.findChild<PimCommon::AddresseeLineEdit *>(QStringLiteral("delegate"));
QVERIFY(mDelegate);
QVERIFY(mDelegate->text().isEmpty());
......@@ -62,7 +62,7 @@ void DelegateSelectorTest::shouldHaveDefaultValue()
void DelegateSelectorTest::shouldChangeOkButtonState()
{
DelegateSelector w;
KPIM::AddresseeLineEdit *mDelegate = w.findChild<KPIM::AddresseeLineEdit *>(QStringLiteral("delegate"));
PimCommon::AddresseeLineEdit *mDelegate = w.findChild<PimCommon::AddresseeLineEdit *>(QStringLiteral("delegate"));
mDelegate->setEnableAkonadiSearch(false);
mDelegate->setEnableBalooSearch(false);
......
......@@ -32,7 +32,7 @@ target_link_libraries(messageviewer_bodypartformatter_text_calendar
KF5::MailTransportAkonadi
KF5::AkonadiMime
KF5::CalendarSupport
KF5::LibkdepimAkonadi
KF5::PimCommonAkonadi
KF5::MessageViewer
KF5::IncidenceEditor
KF5::PimTextEdit
......
......@@ -19,7 +19,7 @@
#include "attendeeselector.h"
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
#include <KEmailAddress>
#include <KLocalizedString>
......@@ -52,8 +52,8 @@ AttendeeSelector::AttendeeSelector(QWidget *parent)
connect(ui.removeButton, &QPushButton::clicked, this, &AttendeeSelector::removeClicked);
ui.attendeeEdit->setPlaceholderText(i18n("Click to add a new attendee"));
connect(ui.attendeeEdit, &KPIM::AddresseeLineEdit::textChanged, this, &AttendeeSelector::textChanged);
connect(ui.attendeeEdit, &KPIM::AddresseeLineEdit::returnPressed, this, &AttendeeSelector::addClicked);
connect(ui.attendeeEdit, &PimCommon::AddresseeLineEdit::textChanged, this, &AttendeeSelector::textChanged);
connect(ui.attendeeEdit, &PimCommon::AddresseeLineEdit::returnPressed, this, &AttendeeSelector::addClicked);
connect(ui.attendeeList, &QListWidget::itemSelectionChanged, this, &AttendeeSelector::selectionChanged);
mOkButton->setEnabled(false);
......
......@@ -13,7 +13,7 @@
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="KPIM::AddresseeLineEdit" name="attendeeEdit"/>
<widget class="PimCommon::AddresseeLineEdit" name="attendeeEdit"/>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="addButton">
......@@ -58,9 +58,9 @@
</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>
......@@ -69,7 +69,7 @@
</customwidget>
</customwidgets>
<includes>
<include location="local">LibkdepimAkonadi/AddresseeLineEdit</include>
<include location="local">PimCommonAkonadi/AddresseeLineEdit</include>
</includes>
<resources/>
<connections/>
......
......@@ -20,7 +20,7 @@
#include "delegateselector.h"
#include <LibkdepimAkonadi/AddresseeLineEdit>
#include <PimCommonAkonadi/AddresseeLineEdit>
#include <KLocalizedString>
......@@ -40,11 +40,11 @@ DelegateSelector::DelegateSelector(QWidget *parent)
label->setObjectName(QStringLiteral("label"));
mainLayout->addWidget(label);
mDelegate = new KPIM::AddresseeLineEdit(this);
mDelegate = new PimCommon::AddresseeLineEdit(this);
mDelegate->setObjectName(QStringLiteral("delegate"));
mainLayout->addWidget(mDelegate);
connect(mDelegate, &KPIM::AddresseeLineEdit::textChanged, this, &DelegateSelector::slotTextChanged);
connect(mDelegate, &PimCommon::AddresseeLineEdit::textChanged, this, &DelegateSelector::slotTextChanged);
mRsvp = new QCheckBox(i18n("Keep me informed about status changes of this incidence."), this);
mRsvp->setObjectName(QStringLiteral("informcheckbox"));
......
......@@ -23,7 +23,7 @@
#include <QDialog>
class QPushButton;
namespace KPIM {
namespace PimCommon {
class AddresseeLineEdit;
}
......@@ -39,11 +39,11 @@ class DelegateSelector : public QDialog
public:
explicit DelegateSelector(QWidget *parent = nullptr);
QString delegate() const;
bool rsvp() const;
Q_REQUIRED_RESULT QString delegate() const;
Q_REQUIRED_RESULT bool rsvp() const;
private:
void slotTextChanged(const QString &text);
KPIM::AddresseeLineEdit *mDelegate = nullptr;
PimCommon::AddresseeLineEdit *mDelegate = nullptr;
QCheckBox *mRsvp = nullptr;
QPushButton *mOkButton = nullptr;
};
......
......@@ -8,7 +8,7 @@ ki18n_wrap_ui(attendeeselector_SRCS ../attendeeselector.ui)
add_executable(attendeeselector_gui ${attendeeselector_SRCS})
target_link_libraries(attendeeselector_gui
KF5::PimCommon KF5::Completion KF5::KIOWidgets KF5::LibkdepimAkonadi KF5::XmlGui KF5::I18n
KF5::PimCommon KF5::Completion KF5::KIOWidgets KF5::PimCommonAkonadi KF5::XmlGui KF5::I18n
)
......@@ -10,5 +10,5 @@ ecm_qt_declare_logging_category(messageviewer_bodypartformatter_text_vcard_PART_
add_library(messageviewer_bodypartformatter_text_vcard MODULE ${messageviewer_bodypartformatter_text_vcard_PART_SRCS})
target_link_libraries(messageviewer_bodypartformatter_text_vcard KF5::Contacts KF5::LibkdepimAkonadi KF5::MessageViewer KF5::IconThemes KF5::JobWidgets KF5::I18n)
target_link_libraries(messageviewer_bodypartformatter_text_vcard KF5::Contacts KF5::PimCommonAkonadi KF5::MessageViewer KF5::IconThemes KF5::JobWidgets KF5::I18n)
install(TARGETS messageviewer_bodypartformatter_text_vcard DESTINATION ${KDE_INSTALL_PLUGINDIR}/messageviewer/bodypartformatter)
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