diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,6 @@ find_package(KF5WidgetsAddons ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} CONFIG REQUIRED) find_package(KF5ItemViews ${KF5_DEP_VERSION} CONFIG REQUIRED) -find_package(KF5Service ${KF5_DEP_VERSION} CONFIG REQUIRED) include(KDEInstallDirs) include(KDECMakeSettings) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,7 +34,6 @@ KF5::I18n KF5::CoreAddons KF5::PeopleBackend - KF5::Service ) if(NOT ANDROID) diff --git a/src/personpluginmanager.cpp b/src/personpluginmanager.cpp --- a/src/personpluginmanager.cpp +++ b/src/personpluginmanager.cpp @@ -22,8 +22,6 @@ #include #include #include -#include -#include #include #include @@ -79,19 +77,6 @@ } } - //TODO: Remove as soon as KTp sources are released with the new plugin system - const KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource")); - for (const KService::Ptr &service : servicesList) { - BasePersonsDataSource *dataSource = service->createInstance(nullptr); - - - if (dataSource) { - dataSourcePlugins[dataSource->sourcePluginId()] = dataSource; - } else { - qCWarning(KPEOPLE_LOG) << "Failed to create data source " << service->name() << service->entryPath(); - } - } - m_loadedDataSourcePlugins = true; } diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -28,7 +28,6 @@ KF5::WidgetsAddons KF5::PeopleBackend KF5::CoreAddons - KF5::Service ) set_target_properties (KF5PeopleWidgets PROPERTIES VERSION ${KPEOPLE_VERSION_STRING} SOVERSION ${KPEOPLE_SOVERSION} EXPORT_NAME PeopleWidgets) diff --git a/src/widgets/actions.cpp b/src/widgets/actions.cpp --- a/src/widgets/actions.cpp +++ b/src/widgets/actions.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include "../backends/abstractpersonaction.h" namespace KPeople @@ -47,18 +46,6 @@ } } - //TODO: Remove as soon as KTp sources are released with the new plugin system - const KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin")); - for (const KService::Ptr &service : personServicesList) { - AbstractPersonAction *plugin = service->createInstance(nullptr); - - - if (plugin) { -// qCDebug(KPEOPLE_WIDGETS_LOG) << "found plugin" << service->name(); - actionPlugins << plugin; - } - } - return actionPlugins; } diff --git a/src/widgets/persondetailsview.cpp b/src/widgets/persondetailsview.cpp --- a/src/widgets/persondetailsview.cpp +++ b/src/widgets/persondetailsview.cpp @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include "abstractfieldwidgetfactory.h" #include "plugins/emaildetailswidget.h" #include "global.h" @@ -142,18 +140,6 @@ } } - //TODO: Remove as soon as KTp sources are released with the new plugin system - KService::List pluginList = KServiceTypeTrader::self()->query(QStringLiteral("KPeopleWidgets/Plugin")); - const QList plugins = KPluginInfo::fromServices(pluginList); - - for (const KPluginInfo &p : plugins) { - QString error; - AbstractFieldWidgetFactory *f = p.service()->createInstance(this, QVariantList(), &error); - if (f) { - d->m_plugins << f; - } - } - //TODO Sort plugins }