summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/preprocessor.cpp
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2025-07-29 13:58:54 +0200
committerMarc Mutz <marc.mutz@qt.io>2025-07-29 22:54:21 +0200
commita7bd2ab43cfb9792f611870e3ce74f046ddf4580 (patch)
treea1d49b965db187d2925f46ebd60b1f4af4d198bb /src/tools/moc/preprocessor.cpp
parentf86bf8b37f47cf0d5cb3183cc6d9533136580e5a (diff)
moc: pass Symbols by reference, not pointer
The very first line converts the pointer into a reference, so just pass that. Amends 0c9d1f99dac5c118d49e7f2b04f70eae3ba7b837. Pick-to: 6.10 6.9 6.8 6.5 Change-Id: I3e8c863996fb6f2d35533f216336459ae547ba57 Reviewed-by: Aurélien Brooke <aurelien@bahiasoft.fr> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/tools/moc/preprocessor.cpp')
-rw-r--r--src/tools/moc/preprocessor.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp
index 77c2c66ecdd..76bf08e332b 100644
--- a/src/tools/moc/preprocessor.cpp
+++ b/src/tools/moc/preprocessor.cpp
@@ -1003,9 +1003,8 @@ static QByteArray readOrMapFile(QFile *file)
return rawInput ? QByteArray::fromRawData(rawInput, size) : file->readAll();
}
-static void mergeStringLiterals(Symbols *_symbols)
+static void mergeStringLiterals(Symbols &symbols)
{
- Symbols &symbols = *_symbols;
for (Symbols::iterator i = symbols.begin(); i != symbols.end(); ++i) {
if (i->token == STRING_LITERAL) {
Symbols::Iterator mergeSymbol = i;
@@ -1299,7 +1298,7 @@ Symbols Preprocessor::preprocessed(const QByteArray &filename, QFile *file)
// and calculating an average when running moc over FOSS projects.
result.reserve(file->size() / 300000);
preprocess(filename, result);
- mergeStringLiterals(&result);
+ mergeStringLiterals(result);
#if 0
for (int j = 0; j < result.size(); ++j)