diff options
author | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
---|---|---|
committer | Janne Koskinen <janne.p.koskinen@digia.com> | 2009-06-15 15:08:43 (GMT) |
commit | 7a42405649aeea3e709231464d450b5da521e5cb (patch) | |
tree | c8a0bc351478ee24a29e2a436fe498213598a5ae /src/scripttools/debugging/qscriptdebuggerevent.cpp | |
parent | ba1491c5942239f9e0f3f283114f9ed91f43f02b (diff) | |
parent | 08ae7ee1fb930e7d4b4039e2294cba69f9380964 (diff) | |
download | Qt-7a42405649aeea3e709231464d450b5da521e5cb.zip Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.gz Qt-7a42405649aeea3e709231464d450b5da521e5cb.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
src/corelib/tools/qringbuffer_p.h
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggerevent.cpp')
-rw-r--r-- | src/scripttools/debugging/qscriptdebuggerevent.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/scripttools/debugging/qscriptdebuggerevent.cpp b/src/scripttools/debugging/qscriptdebuggerevent.cpp index 9d971a9..418e8fa 100644 --- a/src/scripttools/debugging/qscriptdebuggerevent.cpp +++ b/src/scripttools/debugging/qscriptdebuggerevent.cpp @@ -97,7 +97,6 @@ QScriptDebuggerEvent::QScriptDebuggerEvent(const QScriptDebuggerEvent &other) QScriptDebuggerEvent::~QScriptDebuggerEvent() { - delete d_ptr; } QScriptDebuggerEvent &QScriptDebuggerEvent::operator=(const QScriptDebuggerEvent &other) @@ -276,7 +275,7 @@ bool QScriptDebuggerEvent::operator!=(const QScriptDebuggerEvent &other) const */ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event) { - const QScriptDebuggerEventPrivate *d = event.d_ptr; + const QScriptDebuggerEventPrivate *d = event.d_ptr.data(); out << (quint32)d->type; out << (qint32)d->attributes.size(); QHash<QScriptDebuggerEvent::Attribute, QVariant>::const_iterator it; @@ -296,7 +295,7 @@ QDataStream &operator<<(QDataStream &out, const QScriptDebuggerEvent &event) */ QDataStream &operator>>(QDataStream &in, QScriptDebuggerEvent &event) { - QScriptDebuggerEventPrivate *d = event.d_ptr; + QScriptDebuggerEventPrivate *d = event.d_ptr.data(); quint32 type; in >> type; |