alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Port some few remaining uses of pluginInfo to pluginMetaData

Browse Source 
I forgot to do it in the previous RR.

REVIEW: 129100
This commit is contained in:
Aleix Pol Gonzalez 2016-10-10 16:31:07 +02:00 committed by Aleix Pol
parent 6b135f212c
commit 4a9d5cff2a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/containment.cpp
View File

@ -102,7 +102,7 @@ void Containment::init()
if (d->type == Types::NoContainmentType) {
//setContainmentType(Plasma::Types::DesktopContainment);
//Try to determine the containment type. It must be done as soon as possible
QString type = pluginInfo().property(QStringLiteral("X-Plasma-ContainmentType")).toString();
QString type = pluginMetaData().value(QStringLiteral("X-Plasma-ContainmentType"));
if (type == QLatin1String("Panel")) {
setContainmentType(Plasma::Types::PanelContainment);

2
src/plasmaquick/appletquickitem.cpp
View File

@ -403,7 +403,7 @@ AppletQuickItem::AppletQuickItem(Plasma::Applet *applet, QQuickItem *parent)
}
if (d->applet->pluginMetaData().isValid()) {
const QString rootPath = d->applet->pluginInfo().property(QStringLiteral("X-Plasma-RootPath")).toString();
const QString rootPath = d->applet->pluginMetaData().value(QStringLiteral("X-Plasma-RootPath"));
if (!rootPath.isEmpty()) {
d->qmlObject->setTranslationDomain(QLatin1String("plasma_applet_") + rootPath);
} else {

4
src/plasmaquick/configview.cpp
View File

@ -94,7 +94,7 @@ void ConfigViewPrivate::init()
KDeclarative::KDeclarative kdeclarative;
kdeclarative.setDeclarativeEngine(q->engine());
const QString rootPath = applet.data()->pluginInfo().property(QStringLiteral("X-Plasma-RootPath")).toString();
const QString rootPath = applet.data()->pluginMetaData().value(QStringLiteral("X-Plasma-RootPath"));
if (!rootPath.isEmpty()) {
kdeclarative.setTranslationDomain("plasma_applet_" + rootPath);
} else {
@ -143,7 +143,7 @@ void ConfigViewPrivate::init()
delete object;
}
const QStringList kcms = applet.data()->pluginInfo().property(QStringLiteral("X-Plasma-ConfigPlugins")).toStringList();
const QStringList kcms = KPluginMetaData::readStringList(applet.data()->pluginMetaData().rawData(), QStringLiteral("X-Plasma-ConfigPlugins"));
if (!kcms.isEmpty()) {
if (!configModel) {
configModel = new ConfigModel(q);