diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:22:59 (GMT) |
| commit | 9093368f33ddc422047103a89effcd40338b4dbc (patch) | |
| tree | 78c9660b403214de7ba793c9b06bbb0b65cd5eac /src/script/qscriptengine.cpp | |
| parent | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (diff) | |
| parent | 1af6fc12def29e3f44dd7fcf5635c688902f29c8 (diff) | |
| download | Qt-9093368f33ddc422047103a89effcd40338b4dbc.zip Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.gz Qt-9093368f33ddc422047103a89effcd40338b4dbc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/script/qscriptengine.cpp')
| -rw-r--r-- | src/script/qscriptengine.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/script/qscriptengine.cpp b/src/script/qscriptengine.cpp index 07fed70..c8e19dd 100644 --- a/src/script/qscriptengine.cpp +++ b/src/script/qscriptengine.cpp @@ -1774,10 +1774,8 @@ QScriptValue QScriptEngine::objectById(qint64 id) const Constructs a new QScriptSyntaxCheckResult from the \a other result. */ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResult &other) - : d_ptr(other.d_ptr.data()) + : d_ptr(other.d_ptr) { - if (d_ptr) - d_ptr->ref.ref(); } /*! @@ -1786,8 +1784,6 @@ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResul QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d) : d_ptr(d) { - if (d_ptr) - d_ptr->ref.ref(); } /*! @@ -1856,7 +1852,7 @@ QString QScriptSyntaxCheckResult::errorMessage() const */ QScriptSyntaxCheckResult &QScriptSyntaxCheckResult::operator=(const QScriptSyntaxCheckResult &other) { - d_ptr.assign(other.d_ptr.data()); + d_ptr = other.d_ptr; return *this; } |