Commit 5654034f authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new plugin api

parent 529478fe
Pipeline #188058 passed with stage
in 4 minutes and 24 seconds
......@@ -50,7 +50,7 @@ set(KLDAP_LIB_VERSION "5.20.40")
set(KMAILTRANSPORT_LIB_VERSION "5.20.40")
set(CALENDARUTILS_LIB_VERSION "5.20.40")
set(AKONADICALENDAR_LIB_VERSION "5.20.43")
set(KONTACTINTERFACE_LIB_VERSION "5.20.40")
set(KONTACTINTERFACE_LIB_VERSION "5.20.41")
set(KMIME_LIB_VERSION "5.20.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.20.40")
set(AKONADI_VERSION "5.20.41")
......@@ -135,8 +135,7 @@ configure_file(korganizer-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/korganizer
ecm_set_disabled_deprecation_versions(QT 5.15.2
KF 5.95.0
KCOREADDONS 5.88.0 #KPluginFactory::registerPlugin
KCOREADDONS 5.88.0 #KPluginFactory::registerPlugin (remove it when we depend against kf5.95)
)
option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)
......
......@@ -20,8 +20,8 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(JournalPlugin, "journalplugin.json")
JournalPlugin::JournalPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "journal")
JournalPlugin::JournalPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, "korganizer", "journal")
{
setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer"));
......
......@@ -20,7 +20,7 @@ class JournalPlugin : public KontactInterface::Plugin
{
Q_OBJECT
public:
JournalPlugin(KontactInterface::Core *core, const QVariantList &);
JournalPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~JournalPlugin() override;
Q_REQUIRED_RESULT bool isRunningStandalone() const override;
......
......@@ -36,8 +36,8 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(KOrganizerPlugin, "korganizerplugin.json")
KOrganizerPlugin::KOrganizerPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "calendar")
KOrganizerPlugin::KOrganizerPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, "korganizer", "calendar")
{
setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer"));
......
......@@ -22,7 +22,7 @@ class KOrganizerPlugin : public KontactInterface::Plugin
Q_OBJECT
public:
KOrganizerPlugin(KontactInterface::Core *core, const QVariantList &);
KOrganizerPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~KOrganizerPlugin() override;
Q_REQUIRED_RESULT bool isRunningStandalone() const override;
......
......@@ -32,8 +32,8 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(TodoPlugin, "todoplugin.json")
TodoPlugin::TodoPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, "korganizer", "todo")
TodoPlugin::TodoPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, "korganizer", "todo")
, mIface(nullptr)
{
setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer"));
......
......@@ -20,7 +20,7 @@ class TodoPlugin : public KontactInterface::Plugin
{
Q_OBJECT
public:
TodoPlugin(KontactInterface::Core *core, const QVariantList &);
TodoPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~TodoPlugin() override;
Q_REQUIRED_RESULT bool isRunningStandalone() const override;
......
......@@ -17,8 +17,8 @@
EXPORT_KONTACT_PLUGIN_WITH_JSON(SpecialdatesPlugin, "specialdatesplugin.json")
SpecialdatesPlugin::SpecialdatesPlugin(KontactInterface::Core *core, const QVariantList &)
: KontactInterface::Plugin(core, core, nullptr)
SpecialdatesPlugin::SpecialdatesPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &)
: KontactInterface::Plugin(core, core, data, nullptr)
{
setComponentName(QStringLiteral("korganizer"), i18n("KOrganizer"));
}
......
......@@ -16,7 +16,7 @@ class SpecialdatesPlugin : public KontactInterface::Plugin
{
Q_OBJECT
public:
SpecialdatesPlugin(KontactInterface::Core *core, const QVariantList &);
SpecialdatesPlugin(KontactInterface::Core *core, const KPluginMetaData &data, const QVariantList &);
~SpecialdatesPlugin() override;
int weight() const override
......
Supports Markdown
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