From e4fd86d53af3e7a949752f5558c137bb1c8c5fa6 Mon Sep 17 00:00:00 2001 From: Ivan Tkachenko Date: Mon, 26 Jul 2021 04:17:35 +0300 Subject: Deduplicate offset calculation in QMetaObjectBuilder Not even an optimization (unless your compiler sucks). Just improves readability, since offset is already calculated few lines above. Offset formula used to be somewhat more complicated, but since commit e58b44d557b859b7b55869f1e137aa1bc8968307 it became reusable here. Change-Id: I4128b2643daf2cb112c9b861342fd0e27c9a1a95 Reviewed-by: Oswald Buddenhagen Reviewed-by: Lars Knoll --- src/corelib/kernel/qmetaobjectbuilder.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib/kernel/qmetaobjectbuilder.cpp') diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 8bcc6e398ac..1a95d7265f0 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -1119,7 +1119,7 @@ static void writeString(char *out, int i, const QByteArray &str, memcpy(out + 2 * i * sizeof(uint), &offsetLen, 2 * sizeof(uint)); memcpy(out + offset, str.constData(), size); - out[offsetOfStringdataMember + stringdataOffset + size] = '\0'; + out[offset + size] = '\0'; stringdataOffset += size + 1; } -- cgit v1.2.3