package structures: Use K_PLUGIN_CLASS_WITH_JSON directly

Task: https://phabricator.kde.org/T14542

examples/testcontainmentactionsplugin/test.cpp

@@ -64,6 +64,6 @@ void ContextTest::save(KConfigGroup &config)
     config.writeEntry("test-text", m_text);
 }
 
-K_EXPORT_PLASMA_CONTAINMENTACTIONS_WITH_JSON(containmentactions_test, ContextTest, "plasma-containmentactions-test.desktop")
+K_PLUGIN_CLASS_WITH_JSON(ContextTest, "plasma-containmentactions-test.desktop")
 
 #include "test.moc"

src/plasma/packagestructure/containmentactionspackage.cpp

@@ -27,6 +27,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(ContainmentActionsPackage, "containmentactions-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(ContainmentActionsPackage, "containmentactions-packagestructure.json")
 
 #include "containmentactionspackage.moc"

src/plasma/packagestructure/dataenginepackage.cpp

@@ -40,6 +40,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(DataEnginePackage, "dataengine-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(DataEnginePackage, "dataengine-packagestructure.json")
 
 #include "dataenginepackage.moc"

src/plasma/packagestructure/plasmagenericpackage.cpp

@@ -11,6 +11,7 @@
 #include <kpackage/package.h>
 #include <kpackage/packagestructure.h>
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(Plasma::GenericPackage, "plasmageneric-packagestructure.json")
+using namespace Plasma;
+K_PLUGIN_CLASS_WITH_JSON(GenericPackage, "plasmageneric-packagestructure.json")
 
 #include "plasmagenericpackage.moc"

src/plasma/packagestructure/plasmathemepackage.cpp

@@ -75,6 +75,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(ThemePackage, "plasmatheme-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(ThemePackage, "plasmatheme-packagestructure.json")
 
 #include "plasmathemepackage.moc"

src/plasma/packagestructure/plasmoidpackage.cpp

@@ -45,6 +45,6 @@ public:
     }
 };
 
-K_EXPORT_KPACKAGE_PACKAGE_WITH_JSON(PlasmoidPackage, "plasmoid-packagestructure.json")
+K_PLUGIN_CLASS_WITH_JSON(PlasmoidPackage, "plasmoid-packagestructure.json")
 
 #include "plasmoidpackage.moc"