summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Astals Cid <[email protected]>2019-01-07 19:27:03 +0100
committerAlbert Astals Cid <[email protected]>2019-01-07 19:27:08 +0100
commit62c106fbe1ded4eb2c843073817be08a7bd303d8 (patch)
tree8e08b03880d0d7b34f314a82cb41825524fa1589
parent1114fa87459022629e1a85f14191cde293a24298 (diff)
Use the nicer K_PLUGIN_CLASS_WITH_JSON
Reviewers: davidedmundson Reviewed By: davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D18025
-rw-r--r--dataengines/potd/apodprovider.cpp2
-rw-r--r--dataengines/potd/bingprovider.cpp2
-rw-r--r--dataengines/potd/epodprovider.cpp2
-rw-r--r--dataengines/potd/flickrprovider.cpp2
-rw-r--r--dataengines/potd/natgeoprovider.cpp2
-rw-r--r--dataengines/potd/noaaprovider.cpp2
-rw-r--r--dataengines/potd/wcpotdprovider.cpp2
-rw-r--r--templates/plasmapotdprovider/src/%{APPNAMELC}.cpp3
8 files changed, 8 insertions, 9 deletions
diff --git a/dataengines/potd/apodprovider.cpp b/dataengines/potd/apodprovider.cpp
index 7db4262..e7609eb 100644
--- a/dataengines/potd/apodprovider.cpp
+++ b/dataengines/potd/apodprovider.cpp
@@ -77,6 +77,6 @@ void ApodProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(ApodProviderFactory, "apodprovider.json", registerPlugin<ApodProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(ApodProvider, "apodprovider.json")
#include "apodprovider.moc"
diff --git a/dataengines/potd/bingprovider.cpp b/dataengines/potd/bingprovider.cpp
index 6f986e3..a000027 100644
--- a/dataengines/potd/bingprovider.cpp
+++ b/dataengines/potd/bingprovider.cpp
@@ -89,6 +89,6 @@ void BingProvider::imageRequestFinished(KJob* _job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(BingProviderFactory, "bingprovider.json", registerPlugin<BingProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(BingProvider, "bingprovider.json")
#include "bingprovider.moc"
diff --git a/dataengines/potd/epodprovider.cpp b/dataengines/potd/epodprovider.cpp
index f924d97..2f70b89 100644
--- a/dataengines/potd/epodprovider.cpp
+++ b/dataengines/potd/epodprovider.cpp
@@ -76,6 +76,6 @@ void EpodProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(EpodProviderFactory, "epodprovider.json", registerPlugin<EpodProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(EpodProvider, "epodprovider.json")
#include "epodprovider.moc"
diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp
index 5100504..b3198a4 100644
--- a/dataengines/potd/flickrprovider.cpp
+++ b/dataengines/potd/flickrprovider.cpp
@@ -162,6 +162,6 @@ void FlickrProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(FlickrProviderFactory, "flickrprovider.json", registerPlugin<FlickrProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(FlickrProvider, "flickrprovider.json")
#include "flickrprovider.moc"
diff --git a/dataengines/potd/natgeoprovider.cpp b/dataengines/potd/natgeoprovider.cpp
index 601dfba..c15d340 100644
--- a/dataengines/potd/natgeoprovider.cpp
+++ b/dataengines/potd/natgeoprovider.cpp
@@ -86,6 +86,6 @@ void NatGeoProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(NatGeoProviderFactory, "natgeoprovider.json", registerPlugin<NatGeoProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(NatGeoProvider, "natgeoprovider.json")
#include "natgeoprovider.moc"
diff --git a/dataengines/potd/noaaprovider.cpp b/dataengines/potd/noaaprovider.cpp
index 03321e2..076df92 100644
--- a/dataengines/potd/noaaprovider.cpp
+++ b/dataengines/potd/noaaprovider.cpp
@@ -85,6 +85,6 @@ void NOAAProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(NOAAProviderFactory, "noaaprovider.json", registerPlugin<NOAAProvider>();)
+K_PLUGIN_CLASS_WITH_JSON(NOAAProvider, "noaaprovider.json")
#include "noaaprovider.moc"
diff --git a/dataengines/potd/wcpotdprovider.cpp b/dataengines/potd/wcpotdprovider.cpp
index c8c4c3d..c8ac931 100644
--- a/dataengines/potd/wcpotdprovider.cpp
+++ b/dataengines/potd/wcpotdprovider.cpp
@@ -93,6 +93,6 @@ void WcpotdProvider::imageRequestFinished(KJob *_job)
emit finished(this);
}
-K_PLUGIN_FACTORY_WITH_JSON(WcpotdProviderFactory, "wcpotdprovider.json", registerPlugin<WcpotdProvider>();)
+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
index eba7199..66f8617 100644
--- a/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp
+++ b/templates/plasmapotdprovider/src/%{APPNAMELC}.cpp
@@ -79,7 +79,6 @@ void %{APPNAME}::handleFinishedImageRequest(KJob *job)
}
-K_PLUGIN_FACTORY_WITH_JSON(%{APPNAME}Factory, "%{APPNAMELC}.json",
- registerPlugin<%{APPNAME}>();)
+K_PLUGIN_CLASS_WITH_JSON(%{APPNAME}, "%{APPNAMELC}.json")
#include "%{APPNAMELC}.moc"