diff --git a/dataengines/potd/apodprovider.cpp b/dataengines/potd/apodprovider.cpp --- a/dataengines/potd/apodprovider.cpp +++ b/dataengines/potd/apodprovider.cpp @@ -77,6 +77,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(ApodProviderFactory, "apodprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(ApodProvider, "apodprovider.json") #include "apodprovider.moc" diff --git a/dataengines/potd/bingprovider.cpp b/dataengines/potd/bingprovider.cpp --- a/dataengines/potd/bingprovider.cpp +++ b/dataengines/potd/bingprovider.cpp @@ -89,6 +89,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(BingProviderFactory, "bingprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(BingProvider, "bingprovider.json") #include "bingprovider.moc" diff --git a/dataengines/potd/epodprovider.cpp b/dataengines/potd/epodprovider.cpp --- a/dataengines/potd/epodprovider.cpp +++ b/dataengines/potd/epodprovider.cpp @@ -76,6 +76,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(EpodProviderFactory, "epodprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(EpodProvider, "epodprovider.json") #include "epodprovider.moc" diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp --- a/dataengines/potd/flickrprovider.cpp +++ b/dataengines/potd/flickrprovider.cpp @@ -162,6 +162,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(FlickrProviderFactory, "flickrprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(FlickrProvider, "flickrprovider.json") #include "flickrprovider.moc" diff --git a/dataengines/potd/natgeoprovider.cpp b/dataengines/potd/natgeoprovider.cpp --- a/dataengines/potd/natgeoprovider.cpp +++ b/dataengines/potd/natgeoprovider.cpp @@ -86,6 +86,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(NatGeoProviderFactory, "natgeoprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(NatGeoProvider, "natgeoprovider.json") #include "natgeoprovider.moc" diff --git a/dataengines/potd/noaaprovider.cpp b/dataengines/potd/noaaprovider.cpp --- a/dataengines/potd/noaaprovider.cpp +++ b/dataengines/potd/noaaprovider.cpp @@ -85,6 +85,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(NOAAProviderFactory, "noaaprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(NOAAProvider, "noaaprovider.json") #include "noaaprovider.moc" diff --git a/dataengines/potd/wcpotdprovider.cpp b/dataengines/potd/wcpotdprovider.cpp --- a/dataengines/potd/wcpotdprovider.cpp +++ b/dataengines/potd/wcpotdprovider.cpp @@ -93,6 +93,6 @@ emit finished(this); } -K_PLUGIN_FACTORY_WITH_JSON(WcpotdProviderFactory, "wcpotdprovider.json", registerPlugin();) +K_PLUGIN_CLASS_WITH_JSON(WcpotdProvider, "wcpotdprovider.json") #include "wcpotdprovider.moc" diff --git a/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp b/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp --- a/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp +++ b/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp @@ -79,7 +79,6 @@ } -K_PLUGIN_FACTORY_WITH_JSON(%{APPNAME}Factory, "%{APPNAMELC}.json", - registerPlugin<%{APPNAME}>();) +K_PLUGIN_CLASS_WITH_JSON(%{APPNAME}, "%{APPNAMELC}.json") #include "%{APPNAMELC}.moc"