feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: fix order in BoundName

Browse Source 
constructor and field order should be consistent

Change-Id: If698fd66cf67ab54c4be1638f19d758a54e33d5f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Fawzi Mohamed
2021-07-20 11:48:55 +02:00
parent 2f13810633
commit 864c1da05b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/qmljs/parser/parser.patch
View File

@@ -334,12 +334,12 @@ index ba1f642629..e286571e2e 100644
SourceLocation majorToken; SourceLocation majorToken;
SourceLocation minorToken; SourceLocation minorToken;
}; };
@@ -880,14 +879,13 @@ struct QML_PARSER_EXPORT BoundName @@ -880,12 +879,11 @@ struct QML_PARSER_EXPORT BoundName
}; };
QString id; QString id;
- Type typeAnnotationType;
- TypeAnnotation *typeAnnotation; - TypeAnnotation *typeAnnotation;
- Type typeAnnotationType;
+ QTaggedPointer<TypeAnnotation, Type> typeAnnotation; + QTaggedPointer<TypeAnnotation, Type> typeAnnotation;
BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared) BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
- : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type) - : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)

2
src/libs/qmljs/parser/qmljsast_p.h
View File

@@ -880,8 +880,8 @@ struct QML_PARSER_EXPORT BoundName
}; };
QString id; QString id;
Type typeAnnotationType;
TypeAnnotation *typeAnnotation; TypeAnnotation *typeAnnotation;
Type typeAnnotationType;
BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared) BoundName(const QString &id, TypeAnnotation *typeAnnotation, Type type = Declared)
: id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type) : id(id), typeAnnotation(typeAnnotation), typeAnnotationType(type)
{} {}