jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added function ScriptEnvironment::currentDir()

Browse source
This commit is contained in:
Micke Prag 2011-01-14 11:45:17 +00:00
parent 594a51acce
commit 30713febc2
2 changed files with 18 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
telldus-gui/TelldusCenter/scriptenvironment.cpp
View file

@ -63,6 +63,12 @@ ScriptEnvironment::~ScriptEnvironment() {
delete d;
}
QDir ScriptEnvironment::currentDir() const {
QScriptContextInfo info(d->scriptEngine.currentContext()->parentContext());
QFileInfo fileinfo(info.fileName());
return fileinfo.dir();
}
QScriptEngine *ScriptEnvironment::engine() const {
return &d->scriptEngine;
}
@ -77,9 +83,7 @@ void ScriptEnvironment::scriptException(const QScriptValue & exception) {
}
void ScriptEnvironment::include(const QString &filename) {
QScriptContextInfo info(d->scriptEngine.currentContext()->parentContext());
QFileInfo fileinfo(info.fileName());
QDir dir = fileinfo.dir();
QDir dir = this->currentDir();
QFile file(dir.filePath(filename));
file.open(QFile::ReadOnly);

2
telldus-gui/TelldusCenter/scriptenvironment.h
View file

@ -3,6 +3,7 @@
#include <QObject>
#include <QScriptValue>
#include <QDir>
class ScriptEnvironment : public QObject
{
@ -12,6 +13,7 @@ public:
~ScriptEnvironment();
QScriptEngine *engine() const;
QDir currentDir() const;
signals: