diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-10-03 10:18:15 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2012-10-04 13:59:06 +0200 |
| commit | 3af5ecadcf63e77e665939354e8c2d3642173077 (patch) | |
| tree | c8483c1934ea0016469f02557c2734843f4e3d53 /src/lib/jsextensions | |
| parent | f9bfeeaf705160eda6afcce77a2b462aaec6c315 (diff) | |
| download | qbs-3af5ecadcf63e77e665939354e8c2d3642173077.tar.gz | |
fix API flaw in script extension init functions
When the extensionObject is passed as reference, we cannot do things like
File::init(context->activationObject())
Change-Id: I40b05b88cb9790322dd1a95bc28c1a51f520361b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/jsextensions')
| -rw-r--r-- | src/lib/jsextensions/file.cpp | 2 | ||||
| -rw-r--r-- | src/lib/jsextensions/file.h | 2 | ||||
| -rw-r--r-- | src/lib/jsextensions/process.cpp | 2 | ||||
| -rw-r--r-- | src/lib/jsextensions/process.h | 2 | ||||
| -rw-r--r-- | src/lib/jsextensions/textfile.cpp | 2 | ||||
| -rw-r--r-- | src/lib/jsextensions/textfile.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/jsextensions/file.cpp b/src/lib/jsextensions/file.cpp index 4d255f1e3..9e90e5a03 100644 --- a/src/lib/jsextensions/file.cpp +++ b/src/lib/jsextensions/file.cpp @@ -43,7 +43,7 @@ #include <QFileInfo> #include <QScriptEngine> -void File::init(QScriptValue &extensionObject) +void File::init(QScriptValue extensionObject) { QScriptEngine *engine = extensionObject.engine(); QScriptValue fileObj = engine->newQObject(new File, QScriptEngine::ScriptOwnership); diff --git a/src/lib/jsextensions/file.h b/src/lib/jsextensions/file.h index 9ae8ef4e8..7a32de8eb 100644 --- a/src/lib/jsextensions/file.h +++ b/src/lib/jsextensions/file.h @@ -47,7 +47,7 @@ class File : public QObject, public QScriptable { Q_OBJECT public: - static void init(QScriptValue &extensionObject); + static void init(QScriptValue extensionObject); private: static QScriptValue js_copy(QScriptContext *context, QScriptEngine *engine); diff --git a/src/lib/jsextensions/process.cpp b/src/lib/jsextensions/process.cpp index 70f72f91b..c67d91033 100644 --- a/src/lib/jsextensions/process.cpp +++ b/src/lib/jsextensions/process.cpp @@ -45,7 +45,7 @@ #include <QScriptValue> #include <QTextStream> -void Process::init(QScriptValue &extensionObject) +void Process::init(QScriptValue extensionObject) { QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&Process::staticMetaObject, engine->newFunction(&Process::ctor)); diff --git a/src/lib/jsextensions/process.h b/src/lib/jsextensions/process.h index 702dba302..d0ae61bbc 100644 --- a/src/lib/jsextensions/process.h +++ b/src/lib/jsextensions/process.h @@ -52,7 +52,7 @@ class Process : public QObject, public QScriptable { Q_OBJECT public: - static void init(QScriptValue &extensionObject); + static void init(QScriptValue extensionObject); static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine); Process(QScriptContext *context); diff --git a/src/lib/jsextensions/textfile.cpp b/src/lib/jsextensions/textfile.cpp index c31157c21..226a4a520 100644 --- a/src/lib/jsextensions/textfile.cpp +++ b/src/lib/jsextensions/textfile.cpp @@ -44,7 +44,7 @@ #include <QScriptValue> #include <QTextStream> -void TextFile::init(QScriptValue &extensionObject) +void TextFile::init(QScriptValue extensionObject) { QScriptEngine *engine = extensionObject.engine(); QScriptValue obj = engine->newQMetaObject(&TextFile::staticMetaObject, engine->newFunction(&TextFile::ctor)); diff --git a/src/lib/jsextensions/textfile.h b/src/lib/jsextensions/textfile.h index 711312d6b..39e2b2547 100644 --- a/src/lib/jsextensions/textfile.h +++ b/src/lib/jsextensions/textfile.h @@ -52,7 +52,7 @@ class TextFile : public QObject, public QScriptable Q_OBJECT Q_ENUMS(OpenMode) public: - static void init(QScriptValue &extensionObject); + static void init(QScriptValue extensionObject); enum OpenMode { ReadOnly, WriteOnly, ReadWrite }; static QScriptValue ctor(QScriptContext *context, QScriptEngine *engine); |
