From 8eef978222109d1787d40323cd7d3f279a0f5aeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 5 Oct 2022 19:11:25 +0200 Subject: [PATCH] Protobuf: Drop indentation from initializer templates and move it into the code instead. Change-Id: Ia15606452cd9fc9afad4ff8d8709a4fde961354b Reviewed-by: Alexey Edelev --- src/tools/qtprotobufgen/messagedefinitionprinter.cpp | 2 ++ src/tools/qtprotobufgen/templates.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tools/qtprotobufgen/messagedefinitionprinter.cpp b/src/tools/qtprotobufgen/messagedefinitionprinter.cpp index 5edf0e45..5c9497e1 100644 --- a/src/tools/qtprotobufgen/messagedefinitionprinter.cpp +++ b/src/tools/qtprotobufgen/messagedefinitionprinter.cpp @@ -204,6 +204,7 @@ void MessageDefinitionPrinter::printConstructors() void MessageDefinitionPrinter::printInitializationList() { const auto numFields = m_descriptor->field_count(); + Indent(); for (int i = 0; i < numFields; ++i) { const FieldDescriptor *field = m_descriptor->field(i); auto propertyMap = common::producePropertyMap(field, m_descriptor); @@ -246,6 +247,7 @@ void MessageDefinitionPrinter::printInitializationList() } } } + Outdent(); } void MessageDefinitionPrinter::printCopyFunctionality() diff --git a/src/tools/qtprotobufgen/templates.cpp b/src/tools/qtprotobufgen/templates.cpp index d1e77522..f81734b7 100644 --- a/src/tools/qtprotobufgen/templates.cpp +++ b/src/tools/qtprotobufgen/templates.cpp @@ -589,11 +589,11 @@ const char *Templates::SemicolonBlockEnclosureTemplate() } const char *Templates::InitializerMemberTemplate() { - return " m_$property_name$($initializer$)"; + return "m_$property_name$($initializer$)"; } const char *Templates::InitializerMemberMessageTemplate() { - return " m_$property_name$(nullptr)"; + return "m_$property_name$(nullptr)"; } const char *Templates::EmptyBracesTemplate() {