diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 11:55:17 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 12:56:41 +0200 |
commit | 00f6258fb64e6ebf0144d8a6e8fb1515a531b0e4 (patch) | |
tree | dcf0533fc87daa526486e3c48a383a783ba6eb91 /src | |
parent | 0beaed7384b93d2639c7b1968a90066bba4b9cc1 (diff) |
Adapt qxmlstream.g to older changes to qxmlstream_p.h
Change-Id: I35c0700ed29d756949b95c3a26fdf9f087b5ef1c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/corelib/serialization/qxmlstream.g | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index 503b0e547d..adc09a5ebe 100644 --- a/src/corelib/serialization/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g @@ -156,7 +156,7 @@ template <typename T> class QXmlStreamSimpleStack { T *data; int tos, cap; public: - inline QXmlStreamSimpleStack():data(0), tos(-1), cap(0){} + inline QXmlStreamSimpleStack():data(nullptr), tos(-1), cap(0){} inline ~QXmlStreamSimpleStack(){ if (data) free(data); } inline void reserve(int extraCapacity) { @@ -511,7 +511,7 @@ public: QString resolveUndeclaredEntity(const QString &name); void parseEntity(const QString &value); - QXmlStreamReaderPrivate *entityParser; + std::unique_ptr<QXmlStreamReaderPrivate> entityParser; bool scanAfterLangleBang(); bool scanPublicOrSystem(); |