summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <[email protected]>2018-02-08 07:56:03 +0100
committerLaurent Montel <[email protected]>2018-02-08 07:56:03 +0100
commitcd4e3272913f58a8b25aa21c9fa5ae54168b5034 (patch)
tree75f59f7a90d774d0ca363faf64604354d5224278
parent9551c4166fbc814012fc45b3cade777c76fca3a8 (diff)
Fix simplified macro which will add to 5.44. Allow to fix factory name in some plugin
-rw-r--r--CMakeLists.txt2
-rw-r--r--akonadi-import-wizard/evolutionv1/evolutionv1importdata.cpp4
-rw-r--r--akonadi-import-wizard/evolutionv2/evolutionv2importdata.cpp5
-rw-r--r--akonadi-import-wizard/geary/gearyimportdata.cpp5
-rw-r--r--akonadi-import-wizard/nylas-mail/nylasmaildata.cpp5
-rw-r--r--akonadi-import-wizard/opera/operaimportdata.cpp5
-rw-r--r--kaddressbook/contacteditor/addresslocationeditorplugin.cpp5
-rw-r--r--kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp5
-rw-r--r--kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp5
-rw-r--r--kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp5
-rw-r--r--kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp5
-rw-r--r--kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp5
-rw-r--r--kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp4
-rw-r--r--kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp4
-rw-r--r--kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendmail/sendmailplugin.cpp5
-rw-r--r--kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp5
-rw-r--r--kcoreaddons_kdepim_compat.h31
-rw-r--r--kmail/editorinitplugins/externalcomposer/externalcomposerplugineditor.cpp5
-rw-r--r--kmail/editorplugins/autocorrection/autocorrectionplugineditor.cpp5
-rw-r--r--kmail/editorplugins/changecase/changecaseplugineditor.cpp5
-rw-r--r--kmail/editorplugins/insertemail/insertemailplugineditor.cpp5
-rw-r--r--kmail/editorplugins/insertshorturl/insertshorturlplugineditor.cpp5
-rw-r--r--kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineplugin.cpp5
-rw-r--r--kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineplugin.cpp5
-rw-r--r--kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineplugin.cpp5
-rw-r--r--kmail/editorplugins/insertspecialcharacter/insertspecialcharacterplugineditor.cpp5
-rw-r--r--kmail/editorplugins/inserttemplatecommand/inserttemplatecommandplugineditor.cpp5
-rw-r--r--kmail/editorplugins/nonbreakingspace/nonbreakingspaceplugineditor.cpp5
-rw-r--r--kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp5
-rw-r--r--kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp6
-rw-r--r--kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp5
-rw-r--r--kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp5
-rw-r--r--kmail/plugins/antispamplugin/antispamplugin.cpp5
-rw-r--r--kmail/plugins/antivirusplugin/antivirusplugin.cpp5
-rw-r--r--kmail/plugins/expertplugin/expertplugin.cpp5
-rw-r--r--kmail/plugins/logactivitiesplugin/logactivitiesplugin.cpp5
-rw-r--r--kmailtransport/sendmail/sendmailtransportplugin.cpp5
-rw-r--r--plugins/customtoolsplugins/translatorplugin/translatorplugin.cpp6
-rw-r--r--plugins/messageviewerheaderplugins/allheaderstyleplugin/allheaderstyleplugin.cpp5
-rw-r--r--plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerheaderplugins/longheaderstyleplugin/longheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerheaderplugins/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp4
-rw-r--r--plugins/messageviewerplugins/common/expandurlplugin/viewerpluginexpandurl.cpp5
-rw-r--r--plugins/messageviewerplugins/common/translatorplugin/viewerplugintranslator.cpp5
-rw-r--r--plugins/messageviewerplugins/createeventplugin/viewerplugincreateevent.cpp5
-rw-r--r--plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenote.cpp5
-rw-r--r--plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodo.cpp5
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp5
-rw-r--r--plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp7
-rw-r--r--plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp5
-rw-r--r--plugins/webengineurlinterceptor/donottrack/donottrackpluginurlinterceptor.cpp5
-rw-r--r--sieveeditor/imapfoldercompletion/selectimapwidget.cpp5
-rw-r--r--sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp5
57 files changed, 145 insertions, 158 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1d72bb..af21000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,8 @@ set_package_properties("Poppler" PROPERTIES TYPE OPTIONAL PURPOSE "Support for P
if(KDEPIMADDONS_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
add_subdirectory(plugins)
add_subdirectory(korganizer)
diff --git a/akonadi-import-wizard/evolutionv1/evolutionv1importdata.cpp b/akonadi-import-wizard/evolutionv1/evolutionv1importdata.cpp
index 7979fca..7eab18e 100644
--- a/akonadi-import-wizard/evolutionv1/evolutionv1importdata.cpp
+++ b/akonadi-import-wizard/evolutionv1/evolutionv1importdata.cpp
@@ -20,14 +20,14 @@
#include "evolutionv1importdata.h"
#include "mailimporter/filterevolution.h"
#include "mailimporter/filterinfo.h"
+#include "kcoreaddons_kdepim_compat.h"
#include <KLocalizedString>
#include <kpluginfactory.h>
#include <QDir>
-K_PLUGIN_FACTORY_WITH_JSON(Evolutionv1ImporterFactory, "evolutionv1importer.json", registerPlugin<Evolutionv1ImportData>();
- )
+K_PLUGIN_CLASS_WITH_JSON(Evolutionv1ImportData, "evolutionv1importer.json")
Evolutionv1ImportData::Evolutionv1ImportData(QObject *parent, const QList<QVariant> &)
: LibImportWizard::AbstractImporter(parent)
diff --git a/akonadi-import-wizard/evolutionv2/evolutionv2importdata.cpp b/akonadi-import-wizard/evolutionv2/evolutionv2importdata.cpp
index dc5091c..0c20094 100644
--- a/akonadi-import-wizard/evolutionv2/evolutionv2importdata.cpp
+++ b/akonadi-import-wizard/evolutionv2/evolutionv2importdata.cpp
@@ -20,14 +20,13 @@
#include "evolutionv2importdata.h"
#include "mailimporter/filterevolution_v2.h"
#include "mailimporter/filterinfo.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include <KLocalizedString>
#include <kpluginfactory.h>
#include <QDir>
-K_PLUGIN_FACTORY_WITH_JSON(Evolutionv2ImporterFactory, "evolutionv2importer.json", registerPlugin<Evolutionv2ImportData>();
- )
+K_PLUGIN_CLASS_WITH_JSON(Evolutionv2ImportData, "evolutionv2importer.json")
Evolutionv2ImportData::Evolutionv2ImportData(QObject *parent, const QList<QVariant> &)
: LibImportWizard::AbstractImporter(parent)
diff --git a/akonadi-import-wizard/geary/gearyimportdata.cpp b/akonadi-import-wizard/geary/gearyimportdata.cpp
index 5caa450..38828e2 100644
--- a/akonadi-import-wizard/geary/gearyimportdata.cpp
+++ b/akonadi-import-wizard/geary/gearyimportdata.cpp
@@ -22,13 +22,12 @@
#include "gearyaddressbook.h"
#include "mailimporter/filterinfo.h"
#include "mailimporter/othermailerutil.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include "gearyplugin_debug.h"
#include <kpluginfactory.h>
#include <QDir>
-K_PLUGIN_FACTORY_WITH_JSON(GearyImporterFactory, "gearyimporter.json", registerPlugin<GearyImportData>();
- )
+K_PLUGIN_CLASS_WITH_JSON(GearyImportData, "gearyimporter.json")
GearyImportData::GearyImportData(QObject *parent, const QList<QVariant> &)
: LibImportWizard::AbstractImporter(parent)
diff --git a/akonadi-import-wizard/nylas-mail/nylasmaildata.cpp b/akonadi-import-wizard/nylas-mail/nylasmaildata.cpp
index 8cac8ed..521a0b2 100644
--- a/akonadi-import-wizard/nylas-mail/nylasmaildata.cpp
+++ b/akonadi-import-wizard/nylas-mail/nylasmaildata.cpp
@@ -21,13 +21,12 @@
#include "nylasmailsettings.h"
#include "mailimporter/filterinfo.h"
#include "mailimporter/othermailerutil.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include "nylasmailplugin_debug.h"
#include <kpluginfactory.h>
#include <QDir>
-K_PLUGIN_FACTORY_WITH_JSON(NylasMailImporterFactory, "nylasmailimporter.json", registerPlugin<NylasMailImportData>();
- )
+K_PLUGIN_CLASS_WITH_JSON(NylasMailImportData, "nylasmailimporter.json")
NylasMailImportData::NylasMailImportData(QObject *parent, const QList<QVariant> &)
: LibImportWizard::AbstractImporter(parent)
diff --git a/akonadi-import-wizard/opera/operaimportdata.cpp b/akonadi-import-wizard/opera/operaimportdata.cpp
index fafeef8..eb3bc3a 100644
--- a/akonadi-import-wizard/opera/operaimportdata.cpp
+++ b/akonadi-import-wizard/opera/operaimportdata.cpp
@@ -22,13 +22,12 @@
#include "operasettings.h"
#include "mailimporter/filteropera.h"
#include "mailimporter/filterinfo.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include <KLocalizedString>
#include <kpluginfactory.h>
#include <QDir>
-K_PLUGIN_FACTORY_WITH_JSON(OperaImporterFactory, "operaimporter.json", registerPlugin<OperaImportData>();
- )
+K_PLUGIN_CLASS_WITH_JSON(OperaImportData, "operaimporter.json")
OperaImportData::OperaImportData(QObject *parent, const QList<QVariant> &)
: LibImportWizard::AbstractImporter(parent)
diff --git a/kaddressbook/contacteditor/addresslocationeditorplugin.cpp b/kaddressbook/contacteditor/addresslocationeditorplugin.cpp
index d5db9f4..a22850a 100644
--- a/kaddressbook/contacteditor/addresslocationeditorplugin.cpp
+++ b/kaddressbook/contacteditor/addresslocationeditorplugin.cpp
@@ -19,12 +19,13 @@
#include "addresslocationeditorplugin.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
#include "addresseditor/addresseslocationwidget.h"
#include <QHBoxLayout>
-K_PLUGIN_FACTORY_WITH_JSON(AddressLocationEditorFactory, "addresslocationeditorplugin.json", registerPlugin<AddressLocationEditor>();
- )
+K_PLUGIN_CLASS_WITH_JSON(AddressLocationEditor, "addresslocationeditorplugin.json")
+
AddressLocationEditor::AddressLocationEditor(QWidget *parent, const QList<QVariant> &)
: ContactEditor::AbstractAddressLocationWidget(parent)
diff --git a/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp b/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
index 74e82df..bd0edc9 100644
--- a/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/csv/csvimportexportplugin.cpp
@@ -20,9 +20,8 @@
#include "csvimportexportplugin.h"
#include "csvimportexportplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(CSVImportExportPluginFactory, "kaddressbook_importexportcsvplugin.json", registerPlugin<CSVImportExportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(CSVImportExportPlugin, "kaddressbook_importexportcsvplugin.json")
CSVImportExportPlugin::CSVImportExportPlugin(QObject *parent, const QList<QVariant> &)
: KAddressBookImportExport::KAddressBookImportExportPlugin(parent)
diff --git a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
index a2c7702..376e56f 100644
--- a/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/gmx/gmximportexportplugin.cpp
@@ -20,9 +20,8 @@
#include "gmximportexportplugin.h"
#include "gmximportexportplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(GMXImportExportPluginFactory, "kaddressbook_importexportgmxplugin.json", registerPlugin<GMXImportExportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(GMXImportExportPlugin, "kaddressbook_importexportgmxplugin.json")
GMXImportExportPlugin::GMXImportExportPlugin(QObject *parent, const QList<QVariant> &)
: KAddressBookImportExport::KAddressBookImportExportPlugin(parent)
diff --git a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
index 09efe5a..509f6c8 100644
--- a/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/ldap/ldapimportexportplugin.cpp
@@ -20,9 +20,8 @@
#include "ldapimportexportplugin.h"
#include "ldapimportexportplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(LDapImportExportPluginFactory, "kaddressbook_importexportldapplugin.json", registerPlugin<LDapImportExportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(LDapImportExportPlugin, "kaddressbook_importexportldapplugin.json")
LDapImportExportPlugin::LDapImportExportPlugin(QObject *parent, const QList<QVariant> &)
: KAddressBookImportExport::KAddressBookImportExportPlugin(parent)
diff --git a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
index 716d56e..fbadb99 100644
--- a/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/ldif/ldifimportexportplugin.cpp
@@ -20,9 +20,8 @@
#include "ldifimportexportplugin.h"
#include "ldifimportexportplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(LDifImportExportPluginFactory, "kaddressbook_importexportldifplugin.json", registerPlugin<LDifImportExportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(LDifImportExportPlugin, "kaddressbook_importexportldifplugin.json")
LDifImportExportPlugin::LDifImportExportPlugin(QObject *parent, const QList<QVariant> &)
: KAddressBookImportExport::KAddressBookImportExportPlugin(parent)
diff --git a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
index 18ce19f..56e3e4c 100644
--- a/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
+++ b/kaddressbook/importexportplugins/vcards/vcardimportexportplugin.cpp
@@ -20,9 +20,8 @@
#include "vcardimportexportplugin.h"
#include "vcardimportexportplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(VCardImportExportPluginFactory, "kaddressbook_importexportvcardplugin.json", registerPlugin<VCardImportExportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(VCardImportExportPlugin, "kaddressbook_importexportvcardplugin.json")
VCardImportExportPlugin::VCardImportExportPlugin(QObject *parent, const QList<QVariant> &)
: KAddressBookImportExport::KAddressBookImportExportPlugin(parent)
{
diff --git a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
index e582933..697c6f2 100644
--- a/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
+++ b/kaddressbook/plugins/checkgravatar/checkgravatarplugin.cpp
@@ -20,8 +20,8 @@
#include "checkgravatarplugin.h"
#include "checkgravatarplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(CheckGravatarPluginFactory, "kaddressbook_checkgravatarplugin.json", registerPlugin<CheckGravatarPlugin>();
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(CheckGravatarPlugin, "kaddressbook_checkgravatarplugin.json"
)
CheckGravatarPlugin::CheckGravatarPlugin(QObject *parent, const QList<QVariant> &)
diff --git a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
index e9ce2df..9f6c4eb 100644
--- a/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
+++ b/kaddressbook/plugins/mergecontacts/mergecontactsplugin.cpp
@@ -20,8 +20,8 @@
#include "mergecontactsplugin.h"
#include "mergecontactsplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(MergeContactsPluginFactory, "kaddressbook_mergecontactsplugin.json", registerPlugin<MergeContactsPlugin>();
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(MergeContactsPlugin, "kaddressbook_mergecontactsplugin.json"
)
MergeContactsPlugin::MergeContactsPlugin(QObject *parent, const QList<QVariant> &)
diff --git a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
index e0f1d94..cccec31 100644
--- a/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
+++ b/kaddressbook/plugins/searchduplicates/searchduplicatesplugin.cpp
@@ -20,9 +20,8 @@
#include "searchduplicatesplugin.h"
#include "searchduplicatesplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(MergeContactsPluginFactory, "kaddressbook_searchduplicatesplugin.json", registerPlugin<SearchDuplicatesPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(SearchDuplicatesPlugin, "kaddressbook_searchduplicatesplugin.json")
SearchDuplicatesPlugin::SearchDuplicatesPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kaddressbook/plugins/sendmail/sendmailplugin.cpp b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
index b3de76d..8d30f11 100644
--- a/kaddressbook/plugins/sendmail/sendmailplugin.cpp
+++ b/kaddressbook/plugins/sendmail/sendmailplugin.cpp
@@ -20,9 +20,8 @@
#include "sendmailplugin.h"
#include "sendmailplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(SendMailPluginFactory, "kaddressbook_sendmailplugin.json", registerPlugin<SendMailPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(SendMailPlugin, "kaddressbook_sendmailplugin.json")
SendMailPlugin::SendMailPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
index 830ac4f..6081193 100644
--- a/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
+++ b/kaddressbook/plugins/sendvcards/sendvcardsplugin.cpp
@@ -20,9 +20,8 @@
#include "sendvcardsplugin.h"
#include "sendvcardsplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(SendVcardsPluginFactory, "kaddressbook_sendvcardsplugin.json", registerPlugin<SendVcardsPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(SendVcardsPlugin, "kaddressbook_sendvcardsplugin.json")
SendVcardsPlugin::SendVcardsPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kcoreaddons_kdepim_compat.h b/kcoreaddons_kdepim_compat.h
new file mode 100644
index 0000000..1519084
--- /dev/null
+++ b/kcoreaddons_kdepim_compat.h
@@ -0,0 +1,31 @@
+/*
+ Copyright (c) 2018 Montel Laurent <[email protected]>
+
+ This library is free software; you can redistribute it and/or modify
+ it under the terms of the GNU Library General Public License as published
+ by the Free Software Foundation; either version 2 of the License or
+ ( at your option ) version 3 or, at the discretion of KDE e.V.
+ ( which shall act as a proxy as in section 14 of the GPLv3 ), any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef KCOREADDONS_KDEPIM_COMPAT_H
+#define KCOREADDONS_KDEPIM_COMPAT_H
+
+#include <kcoreaddons_version.h>
+
+#include <kpluginfactory.h>
+#if KCOREADDONS_VERSION < QT_VERSION_CHECK(5, 44, 0)
+#define K_PLUGIN_CLASS_WITH_JSON(classname, json) K_PLUGIN_FACTORY_WITH_JSON(classname ## Factory, json, registerPlugin<classname >();)
+#endif
+
+#endif
diff --git a/kmail/editorinitplugins/externalcomposer/externalcomposerplugineditor.cpp b/kmail/editorinitplugins/externalcomposer/externalcomposerplugineditor.cpp
index 3d6f922..97a886c 100644
--- a/kmail/editorinitplugins/externalcomposer/externalcomposerplugineditor.cpp
+++ b/kmail/editorinitplugins/externalcomposer/externalcomposerplugineditor.cpp
@@ -21,9 +21,8 @@
#include "externalcomposerplugineditorinterface.h"
#include "externalcomposerconfiguredialog.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(ExternalComposerPluginEditorFactory, "kmail_externalcomposereditorplugin.json", registerPlugin<ExternalComposerPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(ExternalComposerPluginEditor, "kmail_externalcomposereditorplugin.json")
ExternalComposerPluginEditor::ExternalComposerPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditorInit(parent)
diff --git a/kmail/editorplugins/autocorrection/autocorrectionplugineditor.cpp b/kmail/editorplugins/autocorrection/autocorrectionplugineditor.cpp
index 8afd271..e011662 100644
--- a/kmail/editorplugins/autocorrection/autocorrectionplugineditor.cpp
+++ b/kmail/editorplugins/autocorrection/autocorrectionplugineditor.cpp
@@ -20,9 +20,8 @@
#include "autocorrectionplugineditor.h"
#include "autocorrectionplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(AutoCorrectionPluginEditorFactory, "kmail_autocorrectioneditorplugin.json", registerPlugin<AutoCorrectionPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(AutoCorrectionPluginEditor, "kmail_autocorrectioneditorplugin.json")
AutoCorrectionPluginEditor::AutoCorrectionPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/changecase/changecaseplugineditor.cpp b/kmail/editorplugins/changecase/changecaseplugineditor.cpp
index 148d323..f4acb44 100644
--- a/kmail/editorplugins/changecase/changecaseplugineditor.cpp
+++ b/kmail/editorplugins/changecase/changecaseplugineditor.cpp
@@ -20,9 +20,8 @@
#include "changecaseplugineditor.h"
#include "changecaseplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(ChangeCasePluginEditorFactory, "kmail_changecaseeditorplugin.json", registerPlugin<ChangeCasePluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(ChangeCasePluginEditor, "kmail_changecaseeditorplugin.json")
ChangeCasePluginEditor::ChangeCasePluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/insertemail/insertemailplugineditor.cpp b/kmail/editorplugins/insertemail/insertemailplugineditor.cpp
index 82cc39a..89f0d0e 100644
--- a/kmail/editorplugins/insertemail/insertemailplugineditor.cpp
+++ b/kmail/editorplugins/insertemail/insertemailplugineditor.cpp
@@ -20,9 +20,8 @@
#include "insertemailplugineditor.h"
#include "insertemailplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(InsertEmailPluginEditorFactory, "kmail_insertemaileditorplugin.json", registerPlugin<InsertEmailPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(InsertEmailPluginEditor, "kmail_insertemaileditorplugin.json")
InsertEmailPluginEditor::InsertEmailPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/insertshorturl/insertshorturlplugineditor.cpp b/kmail/editorplugins/insertshorturl/insertshorturlplugineditor.cpp
index 36d1475..7275d30 100644
--- a/kmail/editorplugins/insertshorturl/insertshorturlplugineditor.cpp
+++ b/kmail/editorplugins/insertshorturl/insertshorturlplugineditor.cpp
@@ -22,9 +22,8 @@
#include "insertshorturlconfiguredialog.h"
#include <kpluginfactory.h>
#include <QPointer>
-
-K_PLUGIN_FACTORY_WITH_JSON(InsertShorturlPluginEditorFactory, "kmail_insertshorturleditorplugin.json", registerPlugin<InsertShorturlPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(InsertShorturlPluginEditor, "kmail_insertshorturleditorplugin.json")
InsertShorturlPluginEditor::InsertShorturlPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineplugin.cpp b/kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineplugin.cpp
index 8091d04..69ac0c9 100644
--- a/kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineplugin.cpp
+++ b/kmail/editorplugins/insertshorturl/shorturlengineplugin/isgdshorturlengineplugin/isgdshorturlengineplugin.cpp
@@ -20,9 +20,8 @@
#include "isgdshorturlengineplugin.h"
#include "isgdshorturlengineinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(IsgdShortUrlEnginePluginFactory, "pimcommon_isgdshorturlengineplugin.json", registerPlugin<IsgdShortUrlEnginePlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(IsgdShortUrlEnginePlugin, "pimcommon_isgdshorturlengineplugin.json")
IsgdShortUrlEnginePlugin::IsgdShortUrlEnginePlugin(QObject *parent, const QList<QVariant> &)
: ShortUrlEnginePlugin(parent)
diff --git a/kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineplugin.cpp b/kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineplugin.cpp
index 32acc07..b97d0c7 100644
--- a/kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineplugin.cpp
+++ b/kmail/editorplugins/insertshorturl/shorturlengineplugin/tinyurlengineplugin/tinyurlengineplugin.cpp
@@ -20,9 +20,8 @@
#include "tinyurlengineplugin.h"
#include "tinyurlengineinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(TinyUrlEnginePluginFactory, "pimcommon_tinyurlengineplugin.json", registerPlugin<TinyUrlEnginePlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(TinyUrlEnginePlugin, "pimcommon_tinyurlengineplugin.json")
TinyUrlEnginePlugin::TinyUrlEnginePlugin(QObject *parent, const QList<QVariant> &)
: ShortUrlEnginePlugin(parent)
diff --git a/kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineplugin.cpp b/kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineplugin.cpp
index e913fdd..4f94347 100644
--- a/kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineplugin.cpp
+++ b/kmail/editorplugins/insertshorturl/shorturlengineplugin/triopabshorturlengineplugin/triopabshorturlengineplugin.cpp
@@ -20,9 +20,8 @@
#include "triopabshorturlengineplugin.h"
#include "triopabshorturlengineinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(TriopAbShortUrlEnginePluginFactory, "pimcommon_triopabshorturlengineplugin.json", registerPlugin<TriopAbShortUrlEnginePlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(TriopAbShortUrlEnginePlugin, "pimcommon_triopabshorturlengineplugin.json")
TriopAbShortUrlEnginePlugin::TriopAbShortUrlEnginePlugin(QObject *parent, const QList<QVariant> &)
: ShortUrlEnginePlugin(parent)
diff --git a/kmail/editorplugins/insertspecialcharacter/insertspecialcharacterplugineditor.cpp b/kmail/editorplugins/insertspecialcharacter/insertspecialcharacterplugineditor.cpp
index 0f5549b..4292235 100644
--- a/kmail/editorplugins/insertspecialcharacter/insertspecialcharacterplugineditor.cpp
+++ b/kmail/editorplugins/insertspecialcharacter/insertspecialcharacterplugineditor.cpp
@@ -20,9 +20,8 @@
#include "insertspecialcharacterplugineditor.h"
#include "insertspecialcharacterplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(InsertSpecialCharacterPluginEditorFactory, "kmail_insertspecialcharactereditorplugin.json", registerPlugin<InsertSpecialCharacterPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(InsertSpecialCharacterPluginEditor, "kmail_insertspecialcharactereditorplugin.json")
InsertSpecialCharacterPluginEditor::InsertSpecialCharacterPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/inserttemplatecommand/inserttemplatecommandplugineditor.cpp b/kmail/editorplugins/inserttemplatecommand/inserttemplatecommandplugineditor.cpp
index e3d476c..ec8ded6 100644
--- a/kmail/editorplugins/inserttemplatecommand/inserttemplatecommandplugineditor.cpp
+++ b/kmail/editorplugins/inserttemplatecommand/inserttemplatecommandplugineditor.cpp
@@ -20,9 +20,8 @@
#include "inserttemplatecommandplugineditor.h"
#include "inserttemplatecommandplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(InsertTemplateCommandPluginEditorFactory, "kmail_inserttemplatecommandeditorplugin.json", registerPlugin<InsertTemplateCommandPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(InsertTemplateCommandPluginEditor, "kmail_inserttemplatecommandeditorplugin.json")
InsertTemplateCommandPluginEditor::InsertTemplateCommandPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/nonbreakingspace/nonbreakingspaceplugineditor.cpp b/kmail/editorplugins/nonbreakingspace/nonbreakingspaceplugineditor.cpp
index 638729b..a3d83ff 100644
--- a/kmail/editorplugins/nonbreakingspace/nonbreakingspaceplugineditor.cpp
+++ b/kmail/editorplugins/nonbreakingspace/nonbreakingspaceplugineditor.cpp
@@ -20,9 +20,8 @@
#include "nonbreakingspaceplugineditor.h"
#include "nonbreakingspaceplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(NonBreakingSpacePluginEditorFactory, "kmail_nonbreakingspaceeditorplugin.json", registerPlugin<NonBreakingSpacePluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(NonBreakingSpacePluginEditor, "kmail_nonbreakingspaceeditorplugin.json")
NonBreakingSpacePluginEditor::NonBreakingSpacePluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp b/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
index 44cb61e..74b7b7e 100644
--- a/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
+++ b/kmail/editorplugins/zoomtext/zoomtextplugineditor.cpp
@@ -20,9 +20,8 @@
#include "zoomtextplugineditor.h"
#include "zoomtextplugineditorinterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(ZoomTextPluginEditorFactory, "kmail_zoomtexteditorplugin.json", registerPlugin<ZoomTextPluginEditor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(ZoomTextPluginEditor, "kmail_zoomtexteditorplugin.json")
ZoomTextPluginEditor::ZoomTextPluginEditor(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditor(parent)
diff --git a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
index 41870f7..d8c24a0 100644
--- a/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
+++ b/kmail/editorsendcheckplugins/automaticaddcontacts/automaticaddcontactsplugin.cpp
@@ -21,13 +21,11 @@
#include "automaticaddcontactsinterface.h"
#include "automaticaddcontactsconfigurewidget.h"
#include "automaticaddcontactsconfiguredialog.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include <QPointer>
#include <kpluginfactory.h>
-K_PLUGIN_FACTORY_WITH_JSON(ChangeCasePluginEditorFactory, "kmail_automaticaddcontactsplugin.json", registerPlugin<AutomaticAddContactsPlugin>();
- )
-
+K_PLUGIN_CLASS_WITH_JSON(AutomaticAddContactsPlugin, "kmail_automaticaddcontactsplugin.json")
AutomaticAddContactsPlugin::AutomaticAddContactsPlugin(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditorCheckBeforeSend(parent)
{
diff --git a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
index d990e2b..4140000 100644
--- a/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
+++ b/kmail/editorsendcheckplugins/checkbeforesend/checkbeforesendplugin.cpp
@@ -21,12 +21,11 @@
#include "checkbeforesendinterface.h"
#include "configurewidget/checkbeforesendconfigurewidget.h"
#include "configurewidget/checkbeforesendconfiguredialog.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include <QPointer>
#include <kpluginfactory.h>
-K_PLUGIN_FACTORY_WITH_JSON(ChangeCasePluginEditorFactory, "kmail_checkbeforesendplugin.json", registerPlugin<CheckBeforeSendPlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(CheckBeforeSendPlugin, "kmail_checkbeforesendplugin.json")
CheckBeforeSendPlugin::CheckBeforeSendPlugin(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditorCheckBeforeSend(parent)
diff --git a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
index 01d6189..74e01ad 100644
--- a/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
+++ b/kmail/editorsendcheckplugins/confirm-address/confirmaddressplugin.cpp
@@ -21,12 +21,11 @@
#include "confirmaddressinterface.h"
#include "confirmaddressconfigurewidget.h"
#include "confirmaddressconfiguredialog.h"
-
+#include "kcoreaddons_kdepim_compat.h"
#include <QPointer>
#include <kpluginfactory.h>
-K_PLUGIN_FACTORY_WITH_JSON(ChangeCasePluginEditorFactory, "kmail_confirmaddressplugin.json", registerPlugin<ConfirmAddressPlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ConfirmAddressPlugin, "kmail_confirmaddressplugin.json")
ConfirmAddressPlugin::ConfirmAddressPlugin(QObject *parent, const QList<QVariant> &)
: MessageComposer::PluginEditorCheckBeforeSend(parent)
diff --git a/kmail/plugins/antispamplugin/antispamplugin.cpp b/kmail/plugins/antispamplugin/antispamplugin.cpp
index c36b93b..eba77b1 100644
--- a/kmail/plugins/antispamplugin/antispamplugin.cpp
+++ b/kmail/plugins/antispamplugin/antispamplugin.cpp
@@ -19,9 +19,8 @@
#include "antispamplugin.h"
#include "antispamplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(KMailAntiSpamPluginFactory, "kmail_antispamplugin.json", registerPlugin<AntiSpamPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(AntiSpamPlugin, "kmail_antispamplugin.json")
AntiSpamPlugin::AntiSpamPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kmail/plugins/antivirusplugin/antivirusplugin.cpp b/kmail/plugins/antivirusplugin/antivirusplugin.cpp
index 8ff8d73..7e2ae52 100644
--- a/kmail/plugins/antivirusplugin/antivirusplugin.cpp
+++ b/kmail/plugins/antivirusplugin/antivirusplugin.cpp
@@ -20,9 +20,8 @@
#include "antivirusplugin.h"
#include "antivirusplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(KMailAntiSpamPluginFactory, "kmail_antivirusplugin.json", registerPlugin<AntiVirusPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(AntiVirusPlugin, "kmail_antivirusplugin.json")
AntiVirusPlugin::AntiVirusPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kmail/plugins/expertplugin/expertplugin.cpp b/kmail/plugins/expertplugin/expertplugin.cpp
index cd2545e..c976f8a 100644
--- a/kmail/plugins/expertplugin/expertplugin.cpp
+++ b/kmail/plugins/expertplugin/expertplugin.cpp
@@ -20,9 +20,8 @@
#include "expertplugin.h"
#include "expertplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(KMailExpertPluginFactory, "kmail_expertplugin.json", registerPlugin<ExpertPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(ExpertPlugin, "kmail_expertplugin.json")
ExpertPlugin::ExpertPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kmail/plugins/logactivitiesplugin/logactivitiesplugin.cpp b/kmail/plugins/logactivitiesplugin/logactivitiesplugin.cpp
index 7c94daa..0795d5b 100644
--- a/kmail/plugins/logactivitiesplugin/logactivitiesplugin.cpp
+++ b/kmail/plugins/logactivitiesplugin/logactivitiesplugin.cpp
@@ -20,9 +20,8 @@
#include "logactivitiesplugin.h"
#include "logactivitiesplugininterface.h"
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(KMailAntiSpamPluginFactory, "kmail_logactivitiesplugin.json", registerPlugin<LogActivitiesPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(LogActivitiesPlugin, "kmail_logactivitiesplugin.json")
LogActivitiesPlugin::LogActivitiesPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::GenericPlugin(parent)
diff --git a/kmailtransport/sendmail/sendmailtransportplugin.cpp b/kmailtransport/sendmail/sendmailtransportplugin.cpp
index d90a3cc..5b28f86 100644
--- a/kmailtransport/sendmail/sendmailtransportplugin.cpp
+++ b/kmailtransport/sendmail/sendmailtransportplugin.cpp
@@ -23,9 +23,8 @@
#include <kpluginfactory.h>
#include <KLocalizedString>
#include <QPointer>
-
-K_PLUGIN_FACTORY_WITH_JSON(SendMailTransportPluginFactory, "sendmailtransport.json", registerPlugin<SendMailTransportPlugin>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(SendMailTransportPlugin, "sendmailtransport.json")
SendMailTransportPlugin::SendMailTransportPlugin(QObject *parent, const QList<QVariant> &)
: MailTransport::TransportAbstractPlugin(parent)
diff --git a/plugins/customtoolsplugins/translatorplugin/translatorplugin.cpp b/plugins/customtoolsplugins/translatorplugin/translatorplugin.cpp
index 896eed5..0ac6a0a 100644
--- a/plugins/customtoolsplugins/translatorplugin/translatorplugin.cpp
+++ b/plugins/customtoolsplugins/translatorplugin/translatorplugin.cpp
@@ -22,10 +22,8 @@
#include <KLocalizedString>
#include <kpluginfactory.h>
#include <pimcommon/customtoolswidgetng.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(PimCommonTranslatorPluginFactory, "pimcommon_translatorplugin.json", registerPlugin<TranslatorPlugin>();
- )
-
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(TranslatorPlugin, "pimcommon_translatorplugin.json")
TranslatorPlugin::TranslatorPlugin(QObject *parent, const QList<QVariant> &)
: PimCommon::CustomToolsPlugin(parent)
{
diff --git a/plugins/messageviewerheaderplugins/allheaderstyleplugin/allheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/allheaderstyleplugin/allheaderstyleplugin.cpp
index 9d4c2b2..9ee1310 100644
--- a/plugins/messageviewerheaderplugins/allheaderstyleplugin/allheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/allheaderstyleplugin/allheaderstyleplugin.cpp
@@ -22,11 +22,10 @@
#include "allheaderstyleinterface.h"
#include "allheaderstrategy.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerAllHeaderStylePluginFactory, "messageviewer_allheaderstyleplugin.json", registerPlugin<AllHeaderStylePlugin>();
- )
-
+K_PLUGIN_CLASS_WITH_JSON(AllHeaderStylePlugin, "messageviewer_allheaderstyleplugin.json")
AllHeaderStylePlugin::AllHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
, mHeaderStyle(new PlainHeaderStyle)
diff --git a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyleplugin.cpp
index 3c7667b..eb38392 100644
--- a/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyleplugin.cpp
@@ -22,10 +22,10 @@
#include "briefheaderstyle.h"
#include "briefheaderstrategy.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerBriefHeaderStylePluginFactory, "messageviewer_briefheaderstyleplugin.json", registerPlugin<BriefHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(BriefHeaderStylePlugin, "messageviewer_briefheaderstyleplugin.json")
BriefHeaderStylePlugin::BriefHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
index 80aafae..0c0a0d3 100644
--- a/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyleplugin.cpp
@@ -23,10 +23,10 @@
#include "messageviewer/richheaderstrategy.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerEnterpriseHeaderStylePluginFactory, "messageviewer_enterpriseheaderstyleplugin.json", registerPlugin<EnterpriseHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(EnterpriseHeaderStylePlugin, "messageviewer_enterpriseheaderstyleplugin.json")
EnterpriseHeaderStylePlugin::EnterpriseHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
index 07e18ef..c448794 100644
--- a/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyleplugin.cpp
@@ -22,10 +22,10 @@
#include "fancyheaderstyle.h"
#include "messageviewer/richheaderstrategy.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerFancyHeaderStylePluginFactory, "messageviewer_fancyheaderstyleplugin.json", registerPlugin<FancyHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(FancyHeaderStylePlugin, "messageviewer_fancyheaderstyleplugin.json")
FancyHeaderStylePlugin::FancyHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
index a32d950..b25377f 100644
--- a/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/grantleeheaderstyleplugin/grantleeheaderstyleplugin.cpp
@@ -21,11 +21,11 @@
#include "grantleeheaderstyleplugin.h"
#include <messageviewer/grantleeheaderstyle.h>
#include "grantleeheaderstrategy.h"
+#include "kcoreaddons_kdepim_compat.h"
#include <kpluginfactory.h>
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerGrantleeHeaderStylePluginFactory, "messageviewer_grantleeheaderstyleplugin.json", registerPlugin<GrantleeHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(GrantleeHeaderStylePlugin, "messageviewer_grantleeheaderstyleplugin.json")
GrantleeHeaderStylePlugin::GrantleeHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerheaderplugins/longheaderstyleplugin/longheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/longheaderstyleplugin/longheaderstyleplugin.cpp
index 727e1f3..187ff4b 100644
--- a/plugins/messageviewerheaderplugins/longheaderstyleplugin/longheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/longheaderstyleplugin/longheaderstyleplugin.cpp
@@ -23,10 +23,10 @@
#include "messageviewer/richheaderstrategy.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerLongHeaderStylePluginFactory, "messageviewer_longheaderstyleplugin.json", registerPlugin<LongHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(LongHeaderStylePlugin, "messageviewer_longheaderstyleplugin.json")
LongHeaderStylePlugin::LongHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerheaderplugins/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp b/plugins/messageviewerheaderplugins/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
index 0933034..60415ce 100644
--- a/plugins/messageviewerheaderplugins/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
+++ b/plugins/messageviewerheaderplugins/standardsheaderstyleplugin/standardsheaderstyleplugin.cpp
@@ -22,10 +22,10 @@
#include "standardheaderstrategy.h"
#include "messageviewer/plainheaderstyle.h"
#include <kpluginfactory.h>
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(MessageViewerStandardsHeaderStylePluginFactory, "messageviewer_standardsheaderstyleplugin.json", registerPlugin<StandardsHeaderStylePlugin>();
- )
+K_PLUGIN_CLASS_WITH_JSON(StandardsHeaderStylePlugin, "messageviewer_standardsheaderstyleplugin.json")
StandardsHeaderStylePlugin::StandardsHeaderStylePlugin(QObject *parent, const QList<QVariant> &)
: MessageViewer::HeaderStylePlugin(parent)
diff --git a/plugins/messageviewerplugins/common/expandurlplugin/viewerpluginexpandurl.cpp b/plugins/messageviewerplugins/common/expandurlplugin/viewerpluginexpandurl.cpp
index 363a093..09f90d4 100644
--- a/plugins/messageviewerplugins/common/expandurlplugin/viewerpluginexpandurl.cpp
+++ b/plugins/messageviewerplugins/common/expandurlplugin/viewerpluginexpandurl.cpp
@@ -21,10 +21,9 @@
#include "viewerpluginexpandurlinterface.h"
#include <KActionCollection>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginExpandurlFactory, "messageviewer_expandurlplugin.json", registerPlugin<ViewerPluginExpandurl>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginExpandurl, "messageviewer_expandurlplugin.json")
ViewerPluginExpandurl::ViewerPluginExpandurl(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/messageviewerplugins/common/translatorplugin/viewerplugintranslator.cpp b/plugins/messageviewerplugins/common/translatorplugin/viewerplugintranslator.cpp
index 897c6d9..dd46021 100644
--- a/plugins/messageviewerplugins/common/translatorplugin/viewerplugintranslator.cpp
+++ b/plugins/messageviewerplugins/common/translatorplugin/viewerplugintranslator.cpp
@@ -21,10 +21,9 @@
#include "viewerplugintranslatorinterface.h"
#include <KActionCollection>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginTranslatorFactory, "messageviewer_translatorplugin.json", registerPlugin<ViewerPluginTranslator>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginTranslator, "messageviewer_translatorplugin.json")
ViewerPluginTranslator::ViewerPluginTranslator(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateevent.cpp b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateevent.cpp
index f05eac8..5a27139 100644
--- a/plugins/messageviewerplugins/createeventplugin/viewerplugincreateevent.cpp
+++ b/plugins/messageviewerplugins/createeventplugin/viewerplugincreateevent.cpp
@@ -21,10 +21,9 @@
#include "viewerplugincreateeventinterface.h"
#include <KActionCollection>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginCreateeventFactory, "messageviewer_createeventplugin.json", registerPlugin<ViewerPluginCreateevent>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginCreateevent, "messageviewer_createeventplugin.json")
ViewerPluginCreateevent::ViewerPluginCreateevent(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenote.cpp b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenote.cpp
index ce1138b..31ae012 100644
--- a/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenote.cpp
+++ b/plugins/messageviewerplugins/createnoteplugin/viewerplugincreatenote.cpp
@@ -21,10 +21,9 @@
#include "viewerplugincreatenoteinterface.h"
#include <KActionCollection>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginCreatenoteFactory, "messageviewer_createnoteplugin.json", registerPlugin<ViewerPluginCreatenote>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginCreatenote, "messageviewer_createnoteplugin.json")
ViewerPluginCreatenote::ViewerPluginCreatenote(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodo.cpp b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
index d058ad8..d2b53fa 100644
--- a/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
+++ b/plugins/messageviewerplugins/createtodoplugin/viewerplugincreatetodo.cpp
@@ -21,10 +21,9 @@
#include "viewerplugincreatetodointerface.h"
#include <KActionCollection>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginCreatetodoFactory, "messageviewer_createtodoplugin.json", registerPlugin<ViewerPluginCreatetodo>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginCreatetodo, "messageviewer_createtodoplugin.json")
ViewerPluginCreatetodo::ViewerPluginCreatetodo(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
index 0850301..326a0a2 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/viewerpluginexternalscript.cpp
@@ -23,10 +23,9 @@
#include <KActionCollection>
#include <QPointer>
#include <kpluginfactory.h>
-
+#include "kcoreaddons_kdepim_compat.h"
using namespace MessageViewer;
-K_PLUGIN_FACTORY_WITH_JSON(ViewerPluginExternalscriptFactory, "messageviewer_externalscriptplugin.json", registerPlugin<ViewerPluginExternalscript>();
- )
+K_PLUGIN_CLASS_WITH_JSON(ViewerPluginExternalscript, "messageviewer_externalscriptplugin.json")
ViewerPluginExternalscript::ViewerPluginExternalscript(QObject *parent, const QList<QVariant> &)
: MessageViewer::ViewerPlugin(parent)
diff --git a/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp b/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
index f865244..56f55b2 100644
--- a/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
+++ b/plugins/templateparser/templateparseremailaddressrequesterakonadi.cpp
@@ -21,10 +21,9 @@
#include <QHBoxLayout>
#include <Akonadi/Contact/EmailAddressRequester>
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(TemplateParserEmailAddressRequesterAkonadiFactory,
- "templateparseremailaddressrequesterakonadi.json", registerPlugin<TemplateParserEmailAddressRequesterAkonadi>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(TemplateParserEmailAddressRequesterAkonadi,
+ "templateparseremailaddressrequesterakonadi.json")
TemplateParserEmailAddressRequesterAkonadi::TemplateParserEmailAddressRequesterAkonadi(QWidget *parent, const QList<QVariant> &)
: TemplateParser::TemplateParserEmailAddressRequesterBase(parent)
diff --git a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
index ddd69cf..b7e823d 100644
--- a/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
+++ b/plugins/webengineurlinterceptor/adblock/adblockpluginurlinterceptor.cpp
@@ -24,9 +24,8 @@
#include "../lib/widgets/adblockpluginurlinterceptorconfiguredialog.h"
#include <WebEngineViewer/NetworkPluginUrlInterceptorInterface>
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(AdblockPluginUrlInterceptorFactory, "messageviewer_adblockurlinterceptor.json", registerPlugin<AdblockPluginUrlInterceptor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(AdblockPluginUrlInterceptor, "messageviewer_adblockurlinterceptor.json")
AdblockPluginUrlInterceptor::AdblockPluginUrlInterceptor(QObject *parent, const QList<QVariant> &)
: WebEngineViewer::NetworkPluginUrlInterceptor(parent)
{
diff --git a/plugins/webengineurlinterceptor/donottrack/donottrackpluginurlinterceptor.cpp b/plugins/webengineurlinterceptor/donottrack/donottrackpluginurlinterceptor.cpp
index 9a19308..66dfb9f 100644
--- a/plugins/webengineurlinterceptor/donottrack/donottrackpluginurlinterceptor.cpp
+++ b/plugins/webengineurlinterceptor/donottrack/donottrackpluginurlinterceptor.cpp
@@ -21,9 +21,8 @@
#include "donottrackinterceptorinterface.h"
#include <WebEngineViewer/NetworkPluginUrlInterceptorInterface>
#include <kpluginfactory.h>
-
-K_PLUGIN_FACTORY_WITH_JSON(DoNotTrackPluginUrlInterceptorFactory, "messageviewer_donottrackurlinterceptor.json", registerPlugin<DoNotTrackPluginUrlInterceptor>();
- )
+#include "kcoreaddons_kdepim_compat.h"
+K_PLUGIN_CLASS_WITH_JSON(DoNotTrackPluginUrlInterceptor, "messageviewer_donottrackurlinterceptor.json")
DoNotTrackPluginUrlInterceptor::DoNotTrackPluginUrlInterceptor(QObject *parent, const QList<QVariant> &)
: WebEngineViewer::NetworkPluginUrlInterceptor(parent)
{
diff --git a/sieveeditor/imapfoldercompletion/selectimapwidget.cpp b/sieveeditor/imapfoldercompletion/selectimapwidget.cpp
index ef75896..8bf08e9 100644
--- a/sieveeditor/imapfoldercompletion/selectimapwidget.cpp
+++ b/sieveeditor/imapfoldercompletion/selectimapwidget.cpp
@@ -25,10 +25,9 @@
#include <QToolButton>
#include <QHBoxLayout>
#include <QPointer>
-
+#include "kcoreaddons_kdepim_compat.h"
#include <kpluginfactory.h>
-K_PLUGIN_FACTORY_WITH_JSON(ImapFolderCompletionFactory, "imapfoldercompletion.json", registerPlugin<SelectImapWidget>();
- )
+K_PLUGIN_CLASS_WITH_JSON(SelectImapWidget, "imapfoldercompletion.json")
SelectImapWidget::SelectImapWidget(QWidget *parent, const QList<QVariant> &)
: KSieveUi::AbstractMoveImapFolderWidget(parent)
diff --git a/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp b/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp
index 9b4a5f4..23d96b3 100644
--- a/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp
+++ b/sieveeditor/regexeditorlineedit/regexpeditorlineedit.cpp
@@ -27,11 +27,10 @@
#include <KLocalizedString>
#include <KServiceTypeTrader>
#include <QDialog>
-
+#include "kcoreaddons_kdepim_compat.h"
#include <KTextWidgets/kregexpeditorinterface.h>
-K_PLUGIN_FACTORY_WITH_JSON(RegexpEditorLineEditFactory, "regexepeditorlineedit.json", registerPlugin<RegexpEditorLineEdit>();
- )
+K_PLUGIN_CLASS_WITH_JSON(RegexpEditorLineEdit, "regexepeditorlineedit.json")
struct InfoRegExp
{
InfoRegExp()