scriptedeffect.cpp		scriptedeffect.cpp
	skipping to change at line 171		skipping to change at line 171
	qCDebug(KWIN_SCRIPTING) << "X-Plasma-MainScript not set";		qCDebug(KWIN_SCRIPTING) << "X-Plasma-MainScript not set";
	return nullptr;		return nullptr;
	}		}
	const QString scriptFile = QStandardPaths::locate(QStandardPaths::Gener icDataLocation,		const QString scriptFile = QStandardPaths::locate(QStandardPaths::Gener icDataLocation,
	QLatin1String("kwin/e ffects/") + name + QLatin1String("/contents/") + scriptName);		QLatin1String("kwin/e ffects/") + name + QLatin1String("/contents/") + scriptName);
	if (scriptFile.isNull()) {		if (scriptFile.isNull()) {
	qCDebug(KWIN_SCRIPTING) << "Could not locate the effect script";		qCDebug(KWIN_SCRIPTING) << "Could not locate the effect script";
	return nullptr;		return nullptr;
	}		}
	return ScriptedEffect::create(name, scriptFile, effect.value(QStringLit eral("X-KDE-Ordering")).toInt(), effect.value(QStringLiteral("X-KWin-Exclus ive-Category")));		return ScriptedEffect::create(name, scriptFile, effect.value(QStringLit eral("X-KDE-Ordering"), 0), effect.value(QStringLiteral("X-KWin-Exclusive-C ategory")));
	}		}
	ScriptedEffect *ScriptedEffect::create(const QString &effectName, const QSt ring &pathToScript, int chainPosition, const QString &exclusiveCategory)		ScriptedEffect *ScriptedEffect::create(const QString &effectName, const QSt ring &pathToScript, int chainPosition, const QString &exclusiveCategory)
	{		{
	ScriptedEffect *effect = new ScriptedEffect();		ScriptedEffect *effect = new ScriptedEffect();
	effect->m_exclusiveCategory = exclusiveCategory;		effect->m_exclusiveCategory = exclusiveCategory;
	if (!effect->init(effectName, pathToScript)) {		if (!effect->init(effectName, pathToScript)) {
	delete effect;		delete effect;
	return nullptr;		return nullptr;
	}		}
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/