1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QWaylandScanner: add trailing commas to enumerations and braced initialization

Browse Source 
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>
This commit is contained in:
Marc Mutz 2019-07-24 10:29:33 +03:00
parent 4572d96714
commit eb4198edf1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qtwaylandscanner/qtwaylandscanner.cpp
View File

@ -368,9 +368,7 @@ void Scanner::printEnums(const QList<WaylandEnum> &enums)
printf(" enum %s {\n", e.name.constData()); printf(" enum %s {\n", e.name.constData());
for (int i = 0; i < e.entries.size(); ++i) { for (int i = 0; i < e.entries.size(); ++i) {
const WaylandEnumEntry &entry = e.entries.at(i); const WaylandEnumEntry &entry = e.entries.at(i);
printf(" %s_%s = %s", e.name.constData(), entry.name.constData(), entry.value.constData()); printf(" %s_%s = %s,", e.name.constData(), entry.name.constData(), entry.value.constData());
if (i < e.entries.size() - 1)
printf(",");
if (!entry.summary.isNull()) if (!entry.summary.isNull())
printf(" // %s", entry.summary.constData()); printf(" // %s", entry.summary.constData());
printf("\n"); printf("\n");
@ -1249,7 +1247,7 @@ bool Scanner::process()
printf(" const struct %s_listener %s::m_%s_listener = {\n", interfaceName, interfaceName, interfaceName); printf(" const struct %s_listener %s::m_%s_listener = {\n", interfaceName, interfaceName, interfaceName);
for (int i = 0; i < interface.events.size(); ++i) { for (int i = 0; i < interface.events.size(); ++i) {
const WaylandEvent &e = interface.events.at(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");
printf("\n"); printf("\n");