diff --git a/scripting/scripting.cpp b/scripting/scripting.cpp index 180991b13e..c6b6d8ebb7 100644 --- a/scripting/scripting.cpp +++ b/scripting/scripting.cpp @@ -51,15 +51,14 @@ QScriptValue kwinScriptPrint(QScriptContext *context, QScriptEngine *engine) } -KWin::Script::Script(int scriptId, QString scriptName, QDir dir, QObject *parent) +KWin::Script::Script(int scriptId, QString scriptName, QObject *parent) : QObject(parent) , m_scriptId(scriptId) , m_engine(new QScriptEngine(this)) - , m_scriptDir(dir) , m_workspace(new WorkspaceWrapper(m_engine)) , m_running(false) { - m_scriptFile.setFileName(dir.filePath(scriptName)); + m_scriptFile.setFileName(scriptName); QDBusConnection::sessionBus().registerObject('/' + QString::number(m_scriptId), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportScriptableInvokables); } @@ -178,7 +177,7 @@ void KWin::Scripting::scriptDestroyed(QObject *object) int KWin::Scripting::loadScript(const QString &filePath) { const int id = scripts.size(); - KWin::Script *script = new KWin::Script(id, filePath, scriptsDir, this); + KWin::Script *script = new KWin::Script(id, filePath, this); connect(script, SIGNAL(destroyed(QObject*)), SLOT(scriptDestroyed(QObject*))); scripts.append(script); return id; diff --git a/scripting/scripting.h b/scripting/scripting.h index f716ae6059..e9e91e8c5f 100644 --- a/scripting/scripting.h +++ b/scripting/scripting.h @@ -22,7 +22,8 @@ along with this program. If not, see . #ifndef KWIN_SCRIPTING_H #define KWIN_SCRIPTING_H -#include +#include +#include class QScriptEngine; class QScriptValue; @@ -37,7 +38,7 @@ class Script : public QObject Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Scripting") public: - Script(int id, QString scriptName, QDir dir, QObject *parent = NULL); + Script(int id, QString scriptName, QObject *parent = NULL); virtual ~Script(); QString fileName() const { return m_scriptFile.fileName(); @@ -63,7 +64,6 @@ private slots: private: int m_scriptId; QScriptEngine *m_engine; - QDir m_scriptDir; QFile m_scriptFile; WorkspaceWrapper *m_workspace; bool m_running; @@ -78,7 +78,6 @@ class Scripting : public QObject Q_CLASSINFO("D-Bus Interface", "org.kde.kwin.Scripting") private: QStringList scriptList; - QDir scriptsDir; QList scripts; // Preferably call ONLY at load time