diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2019-07-24 10:29:33 +0300 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2019-07-25 17:18:44 +0300 |
commit | ba5c8add2d194197a43aa4c0647ed2290d71ae99 (patch) | |
tree | 162154e637585b50a58226f71524a9a560a5b56d /src/qtwaylandscanner | |
parent | 08115accd9f57685fd2c4565063e5c395cc44daf (diff) |
QWaylandScanner: add trailing commas to enumerations and braced initialization
This is allowed since C++11, and K&R C, resp., and doing so simplifies
the code.
Change-Id: I4bf5bc50b46c6b811ec386b92bfb0a7529a32645
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/qtwaylandscanner')
-rw-r--r-- | src/qtwaylandscanner/qtwaylandscanner.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/qtwaylandscanner/qtwaylandscanner.cpp b/src/qtwaylandscanner/qtwaylandscanner.cpp index 02bb5701c..272c6abd2 100644 --- a/src/qtwaylandscanner/qtwaylandscanner.cpp +++ b/src/qtwaylandscanner/qtwaylandscanner.cpp @@ -368,9 +368,7 @@ void Scanner::printEnums(const QList<WaylandEnum> &enums) printf(" enum %s {\n", e.name.constData()); for (int i = 0; i < e.entries.size(); ++i) { const WaylandEnumEntry &entry = e.entries.at(i); - printf(" %s_%s = %s", e.name.constData(), entry.name.constData(), entry.value.constData()); - if (i < e.entries.size() - 1) - printf(","); + printf(" %s_%s = %s,", e.name.constData(), entry.name.constData(), entry.value.constData()); if (!entry.summary.isNull()) printf(" // %s", entry.summary.constData()); printf("\n"); @@ -1249,7 +1247,7 @@ bool Scanner::process() printf(" const struct %s_listener %s::m_%s_listener = {\n", interfaceName, interfaceName, interfaceName); for (int i = 0; i < interface.events.size(); ++i) { const WaylandEvent &e = interface.events.at(i); - printf(" %s::handle_%s%s\n", interfaceName, e.name.constData(), i < interface.events.size() - 1 ? "," : ""); + printf(" %s::handle_%s,\n", interfaceName, e.name.constData()); } printf(" };\n"); printf("\n"); |