diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 14:10:12 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-06-22 16:46:08 +0200 |
commit | 670c5bd140b86a8b589595cb6cae62ae4e24cb2d (patch) | |
tree | 637ec5f823f11c12345f067053a6501babdc0699 /src/tools/moc/moc.cpp | |
parent | 95a5cd71b626b24556116f8539bf79bcf8baf4cd (diff) |
Use QList instead of QVector in moc
Task-number: QTBUG-84469
Change-Id: Id95a656e6277a7c348c02c3267a45ac176c1643b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r-- | src/tools/moc/moc.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 20ff739121..5a1f0afab6 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -607,7 +607,7 @@ bool Moc::parseMaybeQProperty(ClassDef *def) void Moc::parse() { - QVector<NamespaceDef> namespaceList; + QList<NamespaceDef> namespaceList; bool templateClass = false; while (hasNext()) { Token t = next(); @@ -1008,7 +1008,7 @@ void Moc::parse() } } -static bool any_type_contains(const QVector<PropertyDef> &properties, const QByteArray &pattern) +static bool any_type_contains(const QList<PropertyDef> &properties, const QByteArray &pattern) { for (const auto &p : properties) { if (p.type.contains(pattern)) @@ -1017,7 +1017,7 @@ static bool any_type_contains(const QVector<PropertyDef> &properties, const QByt return false; } -static bool any_arg_contains(const QVector<FunctionDef> &functions, const QByteArray &pattern) +static bool any_arg_contains(const QList<FunctionDef> &functions, const QByteArray &pattern) { for (const auto &f : functions) { for (const auto &arg : f.arguments) { @@ -1042,7 +1042,7 @@ static QByteArrayList make_candidates() return result; } -static QByteArrayList requiredQtContainers(const QVector<ClassDef> &classes) +static QByteArrayList requiredQtContainers(const QList<ClassDef> &classes) { static const QByteArrayList candidates = make_candidates(); @@ -1608,7 +1608,7 @@ void Moc::parseInterfaces(ClassDef *def) { next(LPAREN); while (test(IDENTIFIER)) { - QVector<ClassDef::Interface> iface; + QList<ClassDef::Interface> iface; iface += ClassDef::Interface(lexem()); while (test(SCOPE)) { iface.last().className += lexem(); @@ -1966,7 +1966,7 @@ QJsonObject ClassDef::toJson() const if (classInfos.size()) cls[QLatin1String("classInfos")] = classInfos; - const auto appendFunctions = [&cls](const QString &type, const QVector<FunctionDef> &funcs) { + const auto appendFunctions = [&cls](const QString &type, const QList<FunctionDef> &funcs) { QJsonArray jsonFuncs; for (const FunctionDef &fdef: funcs) @@ -2017,7 +2017,7 @@ QJsonObject ClassDef::toJson() const cls[QLatin1String("enums")] = enums; QJsonArray ifaces; - for (const QVector<Interface> &ifaceList: interfaceList) { + for (const QList<Interface> &ifaceList : interfaceList) { QJsonArray jsonList; for (const Interface &iface: ifaceList) { QJsonObject ifaceJson; |