aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSami Shalayel <sami.shalayel@qt.io>2023-04-06 10:38:30 +0200
committerSami Shalayel <sami.shalayel@qt.io>2023-04-12 13:07:06 +0200
commit309545b6de220e590528c132c8d161c81e019edd (patch)
tree34fb7f937bb3171414e766352dc647a2ed0f2db1 /src
parent1c566c5124370fc46dd9d697eef5b0154c1df2da (diff)
Kill TypeArgument(List)
Remove the forward declarations of TypeArgument(List) and its uses. This amends e89a06753c772bd96b3299e03b2f7ad78ffc9fb9 that removed TypeArgument(List)'s definition while leaving its forward declarations and uses around. Change-Id: I1a3e27ce18611beaf84b7c59e01a622f9e7f2477 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r--src/qml/parser/qqmljs.g1
-rw-r--r--src/qml/parser/qqmljsastfwd_p.h1
-rw-r--r--src/qml/parser/qqmljsastvisitor_p.h6
-rw-r--r--src/qmldom/qqmldomastdumper.cpp6
-rw-r--r--src/qmldom/qqmldomreformatter.cpp2
5 files changed, 0 insertions, 16 deletions
diff --git a/src/qml/parser/qqmljs.g b/src/qml/parser/qqmljs.g
index 13c54d387b..bcede595a2 100644
--- a/src/qml/parser/qqmljs.g
+++ b/src/qml/parser/qqmljs.g
@@ -212,7 +212,6 @@ public:
AST::ExportClause *ExportClause;
AST::ExportDeclaration *ExportDeclaration;
AST::TypeAnnotation *TypeAnnotation;
- AST::TypeArgument *TypeArgument;
AST::Type *Type;
AST::UiProgram *UiProgram;
diff --git a/src/qml/parser/qqmljsastfwd_p.h b/src/qml/parser/qqmljsastfwd_p.h
index ab807386c2..c87f67c67e 100644
--- a/src/qml/parser/qqmljsastfwd_p.h
+++ b/src/qml/parser/qqmljsastfwd_p.h
@@ -122,7 +122,6 @@ class NestedExpression;
class ClassExpression;
class ClassDeclaration;
class ClassElementList;
-class TypeArgument;
class Type;
class TypeAnnotation;
diff --git a/src/qml/parser/qqmljsastvisitor_p.h b/src/qml/parser/qqmljsastvisitor_p.h
index b4ee47ef0d..97afd5c909 100644
--- a/src/qml/parser/qqmljsastvisitor_p.h
+++ b/src/qml/parser/qqmljsastvisitor_p.h
@@ -380,9 +380,6 @@ public:
virtual bool visit(Type *) = 0;
virtual void endVisit(Type *) = 0;
- virtual bool visit(TypeArgument *) = 0;
- virtual void endVisit(TypeArgument *) = 0;
-
virtual bool visit(TypeAnnotation *) = 0;
virtual void endVisit(TypeAnnotation *) = 0;
@@ -726,9 +723,6 @@ public:
bool visit(Type *) override { return true; }
void endVisit(Type *) override {}
- bool visit(TypeArgument *) override { return true; }
- void endVisit(TypeArgument *) override {}
-
bool visit(TypeAnnotation *) override { return true; }
void endVisit(TypeAnnotation *) override {}
};
diff --git a/src/qmldom/qqmldomastdumper.cpp b/src/qmldom/qqmldomastdumper.cpp
index 9ae88a6dc9..17344112ea 100644
--- a/src/qmldom/qqmldomastdumper.cpp
+++ b/src/qmldom/qqmldomastdumper.cpp
@@ -990,12 +990,6 @@ public:
}
void endVisit(AST::Type *) override { stop(u"Type"); }
- bool visit(AST::TypeArgument *) override {
- start(u"TypeArgument");
- return true;
- }
- void endVisit(AST::TypeArgument *) override { stop(u"TypeArgument"); }
-
bool visit(AST::TypeAnnotation *el) override {
start(QLatin1String("TypeAnnotation colonToken=%1")
.arg(loc(el->colonToken)));
diff --git a/src/qmldom/qqmldomreformatter.cpp b/src/qmldom/qqmldomreformatter.cpp
index b61ff34e29..1905e48d53 100644
--- a/src/qmldom/qqmldomreformatter.cpp
+++ b/src/qmldom/qqmldomreformatter.cpp
@@ -1066,7 +1066,6 @@ protected:
bool visit(ESModule *) override { return true; }
bool visit(DebuggerStatement *) override { return true; }
bool visit(Type *) override { return true; }
- bool visit(TypeArgument *) override { return true; }
bool visit(TypeAnnotation *) override { return true; }
// overridden to use BasicVisitor (and ensure warnings about new added AST)
@@ -1186,7 +1185,6 @@ protected:
void endVisit(ESModule *) override { }
void endVisit(DebuggerStatement *) override { }
void endVisit(Type *) override { }
- void endVisit(TypeArgument *) override { }
void endVisit(TypeAnnotation *) override { }
void throwRecursionDepthError() override