AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt qxmlstream.g to older changes to qxmlstream_p.h

Browse Source 
Change-Id: I35c0700ed29d756949b95c3a26fdf9f087b5ef1c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Marc Mutz 2020-05-10 11:55:17 +02:00
parent 0beaed7384
commit 00f6258fb6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/serialization/qxmlstream.g
View File

@ -156,7 +156,7 @@ template <typename T> class QXmlStreamSimpleStack {
T *data; T *data;
int tos, cap; int tos, cap;
public: public:
inline QXmlStreamSimpleStack():data(0), tos(-1), cap(0){} inline QXmlStreamSimpleStack():data(nullptr), tos(-1), cap(0){}
inline ~QXmlStreamSimpleStack(){ if (data) free(data); } inline ~QXmlStreamSimpleStack(){ if (data) free(data); }
inline void reserve(int extraCapacity) { inline void reserve(int extraCapacity) {
@ -511,7 +511,7 @@ public:
QString resolveUndeclaredEntity(const QString &name); QString resolveUndeclaredEntity(const QString &name);
void parseEntity(const QString &value); void parseEntity(const QString &value);
QXmlStreamReaderPrivate *entityParser; std::unique_ptr<QXmlStreamReaderPrivate> entityParser;
bool scanAfterLangleBang(); bool scanAfterLangleBang();
bool scanPublicOrSystem(); bool scanPublicOrSystem();