Use directly K_PLUGIN_CLASS_WITH_JSON

src/kcm_knote_collection.cpp

@@ -6,6 +6,6 @@
 #include "knoteconfigmodule.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(KNoteCollectionConfigFactory, "knote_config_collection.json", registerPlugin<KNoteCollectionConfig>();)
+K_PLUGIN_CLASS_WITH_JSON(KNoteCollectionConfig, "knote_config_collection.json")
 
 #include "kcm_knote_collection.moc"

src/kcm_knote_display.cpp

@@ -6,6 +6,6 @@
 #include "knoteconfigmodule.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(KNoteEditorConfigFactory, "knote_config_display.json", registerPlugin<KNoteDisplayConfig>();)
+K_PLUGIN_CLASS_WITH_JSON(KNoteDisplayConfig, "knote_config_display.json")
 
 #include "kcm_knote_display.moc"

src/kcm_knote_editor.cpp

@@ -6,6 +6,6 @@
 #include "knoteconfigmodule.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(KNoteEditorConfigFactory, "knote_config_editor.json", registerPlugin<KNoteEditorConfig>();)
+K_PLUGIN_CLASS_WITH_JSON(KNoteEditorConfig, "knote_config_editor.json")
 
 #include "kcm_knote_editor.moc"

src/kcm_knote_misc.cpp

@@ -6,6 +6,6 @@
 #include "knoteconfigmodule.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(KNoteMiscConfigFactory, "knote_config_misc.json", registerPlugin<KNoteMiscConfig>();)
+K_PLUGIN_CLASS_WITH_JSON(KNoteMiscConfig, "knote_config_misc.json")
 
 #include "kcm_knote_misc.moc"

src/kcm_knote_print.cpp

@@ -7,6 +7,6 @@
 #include "knoteconfigmodule.h"
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(KNotePrintConfigFactory, "knote_config_print.json", registerPlugin<KNotePrintConfig>();)
+K_PLUGIN_CLASS_WITH_JSON(KNotePrintConfig, "knote_config_print.json")
 
 #include "kcm_knote_print.moc"

src/kontactplugin/kcmknotessummary.cpp

@@ -23,7 +23,7 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 
-K_PLUGIN_FACTORY_WITH_JSON(KCMKNotesSummaryFactory, "kcmknotessummary.json", registerPlugin<KCMKNotesSummary>();)
+K_PLUGIN_CLASS_WITH_JSON(KCMKNotesSummary, "kcmknotessummary.json")
 
 KCMKNotesSummary::KCMKNotesSummary(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args)