From 9a5f5124ea4d1f427883b03ae4a7e1ec3f6d613b Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Thu, 17 Jun 2021 22:05:32 +0200
Subject: [PATCH] applets: Use K_PLUGIN_CLASS_WITH_JSON directly

Task: https://phabricator.kde.org/T14542
---
 applets/appmenu/lib/appmenuapplet.cpp                 | 2 +-
 applets/calendar/calendarapplet.cpp                   | 2 +-
 applets/icon/iconapplet.cpp                           | 2 +-
 applets/notifications/notificationapplet.cpp          | 2 +-
 applets/panelspacer/plugin/panelspacer.cpp            | 2 +-
 applets/systemmonitor/systemmonitor/systemmonitor.cpp | 2 +-
 applets/systemtray/container/systemtraycontainer.cpp  | 2 +-
 applets/systemtray/systemtray.cpp                     | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/applets/appmenu/lib/appmenuapplet.cpp b/applets/appmenu/lib/appmenuapplet.cpp
index 7ef960011..4b4864970 100644
--- a/applets/appmenu/lib/appmenuapplet.cpp
+++ b/applets/appmenu/lib/appmenuapplet.cpp
@@ -301,6 +301,6 @@ bool AppMenuApplet::eventFilter(QObject *watched, QEvent *event)
     return false;
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(appmenu, AppMenuApplet, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(AppMenuApplet, "metadata.json")
 
 #include "appmenuapplet.moc"
diff --git a/applets/calendar/calendarapplet.cpp b/applets/calendar/calendarapplet.cpp
index 12c223073..c09cbc579 100644
--- a/applets/calendar/calendarapplet.cpp
+++ b/applets/calendar/calendarapplet.cpp
@@ -37,6 +37,6 @@ int CalendarApplet::weekNumber(const QDateTime &dateTime) const
     return dateTime.date().weekNumber();
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(calendar, CalendarApplet, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(CalendarApplet, "metadata.json")
 
 #include "calendarapplet.moc"
diff --git a/applets/icon/iconapplet.cpp b/applets/icon/iconapplet.cpp
index a2f5c81f4..ba9982b19 100644
--- a/applets/icon/iconapplet.cpp
+++ b/applets/icon/iconapplet.cpp
@@ -589,6 +589,6 @@ void IconApplet::setLocalPath(const QString &localPath)
     config().writeEntry(QStringLiteral("localPath"), localPath);
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(icon, IconApplet, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(IconApplet, "metadata.json")
 
 #include "iconapplet.moc"
diff --git a/applets/notifications/notificationapplet.cpp b/applets/notifications/notificationapplet.cpp
index c9180a6e4..1742221de 100644
--- a/applets/notifications/notificationapplet.cpp
+++ b/applets/notifications/notificationapplet.cpp
@@ -191,6 +191,6 @@ void NotificationApplet::forceActivateWindow(QWindow *window)
     }
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(icon, NotificationApplet, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(NotificationApplet, "metadata.json")
 
 #include "notificationapplet.moc"
diff --git a/applets/panelspacer/plugin/panelspacer.cpp b/applets/panelspacer/plugin/panelspacer.cpp
index 824c5b8da..d958bcd63 100644
--- a/applets/panelspacer/plugin/panelspacer.cpp
+++ b/applets/panelspacer/plugin/panelspacer.cpp
@@ -139,6 +139,6 @@ PlasmaQuick::AppletQuickItem *PanelSpacer::containmentGraphicObject() const
     return containment()->property("_plasma_graphicObject").value<PlasmaQuick::AppletQuickItem *>();
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(panelspacer, PanelSpacer, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(PanelSpacer, "metadata.json")
 
 #include "panelspacer.moc"
diff --git a/applets/systemmonitor/systemmonitor/systemmonitor.cpp b/applets/systemmonitor/systemmonitor/systemmonitor.cpp
index d709752a0..faa54a165 100644
--- a/applets/systemmonitor/systemmonitor/systemmonitor.cpp
+++ b/applets/systemmonitor/systemmonitor/systemmonitor.cpp
@@ -100,6 +100,6 @@ void SystemMonitor::openSystemMonitor()
     job->start();
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(systemmonitor, SystemMonitor, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(SystemMonitor, "metadata.json")
 
 #include "systemmonitor.moc"
diff --git a/applets/systemtray/container/systemtraycontainer.cpp b/applets/systemtray/container/systemtraycontainer.cpp
index 49b695eb2..9d83ad400 100644
--- a/applets/systemtray/container/systemtraycontainer.cpp
+++ b/applets/systemtray/container/systemtraycontainer.cpp
@@ -153,6 +153,6 @@ QQuickItem *SystemTrayContainer::internalSystray()
     return m_internalSystray;
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(systemtraycontainer, SystemTrayContainer, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(SystemTrayContainer, "metadata.json")
 
 #include "systemtraycontainer.moc"
diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp
index 9da2f5c1c..b3fb177e0 100644
--- a/applets/systemtray/systemtray.cpp
+++ b/applets/systemtray/systemtray.cpp
@@ -379,6 +379,6 @@ void SystemTray::stopApplet(const QString &pluginId)
     }
 }
 
-K_EXPORT_PLASMA_APPLET_WITH_JSON(systemtray, SystemTray, "metadata.json")
+K_PLUGIN_CLASS_WITH_JSON(SystemTray, "metadata.json")
 
 #include "systemtray.moc"