Use K_PLUGIN_CLASS_WITH_JSON

akonadi-import-wizard/mailapp/mailappimportdata.cpp

@@ -12,7 +12,7 @@
 #include <KPluginFactory>
 #include <QDir>
 
-K_PLUGIN_FACTORY_WITH_JSON(MailAppImporterFactory, "mailappimporter.json", registerPlugin<MailAppImportData>();)
+K_PLUGIN_CLASS_WITH_JSON(MailAppImporterFactory, "mailappimporter.json")
 
 MailAppImportData::MailAppImportData(QObject *parent, const QList<QVariant> &)
     : LibImportWizard::AbstractImporter(parent)

akonadi-import-wizard/oe/oeimportdata.cpp

@@ -13,7 +13,7 @@
 
 #include <QDir>
 
-K_PLUGIN_FACTORY_WITH_JSON(OEImporterFactory, "oeimporter.json", registerPlugin<OeImportData>();)
+K_PLUGIN_CLASS_WITH_JSON(OEImporterFactory, "oeimporter.json")
 
 OeImportData::OeImportData(QObject *parent, const QList<QVariant> &)
     : LibImportWizard::AbstractImporter(parent)

akonadi-import-wizard/pmail/pmailimportdata.cpp

@@ -13,7 +13,7 @@
 #include <KPluginFactory>
 #include <QDir>
 
-K_PLUGIN_FACTORY_WITH_JSON(PMailImporterFactory, "pmailimporter.json", registerPlugin<PMailImportData>();)
+K_PLUGIN_CLASS_WITH_JSON(PMailImporterFactory, "pmailimporter.json")
 PMailImportData::PMailImportData(QObject *parent, const QList<QVariant> &)
     : LibImportWizard::AbstractImporter(parent)
 {

akonadi-import-wizard/thebat/thebatimportdata.cpp

@@ -13,7 +13,7 @@
 
 #include <QDir>
 
-K_PLUGIN_FACTORY_WITH_JSON(TheBatImporterFactory, "thebatimporter.json", registerPlugin<TheBatImportData>();)
+K_PLUGIN_CLASS_WITH_JSON(TheBatImporterFactory, "thebatimporter.json")
 
 TheBatImportData::TheBatImportData(QObject *parent, const QList<QVariant> &)
     : LibImportWizard::AbstractImporter(parent)