diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:12:40 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 09:12:40 (GMT) |
| commit | 9871170a484acb9b4be5187b027e6f07fef58892 (patch) | |
| tree | 171c971c166375d8fc8bccdebf4d4325c5064f17 /src/script/api/qscriptengine.cpp | |
| parent | 49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (diff) | |
| parent | 38e0c07a78fb585e23c4ff8947be737a28b2257c (diff) | |
| download | Qt-9871170a484acb9b4be5187b027e6f07fef58892.zip Qt-9871170a484acb9b4be5187b027e6f07fef58892.tar.gz Qt-9871170a484acb9b4be5187b027e6f07fef58892.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 6fde08f..131fe28 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -634,7 +634,7 @@ JSC::JSValue JSC_HOST_CALL functionPrint(JSC::ExecState* exec, JSC::JSObject*, J } if (exec->hadException()) return exec->exception(); - qDebug(qPrintable(result)); + qDebug("%s", qPrintable(result)); return JSC::jsUndefined(); } @@ -3744,8 +3744,6 @@ QScriptValue QScriptEngine::objectById(qint64 id) const QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResult &other) : d_ptr(other.d_ptr) { - if (d_ptr) - d_ptr->ref.ref(); } /*! @@ -3754,8 +3752,6 @@ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(const QScriptSyntaxCheckResul QScriptSyntaxCheckResult::QScriptSyntaxCheckResult(QScriptSyntaxCheckResultPrivate *d) : d_ptr(d) { - if (d_ptr) - d_ptr->ref.ref(); } /*! @@ -3771,10 +3767,6 @@ QScriptSyntaxCheckResult::QScriptSyntaxCheckResult() */ QScriptSyntaxCheckResult::~QScriptSyntaxCheckResult() { - if (d_ptr && !d_ptr->ref.deref()) { - delete d_ptr; - d_ptr = 0; - } } /*! @@ -3836,15 +3828,7 @@ QString QScriptSyntaxCheckResult::errorMessage() const */ QScriptSyntaxCheckResult &QScriptSyntaxCheckResult::operator=(const QScriptSyntaxCheckResult &other) { - if (d_ptr == other.d_ptr) - return *this; - if (d_ptr && !d_ptr->ref.deref()) { - delete d_ptr; - d_ptr = 0; - } d_ptr = other.d_ptr; - if (d_ptr) - d_ptr->ref.ref(); return *this; } |