diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-06-18 12:04:53 -0700 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-06-22 04:52:57 +0000 |
| commit | 3cf38290d9c459ecdbde9d6eb4dee09fc94f29a4 (patch) | |
| tree | 93bfeced3fb04a5a35e9c161d89c83f0f9eae165 /src/tools/moc/generator.cpp | |
| parent | 1e2d67152fe2c32112b721f68983eeb30825daee (diff) | |
moc: rename the "offsetsAndSize" member to "offsetsAndSizes"
It contains more than one size.
Drive-by drop the const from the structure, so it becomes properly
trivial (though there's disagreement, see[1]).
[1] https://conformance.godbolt.org/z/rK1xW669K
Pick-to: 6.2 6.3 6.4
Change-Id: Id0fb9ab0089845ee8843fffd16f9cc69ffd90aa4
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Diffstat (limited to 'src/tools/moc/generator.cpp')
| -rw-r--r-- | src/tools/moc/generator.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index ca62b99f06..9bcddd8670 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -220,7 +220,7 @@ void Generator::generateCode() // const int constCharArraySizeLimit = 65535; fprintf(out, "struct qt_meta_stringdata_%s_t {\n", qualifiedClassNameIdentifier.constData()); - fprintf(out, " const uint offsetsAndSize[%d];\n", int(strings.size()*2)); + fprintf(out, " uint offsetsAndSizes[%d];\n", int(strings.size() * 2)); { int stringDataLength = 0; int stringDataCounter = 0; @@ -523,7 +523,7 @@ void Generator::generateCode() fprintf(out, " QtPrivate::MetaObjectForType<%s>::value(),\n", purestSuperClass.constData()); else fprintf(out, " nullptr,\n"); - fprintf(out, " qt_meta_stringdata_%s.offsetsAndSize,\n" + fprintf(out, " qt_meta_stringdata_%s.offsetsAndSizes,\n" " qt_meta_data_%s,\n", qualifiedClassNameIdentifier.constData(), qualifiedClassNameIdentifier.constData()); if (hasStaticMetaCall) |