diff --git a/applets/systemtray/systemtray.h b/applets/systemtray/systemtray.h --- a/applets/systemtray/systemtray.h +++ b/applets/systemtray/systemtray.h @@ -115,7 +115,7 @@ private: void initDBusActivatables(); QStringList m_defaultPlasmoids; - QHash m_systrayApplets; + QHash m_systrayApplets; QHash m_dbusActivatableTasks; QStringList m_allowedPlasmoids; diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp --- a/applets/systemtray/systemtray.cpp +++ b/applets/systemtray/systemtray.cpp @@ -77,7 +77,7 @@ if (!info.isValid() || info.value(QStringLiteral("X-Plasma-NotificationArea")) != "true") { continue; } - m_systrayApplets[info.pluginId()] = KPluginInfo(info); + m_systrayApplets[info.pluginId()] = info; if (info.isEnabledByDefault()) { m_defaultPlasmoids += info.pluginId(); @@ -396,21 +396,21 @@ QStringList ownApplets; - QMap sortedApplets; + QMap sortedApplets; for (auto it = m_systrayApplets.constBegin(); it != m_systrayApplets.constEnd(); ++it) { - const KPluginInfo &info = it.value(); - if (m_allowedPlasmoids.contains(info.pluginName()) && ! - m_dbusActivatableTasks.contains(info.pluginName())) { + const KPluginMetaData &info = it.value(); + if (m_allowedPlasmoids.contains(info.pluginId()) && ! + m_dbusActivatableTasks.contains(info.pluginId())) { //FIXME // if we already have a plugin with this exact name in it, then check if it is the // same plugin and skip it if it is indeed already listed if (sortedApplets.contains(info.name())) { bool dupe = false; // it is possible (though poor form) to have multiple applets // with the same visible name but different plugins, so we hve to check all values const auto infos = sortedApplets.values(info.name()); - for (const KPluginInfo &existingInfo : infos) { - if (existingInfo.pluginName() == info.pluginName()) { + for (const KPluginMetaData &existingInfo : infos) { + if (existingInfo.pluginId() == info.pluginId()) { dupe = true; break; } @@ -427,10 +427,10 @@ } } - for (const KPluginInfo &info : qAsConst(sortedApplets)) { + for (const KPluginMetaData &info : qAsConst(sortedApplets)) { qCDebug(SYSTEM_TRAY) << " Adding applet: " << info.name(); - if (m_allowedPlasmoids.contains(info.pluginName())) { - newTask(info.pluginName()); + if (m_allowedPlasmoids.contains(info.pluginId())) { + newTask(info.pluginId()); } } @@ -447,15 +447,15 @@ if (!m_availablePlasmoidsModel) { m_availablePlasmoidsModel = new PlasmoidModel(this); - for (const KPluginInfo &info : qAsConst(m_systrayApplets)) { + for (const KPluginMetaData &info : qAsConst(m_systrayApplets)) { QString name = info.name(); - const QString dbusactivation = info.property(QStringLiteral("X-Plasma-DBusActivationService")).toString(); + const QString dbusactivation = info.rawData().value(QStringLiteral("X-Plasma-DBusActivationService")).toString(); if (!dbusactivation.isEmpty()) { name += i18n(" (Automatic load)"); } - QStandardItem *item = new QStandardItem(QIcon::fromTheme(info.icon()), name); - item->setData(info.pluginName()); + QStandardItem *item = new QStandardItem(QIcon::fromTheme(info.iconName()), name); + item->setData(info.pluginId()); m_availablePlasmoidsModel->appendRow(item); } m_availablePlasmoidsModel->sort(0 /*column*/);