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

remove defaultLayoutScripts

Browse Source 
this path is now taken from the corona package
This commit is contained in:
Marco Martin 2013-03-13 13:07:14 +01:00
parent c82ff42e76
commit 1a6e9cd85d
2 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/shell/scripting/scriptengine.cpp
View File

@ -684,56 +684,6 @@ QStringList ScriptEngine::pendingUpdateScripts()
return scriptPaths;
}
QStringList ScriptEngine::defaultLayoutScripts()
{
const QString appName = KGlobal::activeComponent().aboutData()->appName();
QStringList appNameDirs = KGlobal::dirs()->findDirs("data", appName);
QStringList scripts;
QDir appDir;
QFileInfoList scriptList;
foreach (const QString &appNameDir, appNameDirs) {
appDir.setPath(appNameDir + QLatin1String("init/"));
if (appDir.exists()) {
scriptList = appDir.entryInfoList(QStringList("*.js"),
QDir::NoFilter,
QDir::Name);
foreach (const QFileInfo &script, scriptList) {
if (script.exists()) {
scripts.append(script.absoluteFilePath());
}
}
}
}
QStringList scriptPaths;
if (scripts.isEmpty()) {
//kDebug() << "no javascript based layouts";
return scriptPaths;
}
const QString localDir = KGlobal::dirs()->localkdedir();
const QString localXdgDir = KGlobal::dirs()->localxdgdatadir();
QSet<QString> scriptNames;
foreach (const QString &script, scripts) {
if (script.startsWith(localDir) || script.startsWith(localXdgDir)) {
kDebug() << "skipping user local script: " << script;
continue;
}
QFileInfo f(script);
QString filename = f.fileName();
if (!scriptNames.contains(filename)) {
scriptNames.insert(filename);
scriptPaths.append(script);
}
}
return scriptPaths;
}
}
#include "scriptengine.moc"

3
src/shell/scripting/scriptengine.h
View File

@ -44,7 +44,6 @@ public:
~ScriptEngine();
static QStringList pendingUpdateScripts();
static QStringList defaultLayoutScripts();
Plasma::Corona *corona() const;
bool evaluateScript(const QString &script, const QString &path = QString());
@ -93,7 +92,7 @@ private:
QScriptValue m_scriptSelf;
};
static const int PLASMA_DESKTOP_SCRIPTING_VERSION = 5;
static const int PLASMA_DESKTOP_SCRIPTING_VERSION = 6;
}
#endif