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

Properly guarding against a null applet

Browse Source 
- The code used applet and d->applet which pointed to the same thing
- Some places checked dereferening of applet, while the last one did not
This commit is contained in:
Ivan Čukić 2016-04-05 09:49:56 +02:00
parent cdeb168c53
commit 8d3ec9589c
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/plasmaquick/appletquickitem.cpp
View File

@ -388,29 +388,34 @@ AppletQuickItem::AppletQuickItem(Plasma::Applet *applet, QQuickItem *parent)
d(new AppletQuickItemPrivate(applet, this)) d(new AppletQuickItemPrivate(applet, this))
{ {
d->init(); d->init();
if (d->applet) { if (d->applet) {
d->appletPackage = d->applet->package(); d->appletPackage = d->applet->package();
}
if (d->applet && d->applet->containment() && d->applet->containment()->corona()) { if (d->applet->containment()) {
d->coronaPackage = d->applet->containment()->corona()->package(); if (d->applet->containment()->corona()) {
} d->coronaPackage = d->applet->containment()->corona()->package();
if (d->applet && d->applet->containment()) { }
d->containmentPackage = d->applet->containment()->package();
d->containmentPackage = d->applet->containment()->package();
}
if (d->applet->pluginInfo().isValid()) {
const QString rootPath = d->applet->pluginInfo().property(QStringLiteral("X-Plasma-RootPath")).toString();
if (!rootPath.isEmpty()) {
d->qmlObject->setTranslationDomain(QLatin1String("plasma_applet_") + rootPath);
} else {
d->qmlObject->setTranslationDomain(QLatin1String("plasma_applet_") + d->applet->pluginInfo().pluginName());
}
}
// set the graphicObject dynamic property on applet
d->applet->setProperty("_plasma_graphicObject", QVariant::fromValue(this));
} }
if (applet->pluginInfo().isValid()) {
const QString rootPath = applet->pluginInfo().property(QStringLiteral("X-Plasma-RootPath")).toString();
if (!rootPath.isEmpty()) {
d->qmlObject->setTranslationDomain(QLatin1String("plasma_applet_") + rootPath);
} else {
d->qmlObject->setTranslationDomain(QLatin1String("plasma_applet_") + applet->pluginInfo().pluginName());
}
}
d->qmlObject->setInitializationDelayed(true); d->qmlObject->setInitializationDelayed(true);
// set the graphicObject dynamic property on applet setProperty("_plasma_applet", QVariant::fromValue(d->applet));
d->applet->setProperty("_plasma_graphicObject", QVariant::fromValue(this));
setProperty("_plasma_applet", QVariant::fromValue(applet));
} }
AppletQuickItem::~AppletQuickItem() AppletQuickItem::~AppletQuickItem()