From e114e580e751b5deb19ab489a8b11f830ff6356f Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jun 2020 14:20:34 +0200 Subject: Use QList instead of QVector in other tools Task-number: QTBUG-84469 Change-Id: I90d0e2e723bb4d205d7bf333b21cdf583fdf4ea0 Reviewed-by: Lars Knoll --- src/tools/qvkgen/qvkgen.cpp | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/tools/qvkgen') diff --git a/src/tools/qvkgen/qvkgen.cpp b/src/tools/qvkgen/qvkgen.cpp index 4db3f26161..74137c8a63 100644 --- a/src/tools/qvkgen/qvkgen.cpp +++ b/src/tools/qvkgen/qvkgen.cpp @@ -45,11 +45,11 @@ public: struct Command { TypedName cmd; - QVector args; + QList args; bool deviceLevel; }; - QVector commands() const { return m_commands; } + QList commands() const { return m_commands; } void setFileName(const QString &fn) { m_fn = fn; } @@ -62,7 +62,7 @@ private: QFile m_file; QXmlStreamReader m_reader; - QVector m_commands; + QList m_commands; QString m_fn; }; @@ -262,7 +262,8 @@ QByteArray Preamble::get(const QString &fn) return m_str; } -bool genVulkanFunctionsH(const QVector &commands, const QString &licHeaderFn, const QString &outputBase) +bool genVulkanFunctionsH(const QList &commands, const QString &licHeaderFn, + const QString &outputBase) { QFile f(outputBase + QStringLiteral(".h")); if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -342,7 +343,8 @@ bool genVulkanFunctionsH(const QVector &commands, const Q return true; } -bool genVulkanFunctionsPH(const QVector &commands, const QString &licHeaderFn, const QString &outputBase) +bool genVulkanFunctionsPH(const QList &commands, const QString &licHeaderFn, + const QString &outputBase) { QFile f(outputBase + QStringLiteral("_p.h")); if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -401,7 +403,8 @@ bool genVulkanFunctionsPH(const QVector &commands, const return true; } -bool genVulkanFunctionsPC(const QVector &commands, const QString &licHeaderFn, const QString &outputBase) +bool genVulkanFunctionsPC(const QList &commands, const QString &licHeaderFn, + const QString &outputBase) { QFile f(outputBase + QStringLiteral("_p.cpp")); if (!f.open(QIODevice::WriteOnly | QIODevice::Text)) { @@ -499,7 +502,7 @@ int main(int argc, char **argv) if (!parser.parse()) return 1; - QVector commands = parser.commands(); + QList commands = parser.commands(); QStringList ignoredFuncs { QStringLiteral("vkCreateInstance"), QStringLiteral("vkDestroyInstance"), -- cgit v1.2.3