kpackage structures: Use K_PLUGIN_CLASS_WITH_JSON directly

Task: https://phabricator.kde.org/T14542
5 years ago · b640fbdc3e
parent 90ede05980
commit b640fbdc3e
5 changed files with 5 additions and 5 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"