Simplify code using K_PLUGIN_CLASS_WITH_JSON macro

This way we don't need to explicitly name the resulting plugin factory

plugins/bwscheduler/bwschedulerplugin.cpp

@@ -31,7 +31,7 @@
 
 using namespace bt;
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_bwscheduler, "ktorrent_bwscheduler.json", registerPlugin<kt::BWSchedulerPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::BWSchedulerPlugin, "ktorrent_bwscheduler.json")
 
 namespace kt
 {

plugins/downloadorder/downloadorderplugin.cpp

@@ -19,7 +19,7 @@
 #include <torrent/queuemanager.h>
 #include <util/fileops.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_downloadorder, "ktorrent_downloadorder.json", registerPlugin<kt::DownloadOrderPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::DownloadOrderPlugin, "ktorrent_downloadorder.json")
 
 using namespace bt;
 

plugins/infowidget/infowidgetplugin.cpp

@@ -26,7 +26,7 @@
 #include "trackerview.h"
 #include "webseedstab.h"
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_infowidget, "ktorrent_infowidget.json", registerPlugin<kt::InfoWidgetPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::InfoWidgetPlugin, "ktorrent_infowidget.json")
 
 using namespace bt;
 

plugins/ipfilter/ipfilterplugin.cpp

@@ -24,7 +24,7 @@
 
 using namespace bt;
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_ipfilter, "ktorrent_ipfilter.json", registerPlugin<kt::IPFilterPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::IPFilterPlugin, "ktorrent_ipfilter.json")
 
 namespace kt
 {

plugins/logviewer/logviewerplugin.cpp

@@ -22,7 +22,7 @@
 
 using namespace bt;
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_logviewer, "ktorrent_logviewer.json", registerPlugin<kt::LogViewerPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::LogViewerPlugin, "ktorrent_logviewer.json")
 
 namespace kt
 {

plugins/magnetgenerator/magnetgeneratorplugin.cpp

@@ -25,7 +25,7 @@
 #include <tracker/tracker.h>
 #include <util/sha1hash.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_magnetgenerator, "ktorrent_magnetgenerator.json", registerPlugin<kt::MagnetGeneratorPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::MagnetGeneratorPlugin, "ktorrent_magnetgenerator.json")
 
 using namespace bt;
 namespace kt

plugins/mediaplayer/mediaplayerplugin.cpp

@@ -14,7 +14,7 @@
 #include <util/log.h>
 #include <util/logsystemmanager.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_mediaplayer, "ktorrent_mediaplayer.json", registerPlugin<kt::MediaPlayerPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::MediaPlayerPlugin, "ktorrent_mediaplayer.json")
 
 using namespace bt;
 

plugins/scanfolder/scanfolderplugin.cpp

@@ -25,7 +25,7 @@
 
 using namespace bt;
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_scanfolder, "ktorrent_scanfolder.json", registerPlugin<kt::ScanFolderPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::ScanFolderPlugin, "ktorrent_scanfolder.json")
 
 namespace kt
 {

plugins/scanforlostfiles/scanforlostfilesplugin.cpp

@@ -22,7 +22,7 @@
 
 using namespace bt;
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_scanforlostfiles, "ktorrent_scanforlostfiles.json", registerPlugin<kt::ScanForLostFilesPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::ScanForLostFilesPlugin, "ktorrent_scanforlostfiles.json")
 
 namespace kt
 {

plugins/search/searchplugin.cpp

@@ -29,7 +29,7 @@
 #include <util/log.h>
 #include <util/logsystemmanager.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_search, "ktorrent_search.json", registerPlugin<kt::SearchPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::SearchPlugin, "ktorrent_search.json")
 
 using namespace bt;
 

plugins/shutdown/shutdownplugin.cpp

@@ -19,7 +19,7 @@
 #include <interfaces/functions.h>
 #include <util/log.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_shutdown, "ktorrent_shutdown.json", registerPlugin<kt::ShutdownPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::ShutdownPlugin, "ktorrent_shutdown.json")
 
 using namespace bt;
 

plugins/stats/StatsPlugin.cc

@@ -7,7 +7,7 @@
 #include <interfaces/torrentactivityinterface.h>
 #include <KPluginFactory>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_stats, "ktorrent_stats.json", registerPlugin<kt::StatsPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::StatsPlugin, "ktorrent_stats.json")
 
 namespace kt
 {

plugins/syndication/syndicationplugin.cpp

@@ -16,7 +16,7 @@
 #include <util/log.h>
 #include <util/logsystemmanager.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_syndication, "ktorrent_syndication.json", registerPlugin<kt::SyndicationPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::SyndicationPlugin, "ktorrent_syndication.json")
 
 using namespace bt;
 

plugins/upnp/upnpplugin.cpp

@@ -19,7 +19,7 @@
 #include "upnpwidget.h"
 #include <interfaces/torrentactivityinterface.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_upnp, "ktorrent_upnp.json", registerPlugin<kt::UPnPPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::UPnPPlugin, "ktorrent_upnp.json")
 
 using namespace bt;
 

plugins/zeroconf/zeroconfplugin.cpp

@@ -12,7 +12,7 @@
 #include <util/log.h>
 #include <util/logsystemmanager.h>
 
-K_PLUGIN_FACTORY_WITH_JSON(ktorrent_zeroconf, "ktorrent_zeroconf.json", registerPlugin<kt::ZeroConfPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(kt::ZeroConfPlugin, "ktorrent_zeroconf.json")
 
 using namespace bt;