Port away from deprecated KSycoca signal

The checks can be safely dropped, because in KService a hardcoded
list is used as the parameter.
wilder-5.24
Alexander Lohnau 4 years ago
parent af10fcdaa9
commit f80a43f24f
  1. 16
      dataengines/weather/weatherengine.cpp
  2. 2
      dataengines/weather/weatherengine.h
  3. 9
      libtaskmanager/launchertasksmodel.cpp
  4. 9
      libtaskmanager/xwindowtasksmodel.cpp

@ -28,7 +28,7 @@ WeatherEngine::WeatherEngine(QObject *parent, const QVariantList &args)
connect(&m_networkConfigurationManager, &QNetworkConfigurationManager::onlineStateChanged, this, &WeatherEngine::onOnlineStateChanged);
// Get the list of available plugins but don't load them
connect(KSycoca::self(), static_cast<void (KSycoca::*)(const QStringList &)>(&KSycoca::databaseChanged), this, &WeatherEngine::updateIonList);
connect(KSycoca::self(), static_cast<void (KSycoca::*)()>(&KSycoca::databaseChanged), this, &WeatherEngine::updateIonList);
updateIonList();
}
@ -40,15 +40,13 @@ WeatherEngine::~WeatherEngine()
/* FIXME: Q_PROPERTY functions to update the list of available plugins */
void WeatherEngine::updateIonList(const QStringList &changedResources)
void WeatherEngine::updateIonList()
{
if (changedResources.isEmpty() || changedResources.contains(QLatin1String("services"))) {
removeAllData(QStringLiteral("ions"));
const auto infos = Plasma::PluginLoader::self()->listDataEngineMetaData(QStringLiteral("weatherengine"));
for (const KPluginMetaData &info : infos) {
const QString data = info.name() + QLatin1Char('|') + info.pluginId();
setData(QStringLiteral("ions"), info.pluginId(), data);
}
removeAllData(QStringLiteral("ions"));
const auto infos = Plasma::PluginLoader::self()->listDataEngineMetaData(QStringLiteral("weatherengine"));
for (const KPluginMetaData &info : infos) {
const QString data = info.name() + QLatin1Char('|') + info.pluginId();
setData(QStringLiteral("ions"), info.pluginId(), data);
}
}

@ -91,7 +91,7 @@ private Q_SLOTS:
/**
* updates the list of ions whenever KSycoca changes (as well as on init
*/
void updateIonList(const QStringList &changedResources = QStringList());
void updateIonList();
private:
/**

@ -103,12 +103,9 @@ void LauncherTasksModel::Private::init()
AbstractTasksModel::LauncherUrlWithoutIcon});
});
void (KSycoca::*myDatabaseChangeSignal)(const QStringList &) = &KSycoca::databaseChanged;
QObject::connect(KSycoca::self(), myDatabaseChangeSignal, q, [this](const QStringList &changedResources) {
if (changedResources.contains(QLatin1String("services")) || changedResources.contains(QLatin1String("apps"))
|| changedResources.contains(QLatin1String("xdgdata-apps"))) {
sycocaChangeTimer.start();
}
void (KSycoca::*myDatabaseChangeSignal)() = &KSycoca::databaseChanged;
QObject::connect(KSycoca::self(), myDatabaseChangeSignal, q, [this]() {
sycocaChangeTimer.start();
});
}

@ -121,12 +121,9 @@ void XWindowTasksModel::Private::init()
QObject::connect(&sycocaChangeTimer, &QTimer::timeout, q, clearCacheAndRefresh);
void (KSycoca::*myDatabaseChangeSignal)(const QStringList &) = &KSycoca::databaseChanged;
QObject::connect(KSycoca::self(), myDatabaseChangeSignal, q, [this](const QStringList &changedResources) {
if (changedResources.contains(QLatin1String("services")) || changedResources.contains(QLatin1String("apps"))
|| changedResources.contains(QLatin1String("xdgdata-apps"))) {
sycocaChangeTimer.start();
}
void (KSycoca::*myDatabaseChangeSignal)() = &KSycoca::databaseChanged;
QObject::connect(KSycoca::self(), myDatabaseChangeSignal, q, [this]() {
sycocaChangeTimer.start();
});
rulesConfig = KSharedConfig::openConfig(QStringLiteral("taskmanagerrulesrc"));

Loading…
Cancel
Save