From b640fbdc3e030a5d8fccfde366e9f8ab9e85aa2a Mon Sep 17 00:00:00 2001
From: Alexander Lohnau <alexander.lohnau@gmx.de>
Date: Thu, 17 Jun 2021 22:00:56 +0200
Subject: [PATCH] kpackage structures: Use K_PLUGIN_CLASS_WITH_JSON directly

Task: https://phabricator.kde.org/T14542
---
 shell/packageplugins/layouttemplate/layouttemplate.cpp    | 2 +-
 shell/packageplugins/lookandfeel/lookandfeel.cpp          | 2 +-
 shell/packageplugins/qmlWallpaper/wallpaper.cpp           | 2 +-
 shell/packageplugins/shell/shellpackage.cpp               | 2 +-
 shell/packageplugins/wallpaperimages/wallpaperpackage.cpp | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/shell/packageplugins/layouttemplate/layouttemplate.cpp b/shell/packageplugins/layouttemplate/layouttemplate.cpp
index 3a2fb18a8..5ba75e357 100644
--- a/shell/packageplugins/layouttemplate/layouttemplate.cpp
+++ b/shell/packageplugins/layouttemplate/layouttemplate.cpp
@@ -29,6 +29,6 @@ void LayoutTemplatePackage::initPackage(KPackage::Package *package)
     package->setRequired("mainscript", true);
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(LayoutTemplatePackage, "plasma-packagestructure-layouttemplate.json")
+K_PLUGIN_CLASS_WITH_JSON(LayoutTemplatePackage, "plasma-packagestructure-layouttemplate.json")
 
 #include "layouttemplate.moc"
diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp
index 590eb10c1..768f29c4f 100644
--- a/shell/packageplugins/lookandfeel/lookandfeel.cpp
+++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp
@@ -104,6 +104,6 @@ void LookAndFeelPackage::pathChanged(KPackage::Package *package)
     }
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(LookAndFeelPackage, "plasma-packagestructure-lookandfeel.json")
+K_PLUGIN_CLASS_WITH_JSON(LookAndFeelPackage, "plasma-packagestructure-lookandfeel.json")
 
 #include "lookandfeel.moc"
diff --git a/shell/packageplugins/qmlWallpaper/wallpaper.cpp b/shell/packageplugins/qmlWallpaper/wallpaper.cpp
index 3aaff76af..a8a3e06b7 100644
--- a/shell/packageplugins/qmlWallpaper/wallpaper.cpp
+++ b/shell/packageplugins/qmlWallpaper/wallpaper.cpp
@@ -66,6 +66,6 @@ void QmlWallpaperPackage::initPackage(KPackage::Package *package)
     package->addDirectoryDefinition("translations", QStringLiteral("locale"), i18n("Translations"));
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(QmlWallpaperPackage, "plasma-packagestructure-wallpaper.json")
+K_PLUGIN_CLASS_WITH_JSON(QmlWallpaperPackage, "plasma-packagestructure-wallpaper.json")
 
 #include "wallpaper.moc"
diff --git a/shell/packageplugins/shell/shellpackage.cpp b/shell/packageplugins/shell/shellpackage.cpp
index bfb0e8578..210d91daa 100644
--- a/shell/packageplugins/shell/shellpackage.cpp
+++ b/shell/packageplugins/shell/shellpackage.cpp
@@ -97,6 +97,6 @@ void ShellPackage::pathChanged(KPackage::Package *package)
     }
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(ShellPackage, "plasma-packagestructure-plasma-shell.json")
+K_PLUGIN_CLASS_WITH_JSON(ShellPackage, "plasma-packagestructure-plasma-shell.json")
 
 #include "shellpackage.moc"
diff --git a/shell/packageplugins/wallpaperimages/wallpaperpackage.cpp b/shell/packageplugins/wallpaperimages/wallpaperpackage.cpp
index d049901c6..8b18a4df2 100644
--- a/shell/packageplugins/wallpaperimages/wallpaperpackage.cpp
+++ b/shell/packageplugins/wallpaperimages/wallpaperpackage.cpp
@@ -76,6 +76,6 @@ void WallpaperPackage::pathChanged(KPackage::Package *package)
     guard = false;
 }
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(WallpaperPackage, "plasma-packagestructure-wallpaperimages.json")
+K_PLUGIN_CLASS_WITH_JSON(WallpaperPackage, "plasma-packagestructure-wallpaperimages.json")
 
 #include "wallpaperpackage.moc"