diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-05-08 12:31:23 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-08 15:13:42 +0200 |
commit | ba1a2a62c1a761d88912b79804bdf437c9a26aa7 (patch) | |
tree | c58bcfa03af442b79bf0ff95645b1efd25045866 /src/qml/qml/qqmljavascriptexpression_p.h | |
parent | c19c4f7687bafd61861ad6dc6f7f644c8e97a536 (diff) |
Convert qqmljavascriptexpression to use QV4::PersistentValue
Change-Id: Idd704b55be61dd78c59fffdf966fc8497af852d6
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index 0d3b7b9063..cfdb5b0e83 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -65,7 +65,7 @@ class QQmlDelayedError { public: inline QQmlDelayedError() : nextError(0), prevError(0) {} - inline ~QQmlDelayedError() { qPersistentDispose(m_message); removeError(); } + inline ~QQmlDelayedError() { removeError(); } bool addError(QQmlEnginePrivate *); @@ -77,9 +77,9 @@ public: prevError = 0; } - inline bool isValid() const { return !m_message.IsEmpty() || m_error.isValid(); } + inline bool isValid() const { return !!m_message || m_error.isValid(); } inline const QQmlError &error(QQmlEngine *engine) const { convertMessageToError(engine); return m_error; } - inline void clearError() { qPersistentDispose(m_message); m_error = QQmlError(); } + inline void clearError() { m_message.reset(); m_error = QQmlError(); } void setMessage(v8::Handle<v8::Message> message); void setErrorLocation(const QUrl &url, quint16 line, quint16 column); @@ -89,7 +89,7 @@ private: void convertMessageToError(QQmlEngine *engine) const; mutable QQmlError m_error; - mutable v8::Persistent<v8::Message> m_message; + mutable QExplicitlySharedDataPointer<v8::Message> m_message; QQmlDelayedError *nextError; QQmlDelayedError **prevError; |