summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <[email protected]>2019-01-08 21:01:17 +0100
committerAlbert Astals Cid <[email protected]>2019-01-08 21:01:22 +0100
commit7f7201fbe9031dca77ae10305c43761e83f80a25 (patch)
tree045add9544b99b668c3d3e658d9e23b642d6dc77
parentabe9014a3c0642afd379bc06d66833cbf5b54ef5 (diff)
Use the nicer K_PLUGIN_CLASS_WITH_JSON
Reviewers: apol Reviewed By: apol Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18080
-rw-r--r--kded/service.cpp4
-rw-r--r--mobile/broadband/mobilebroadbandsettings.cpp2
-rw-r--r--mobile/wifi/wifisettings.cpp2
-rw-r--r--vpn/fortisslvpn/fortisslvpn.cpp2
-rw-r--r--vpn/iodine/iodine.cpp2
-rw-r--r--vpn/l2tp/l2tp.cpp2
-rw-r--r--vpn/openswan/openswan.cpp2
-rw-r--r--vpn/openvpn/openvpn.cpp2
-rw-r--r--vpn/pptp/pptp.cpp2
-rw-r--r--vpn/ssh/ssh.cpp2
-rw-r--r--vpn/sstp/sstp.cpp2
-rw-r--r--vpn/strongswan/strongswan.cpp2
-rw-r--r--vpn/vpnc/vpnc.cpp2
-rw-r--r--vpn/wireguard/wireguard.cpp2
14 files changed, 14 insertions, 16 deletions
diff --git a/kded/service.cpp b/kded/service.cpp
index 7e4fdfd..4b92724 100644
--- a/kded/service.cpp
+++ b/kded/service.cpp
@@ -36,9 +36,7 @@
#include <QDBusConnectionInterface>
#include <QDBusReply>
-K_PLUGIN_FACTORY_WITH_JSON(NetworkManagementServiceFactory,
- "networkmanagement.json",
- registerPlugin<NetworkManagementService>();)
+K_PLUGIN_CLASS_WITH_JSON(NetworkManagementService, "networkmanagement.json")
class NetworkManagementServicePrivate
{
diff --git a/mobile/broadband/mobilebroadbandsettings.cpp b/mobile/broadband/mobilebroadbandsettings.cpp
index cd937a9..712fc48 100644
--- a/mobile/broadband/mobilebroadbandsettings.cpp
+++ b/mobile/broadband/mobilebroadbandsettings.cpp
@@ -33,7 +33,7 @@
#include <ModemManagerQt/ModemDevice>
#endif
-K_PLUGIN_FACTORY_WITH_JSON(MobileBroadbandSettingsFactory, "mobilebroadbandsettings.json", registerPlugin<MobileBroadbandSettings>();)
+K_PLUGIN_CLASS_WITH_JSON(MobileBroadbandSettings, "mobilebroadbandsettings.json")
MobileBroadbandSettings::MobileBroadbandSettings(QObject* parent, const QVariantList& args) : KQuickAddons::ConfigModule(parent, args)
{
diff --git a/mobile/wifi/wifisettings.cpp b/mobile/wifi/wifisettings.cpp
index f6bb3d2..a0b3eed 100644
--- a/mobile/wifi/wifisettings.cpp
+++ b/mobile/wifi/wifisettings.cpp
@@ -38,7 +38,7 @@
#include <NetworkManagerQt/WirelessSetting>
-K_PLUGIN_FACTORY_WITH_JSON(WifiSettingsFactory, "wifisettings.json", registerPlugin<WifiSettings>();)
+K_PLUGIN_CLASS_WITH_JSON(WifiSettings, "wifisettings.json")
WifiSettings::WifiSettings(QObject* parent, const QVariantList& args) : KQuickAddons::ConfigModule(parent, args)
{
diff --git a/vpn/fortisslvpn/fortisslvpn.cpp b/vpn/fortisslvpn/fortisslvpn.cpp
index aaaa51b..9a8fb65 100644
--- a/vpn/fortisslvpn/fortisslvpn.cpp
+++ b/vpn/fortisslvpn/fortisslvpn.cpp
@@ -24,7 +24,7 @@
#include <KPluginFactory>
-K_PLUGIN_FACTORY_WITH_JSON(FortisslvpnUiPluginFactory, "plasmanetworkmanagement_fortisslvpnui.json", registerPlugin<FortisslvpnUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(FortisslvpnUiPlugin, "plasmanetworkmanagement_fortisslvpnui.json")
FortisslvpnUiPlugin::FortisslvpnUiPlugin(QObject *parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/iodine/iodine.cpp b/vpn/iodine/iodine.cpp
index 712afb4..a059255 100644
--- a/vpn/iodine/iodine.cpp
+++ b/vpn/iodine/iodine.cpp
@@ -24,7 +24,7 @@
#include <KPluginFactory>
-K_PLUGIN_FACTORY_WITH_JSON(IodineUiPluginFactory, "plasmanetworkmanagement_iodineui.json", registerPlugin<IodineUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(IodineUiPlugin, "plasmanetworkmanagement_iodineui.json")
IodineUiPlugin::IodineUiPlugin(QObject *parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/l2tp/l2tp.cpp b/vpn/l2tp/l2tp.cpp
index 1830cbe..89d026d 100644
--- a/vpn/l2tp/l2tp.cpp
+++ b/vpn/l2tp/l2tp.cpp
@@ -27,7 +27,7 @@
#include "l2tpwidget.h"
#include "l2tpauth.h"
-K_PLUGIN_FACTORY_WITH_JSON(L2tpUiPluginFactory, "plasmanetworkmanagement_l2tpui.json", registerPlugin<L2tpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(L2tpUiPlugin, "plasmanetworkmanagement_l2tpui.json")
L2tpUiPlugin::L2tpUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/openswan/openswan.cpp b/vpn/openswan/openswan.cpp
index b58d488..014f92f 100644
--- a/vpn/openswan/openswan.cpp
+++ b/vpn/openswan/openswan.cpp
@@ -25,7 +25,7 @@
#include "openswanwidget.h"
#include "openswanauth.h"
-K_PLUGIN_FACTORY_WITH_JSON(OpenswanUiPluginFactory, "plasmanetworkmanagement_openswanui.json", registerPlugin<OpenswanUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(OpenswanUiPlugin, "plasmanetworkmanagement_openswanui.json")
OpenswanUiPlugin::OpenswanUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/openvpn/openvpn.cpp b/vpn/openvpn/openvpn.cpp
index f15d8a9..e1d8de9 100644
--- a/vpn/openvpn/openvpn.cpp
+++ b/vpn/openvpn/openvpn.cpp
@@ -42,7 +42,7 @@
#include "nm-openvpn-service.h"
-K_PLUGIN_FACTORY_WITH_JSON(OpenVpnUiPluginFactory, "plasmanetworkmanagement_openvpnui.json", registerPlugin<OpenVpnUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(OpenVpnUiPlugin, "plasmanetworkmanagement_openvpnui.json")
#define AUTH_TAG "auth"
#define AUTH_USER_PASS_TAG "auth-user-pass"
diff --git a/vpn/pptp/pptp.cpp b/vpn/pptp/pptp.cpp
index 5fb482a..21e1b65 100644
--- a/vpn/pptp/pptp.cpp
+++ b/vpn/pptp/pptp.cpp
@@ -26,7 +26,7 @@
#include "pptpwidget.h"
#include "pptpauth.h"
-K_PLUGIN_FACTORY_WITH_JSON(PptpUiPluginFactory, "plasmanetworkmanagement_pptpui.json", registerPlugin<PptpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(PptpUiPlugin, "plasmanetworkmanagement_pptpui.json")
PptpUiPlugin::PptpUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/ssh/ssh.cpp b/vpn/ssh/ssh.cpp
index efebb45..a5b5cab 100644
--- a/vpn/ssh/ssh.cpp
+++ b/vpn/ssh/ssh.cpp
@@ -24,7 +24,7 @@
#include <KPluginFactory>
-K_PLUGIN_FACTORY_WITH_JSON(SshUiPluginFactory, "plasmanetworkmanagement_sshui.json", registerPlugin<SshUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(SshUiPlugin, "plasmanetworkmanagement_sshui.json")
SshUiPlugin::SshUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/sstp/sstp.cpp b/vpn/sstp/sstp.cpp
index c2bc05c..cdfaf78 100644
--- a/vpn/sstp/sstp.cpp
+++ b/vpn/sstp/sstp.cpp
@@ -24,7 +24,7 @@
#include <KPluginFactory>
-K_PLUGIN_FACTORY_WITH_JSON(SstpUiPluginFactory, "plasmanetworkmanagement_sstpui.json", registerPlugin<SstpUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(SstpUiPlugin, "plasmanetworkmanagement_sstpui.json")
SstpUiPlugin::SstpUiPlugin(QObject *parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/strongswan/strongswan.cpp b/vpn/strongswan/strongswan.cpp
index 4cec3e2..a72c33e 100644
--- a/vpn/strongswan/strongswan.cpp
+++ b/vpn/strongswan/strongswan.cpp
@@ -26,7 +26,7 @@
#include <KPluginFactory>
-K_PLUGIN_FACTORY_WITH_JSON(StrongswanUiPluginFactory, "plasmanetworkmanagement_strongswanui.json", registerPlugin<StrongswanUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(StrongswanUiPlugin, "plasmanetworkmanagement_strongswanui.json")
StrongswanUiPlugin::StrongswanUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
index ba09996..2767831 100644
--- a/vpn/vpnc/vpnc.cpp
+++ b/vpn/vpnc/vpnc.cpp
@@ -94,7 +94,7 @@ void VpncUiPluginPrivate::ciscoDecryptError(QProcess::ProcessError pError)
#define NM_VPNC_LOCAL_PORT_DEFAULT 500
-K_PLUGIN_FACTORY_WITH_JSON(VpncUiPluginFactory, "plasmanetworkmanagement_vpncui.json", registerPlugin<VpncUiPlugin>();)
+K_PLUGIN_CLASS_WITH_JSON(VpncUiPlugin, "plasmanetworkmanagement_vpncui.json")
VpncUiPlugin::VpncUiPlugin(QObject * parent, const QVariantList &)
: VpnUiPlugin(parent)
diff --git a/vpn/wireguard/wireguard.cpp b/vpn/wireguard/wireguard.cpp
index 0250def..51ef09b 100644
--- a/vpn/wireguard/wireguard.cpp
+++ b/vpn/wireguard/wireguard.cpp
@@ -39,7 +39,7 @@
#include "nm-wireguard-service.h"
-K_PLUGIN_FACTORY_WITH_JSON(WireGuardUiPluginFactory, "plasmanetworkmanagement_wireguardui.json", registerPlugin<WireGuardUiPlugin>(); )
+K_PLUGIN_CLASS_WITH_JSON(WireGuardUiPlugin, "plasmanetworkmanagement_wireguardui.json")
#define NMV_WG_TAG_INTERFACE "Interface"
#define NMV_WG_TAG_PRIVATE_KEY "PrivateKey"