Use KPluginFactory to instantiate plugins

Instead of the homegrown factory

CMakeLists.txt

@@ -71,7 +71,7 @@ set(PIMCOMMON_LIB_VERSION "5.18.40")
 set(LIBKDEPIM_LIB_VERSION "5.18.40")
 set(LIBINCIDENCEEDITOR_LIB_VERSION "5.18.40")
 set(CALENDARSUPPORT_LIB_VERSION "5.18.40")
-set(EVENTVIEW_LIB_VERSION "5.18.40")
+set(EVENTVIEW_LIB_VERSION "5.18.41")
 set(AKONADI_SEARCH_VERSION "5.18.40")
 
 find_package(KF5AkonadiSearch ${AKONADI_SEARCH_VERSION} CONFIG REQUIRED)

src/kocore.cpp

@@ -54,21 +54,14 @@ KService::List KOCore::availableCalendarDecorations()
 EventViews::CalendarDecoration::Decoration *KOCore::loadCalendarDecoration(const KService::Ptr &service)
 {
     KPluginLoader loader(*service);
-    auto factory = loader.instance();
+    auto factory = loader.factory();
 
     if (!factory) {
         qCDebug(KORGANIZER_LOG) << "Factory creation failed";
         return nullptr;
     }
 
-    auto pluginFactory = qobject_cast<EventViews::CalendarDecoration::DecorationFactory *>(factory);
-
-    if (!pluginFactory) {
-        qCDebug(KORGANIZER_LOG) << "Cast failed";
-        return nullptr;
-    }
-
-    return pluginFactory->createPluginFactory();
+    return factory->create<EventViews::CalendarDecoration::Decoration>();
 }
 
 void KOCore::addXMLGUIClient(QWidget *wdg, KXMLGUIClient *guiclient)