Format the .proto files according to the clang-format rules

Pick-to: 6.6 6.5
Change-Id: Iedc563ab8689779960dc6a2cc0b5817a874374e0
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>

23 files changed, 147 insertions, 205 deletions

diff --git a/examples/grpc/chat/proto/simplechat.proto b/examples/grpc/chat/proto/simplechat.proto
index 96d7564..e4f9e2f 100644
--- a/examples/grpc/chat/proto/simplechat.proto
+++ b/examples/grpc/chat/proto/simplechat.proto
@@ -5,8 +5,7 @@ syntax = "proto3";
 //! [0]
 package qtgrpc.examples.chat;
 
-message ChatMessage
-{
+message ChatMessage {
     enum ContentType {
         Unknown = 0;
         Text = 1;
@@ -18,13 +17,11 @@ message ChatMessage
     string from = 4;
 }
 
-message ChatMessages
-{
+message ChatMessages {
     repeated ChatMessage messages = 1;
 }
 
-message User
-{
+message User {
     string name = 1;
     string password = 2;
 }
@@ -33,11 +30,10 @@ message Users {
     repeated User users = 1;
 }
 
-message None { }
+message None {}
 
-service SimpleChat
-{
-    rpc messageList(None) returns (stream ChatMessages) { }
-    rpc sendMessage(ChatMessage) returns (None) { }
+service SimpleChat {
+    rpc messageList(None) returns (stream ChatMessages) {}
+    rpc sendMessage(ChatMessage) returns (None) {}
 }
 //! [0]
diff --git a/examples/grpc/magic8ball/proto/exampleservice.proto b/examples/grpc/magic8ball/proto/exampleservice.proto
index 18cddf1..8cde40b 100644
--- a/examples/grpc/magic8ball/proto/exampleservice.proto
+++ b/examples/grpc/magic8ball/proto/exampleservice.proto
@@ -5,13 +5,13 @@ syntax = "proto3";
 package qtgrpc.examples;
 
 message AnswerRequest {
-  string message = 1;
+    string message = 1;
 }
 
 message AnswerResponse {
-  string message = 1;
+    string message = 1;
 }
 
 service ExampleService {
-  rpc answerMethod(AnswerRequest) returns (AnswerResponse) {}
+    rpc answerMethod(AnswerRequest) returns (AnswerResponse) {}
 }
diff --git a/examples/protobuf/sensors/sensors.proto b/examples/protobuf/sensors/sensors.proto
index cfb8b31..5cfa5f3 100644
--- a/examples/protobuf/sensors/sensors.proto
+++ b/examples/protobuf/sensors/sensors.proto
@@ -5,15 +5,13 @@ syntax = "proto3";
 //! [0]
 package qt.examples.sensors;
 
-message Coordinates
-{
+message Coordinates {
     double longitude = 1;
     double latitude = 2;
     double altitude = 3;
 }
 
-message Temperature
-{
+message Temperature {
     enum Unit {
         Farenheit = 0;
         Celsius = 1;
@@ -22,8 +20,7 @@ message Temperature
     Unit units = 2;
 }
 
-message WarningNotification
-{
+message WarningNotification {
     string text = 1;
 }
 //! [0]
diff --git a/examples/protobuf/sensors/tlv.proto b/examples/protobuf/sensors/tlv.proto
index 6d66569..e6c58bb 100644
--- a/examples/protobuf/sensors/tlv.proto
+++ b/examples/protobuf/sensors/tlv.proto
@@ -12,8 +12,7 @@ enum MessageType {
 }
 
 // Protobuf messages imply inline data size.
-message TlvMessage
-{
+message TlvMessage {
     MessageType type = 1;
     bytes value = 2;
 }
diff --git a/src/protobufqttypes/protobufqtguitypes/QtGui/QtGui.proto b/src/protobufqttypes/protobufqtguitypes/QtGui/QtGui.proto
index 8a83c26..f622ba4 100644
--- a/src/protobufqttypes/protobufqtguitypes/QtGui/QtGui.proto
+++ b/src/protobufqttypes/protobufqtguitypes/QtGui/QtGui.proto
@@ -12,7 +12,7 @@ message QRgba64 {
 message QColor {
     oneof color {
         QRgba64 rgba64 = 1;
-        uint32  rgba   = 2;
+        uint32 rgba = 2;
     }
 }
 
@@ -52,5 +52,5 @@ message QQuaternion {
 
 message QImage {
     bytes data = 1;
-    string format = 2; // see QImageWriter::supportedImageFormats()
+    string format = 2;  // see QImageWriter::supportedImageFormats()
 }
diff --git a/tests/auto/grpc/shared/proto/testservice.proto b/tests/auto/grpc/shared/proto/testservice.proto
index 914bcce..0268664 100644
--- a/tests/auto/grpc/shared/proto/testservice.proto
+++ b/tests/auto/grpc/shared/proto/testservice.proto
@@ -4,15 +4,14 @@ syntax = "proto3";
 
 package qtgrpc.tests;
 
-message Empty {
-}
+message Empty {}
 
 message SimpleStringMessage {
     string testFieldString = 6;
 }
 
 message SimpleIntMessage {
-    sint32 testField= 1;
+    sint32 testField = 1;
 }
 
 message BlobMessage {
diff --git a/tests/auto/protobuf/basic/proto/basicmessages.proto b/tests/auto/protobuf/basic/proto/basicmessages.proto
index 5f51dd1..6392f80 100644
--- a/tests/auto/protobuf/basic/proto/basicmessages.proto
+++ b/tests/auto/protobuf/basic/proto/basicmessages.proto
@@ -4,8 +4,7 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-message EmptyMessage {
-}
+message EmptyMessage {}
 
 message SimpleBoolMessage {
     bool testFieldBool = 1;
@@ -72,17 +71,14 @@ message ComplexMessage {
     SimpleStringMessage testComplexField = 2;
 }
 
-message OneofMessage
-{
+message OneofMessage {
     int32 testFieldInt = 1;
-    oneof testOneof
-    {
+    oneof testOneof {
         int32 testOneofFieldInt = 42;
         ComplexMessage testOneofComplexField = 3;
         ComplexMessage testOneofSecondComplexField = 4;
     }
-    oneof secondOneof
-    {
+    oneof secondOneof {
         int32 secondFieldInt = 43;
         ComplexMessage secondComplexField = 5;
         ComplexMessage secondSecondComplexField = 6;
diff --git a/tests/auto/protobuf/basic/proto/mapmessages.proto b/tests/auto/protobuf/basic/proto/mapmessages.proto
index 41d42de..1dbc853 100644
--- a/tests/auto/protobuf/basic/proto/mapmessages.proto
+++ b/tests/auto/protobuf/basic/proto/mapmessages.proto
@@ -6,8 +6,8 @@ import "basicmessages.proto";
 
 package qtprotobufnamespace.tests;
 
-//MAPS
-//Types to String
+// MAPS
+// Types to String
 message SimpleSInt32StringMapMessage {
     map<sint32, string> mapField = 1;
 }
@@ -52,7 +52,7 @@ message SimpleStringStringMapMessage {
     map<string, string> mapField = 13;
 }
 
-//Types to sint32
+// Types to sint32
 message SimpleSInt32SInt32MapMessage {
     map<sint32, sint32> mapField = 1;
 }
@@ -97,7 +97,7 @@ message SimpleStringSInt32MapMessage {
     map<string, sint32> mapField = 13;
 }
 
-//Types to sint64
+// Types to sint64
 message SimpleSInt32SInt64MapMessage {
     map<sint32, sint64> mapField = 1;
 }
@@ -142,7 +142,7 @@ message SimpleStringSInt64MapMessage {
     map<string, sint64> mapField = 13;
 }
 
-//Types to uint32
+// Types to uint32
 message SimpleSInt32UInt32MapMessage {
     map<sint32, uint32> mapField = 1;
 }
@@ -187,7 +187,7 @@ message SimpleStringUInt32MapMessage {
     map<string, uint32> mapField = 13;
 }
 
-//Types to uint64
+// Types to uint64
 message SimpleSInt32UInt64MapMessage {
     map<sint32, uint64> mapField = 1;
 }
@@ -232,7 +232,7 @@ message SimpleStringUInt64MapMessage {
     map<string, uint64> mapField = 13;
 }
 
-//Types to int32
+// Types to int32
 message SimpleSInt32Int32MapMessage {
     map<sint32, int32> mapField = 1;
 }
@@ -277,7 +277,7 @@ message SimpleStringInt32MapMessage {
     map<string, int32> mapField = 13;
 }
 
-//Types to int64
+// Types to int64
 message SimpleSInt32Int64MapMessage {
     map<sint32, int64> mapField = 1;
 }
@@ -322,7 +322,7 @@ message SimpleStringInt64MapMessage {
     map<string, int64> mapField = 13;
 }
 
-//Types to ComplexMessage
+// Types to ComplexMessage
 message SimpleSInt32ComplexMessageMapMessage {
     map<sint32, ComplexMessage> mapField = 1;
 }
diff --git a/tests/auto/protobuf/basic/proto/repeatednonpackedmessages.proto b/tests/auto/protobuf/basic/proto/repeatednonpackedmessages.proto
index 1cc4dfc..7b4ae8d 100644
--- a/tests/auto/protobuf/basic/proto/repeatednonpackedmessages.proto
+++ b/tests/auto/protobuf/basic/proto/repeatednonpackedmessages.proto
@@ -4,73 +4,59 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-message RepeatedNonPackedIntMessage
-{
-    repeated int32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedIntMessage {
+    repeated int32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSIntMessage
-{
-    repeated sint32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSIntMessage {
+    repeated sint32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedUIntMessage
-{
-    repeated uint32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedUIntMessage {
+    repeated uint32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedInt64Message
-{
-    repeated int64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedInt64Message {
+    repeated int64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSInt64Message
-{
-    repeated sint64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSInt64Message {
+    repeated sint64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedUInt64Message
-{
-    repeated uint64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedUInt64Message {
+    repeated uint64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedFixedIntMessage
-{
-    repeated fixed32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedFixedIntMessage {
+    repeated fixed32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSFixedIntMessage
-{
-    repeated sfixed32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSFixedIntMessage {
+    repeated sfixed32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedFixedInt64Message
-{
-    repeated fixed64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedFixedInt64Message {
+    repeated fixed64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSFixedInt64Message
-{
-    repeated sfixed64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSFixedInt64Message {
+    repeated sfixed64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedBoolMessage
-{
-    repeated bool testRepeatedBool = 1 [ packed = false ];
+message RepeatedNonPackedBoolMessage {
+    repeated bool testRepeatedBool = 1 [packed = false];
 }
 
-message RepeatedNonPackedDoubleMessage
-{
-    repeated double testRepeatedDouble = 1 [ packed = false ];
+message RepeatedNonPackedDoubleMessage {
+    repeated double testRepeatedDouble = 1 [packed = false];
 }
 
-message RepeatedNonPackedFloatMessage
-{
-    repeated float testRepeatedFloat = 1 [ packed = false ];
+message RepeatedNonPackedFloatMessage {
+    repeated float testRepeatedFloat = 1 [packed = false];
 }
 
-message NonPackedIntMessageWithExtraMember
-{
-    repeated int32 testRepeatedInt = 1 [ packed = false ];
+message NonPackedIntMessageWithExtraMember {
+    repeated int32 testRepeatedInt = 1 [packed = false];
     string extra = 2;
 }
diff --git a/tests/auto/protobuf/enums/enummessages.proto b/tests/auto/protobuf/enums/enummessages.proto
index 561fe89..619a0e8 100644
--- a/tests/auto/protobuf/enums/enummessages.proto
+++ b/tests/auto/protobuf/enums/enummessages.proto
@@ -5,29 +5,28 @@ syntax = "proto3";
 package qtprotobufnamespace.tests;
 
 message SimpleEnumMessage {
-  enum LocalEnum {
-    LOCAL_ENUM_VALUE0 = 0;
-    LOCAL_ENUM_VALUE1 = 1;
-    LOCAL_ENUM_VALUE2 = 2;
-    LOCAL_ENUM_VALUE3 = 3;
-  }
-
-  LocalEnum localEnum = 1;
+    enum LocalEnum {
+        LOCAL_ENUM_VALUE0 = 0;
+        LOCAL_ENUM_VALUE1 = 1;
+        LOCAL_ENUM_VALUE2 = 2;
+        LOCAL_ENUM_VALUE3 = 3;
+    }
+
+    LocalEnum localEnum = 1;
 }
 
 message RepeatedEnumMessage {
-  enum LocalEnum {
-    LOCAL_ENUM_VALUE0 = 0;
-    LOCAL_ENUM_VALUE1 = 1;
-    LOCAL_ENUM_VALUE2 = 2;
-    LOCAL_ENUM_VALUE3 = 3;
-  }
-
-  repeated LocalEnum localEnumList = 1;
+    enum LocalEnum {
+        LOCAL_ENUM_VALUE0 = 0;
+        LOCAL_ENUM_VALUE1 = 1;
+        LOCAL_ENUM_VALUE2 = 2;
+        LOCAL_ENUM_VALUE3 = 3;
+    }
+
+    repeated LocalEnum localEnumList = 1;
 }
 
-message MixedEnumUsageMessage
-{
+message MixedEnumUsageMessage {
     enum LocalEnum {
         LOCAL_ENUM_VALUE0 = 0;
         LOCAL_ENUM_VALUE1 = 1;
@@ -72,13 +71,13 @@ message MixedEnumUsageMessage
 }
 
 message SimpleFileEnumMessage {
-  TestEnum globalEnum = 1;
-  repeated TestEnum globalEnumList = 2;
+    TestEnum globalEnum = 1;
+    repeated TestEnum globalEnumList = 2;
 }
 
 message StepChildEnumMessage {
-  SimpleEnumMessage.LocalEnum localStepChildEnum = 1;
-  repeated SimpleEnumMessage.LocalEnum localStepChildList = 2;
+    SimpleEnumMessage.LocalEnum localStepChildEnum = 1;
+    repeated SimpleEnumMessage.LocalEnum localStepChildList = 2;
 }
 
 enum TestEnum {
diff --git a/tests/auto/protobuf/extranamespace/proto/extranamespace.proto b/tests/auto/protobuf/extranamespace/proto/extranamespace.proto
index 5909831..5ed63a8 100644
--- a/tests/auto/protobuf/extranamespace/proto/extranamespace.proto
+++ b/tests/auto/protobuf/extranamespace/proto/extranamespace.proto
@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 syntax = "proto3";
 
-package qtprotobufnamespace.tests; // Generated namespaces will be prepended with
-                                   // the extra namespace
-message EmptyMessage {
-}
+package qtprotobufnamespace.tests;  // Generated namespaces will be prepended with
+                                    // the extra namespace
+message EmptyMessage {}
 
 message SimpleStringMessage {
     string testFieldString = 6;
@@ -15,4 +14,3 @@ message ComplexMessage {
     int32 testFieldInt = 1;
     SimpleStringMessage testComplexField = 2;
 }
-
diff --git a/tests/auto/protobuf/recursive/recursive.proto b/tests/auto/protobuf/recursive/recursive.proto
index d63f4ae..656458c 100644
--- a/tests/auto/protobuf/recursive/recursive.proto
+++ b/tests/auto/protobuf/recursive/recursive.proto
@@ -4,8 +4,7 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-message RecursiveMessage
-{
+message RecursiveMessage {
     int32 testFieldInt = 1;
     RecursiveMessage testFieldRecursive = 2;
 }
diff --git a/tests/auto/protobuf/sequence/proto/sequence.proto b/tests/auto/protobuf/sequence/proto/sequence.proto
index 806cd86..0614141 100644
--- a/tests/auto/protobuf/sequence/proto/sequence.proto
+++ b/tests/auto/protobuf/sequence/proto/sequence.proto
@@ -43,4 +43,3 @@ message lowerCaseSequence {
 message lowerCaseSequence2 {
     bool testField = 1;
 }
-
diff --git a/tests/auto/shared/data/proto/additionalenums.proto b/tests/auto/shared/data/proto/additionalenums.proto
index 4d260f4..c44ef08 100644
--- a/tests/auto/shared/data/proto/additionalenums.proto
+++ b/tests/auto/shared/data/proto/additionalenums.proto
@@ -5,18 +5,17 @@ syntax = "proto3";
 package qtprotobufnamespace.tests.enums;
 
 message SimpleEnumMessage {
-  enum LocalEnum {
-    LOCAL_ENUM_VALUE0 = 0;
-    LOCAL_ENUM_VALUE1 = 1;
-    LOCAL_ENUM_VALUE2 = 2;
-    LOCAL_ENUM_VALUE3 = 3;
-  }
+    enum LocalEnum {
+        LOCAL_ENUM_VALUE0 = 0;
+        LOCAL_ENUM_VALUE1 = 1;
+        LOCAL_ENUM_VALUE2 = 2;
+        LOCAL_ENUM_VALUE3 = 3;
+    }
 
-  LocalEnum localEnum = 1;
+    LocalEnum localEnum = 1;
 }
 
-message MixedEnumUsageMessage
-{
+message MixedEnumUsageMessage {
     enum LocalEnum {
         LOCAL_ENUM_VALUE0 = 0;
         LOCAL_ENUM_VALUE1 = 1;
@@ -42,4 +41,3 @@ enum TestEnumSecondInFile {
     TEST_ENUM_SIF_VALUE1 = 1;
     TEST_ENUM_SIF_VALUE2 = 2;
 }
-
diff --git a/tests/auto/shared/data/proto/annotation.proto b/tests/auto/shared/data/proto/annotation.proto
index 3e7322a..8ad820e 100644
--- a/tests/auto/shared/data/proto/annotation.proto
+++ b/tests/auto/shared/data/proto/annotation.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-//test annotation
+// test annotation
 message AnnotatedMessage1 {
     /**
      * \brief Field annotation
@@ -73,6 +73,6 @@ message AnnotatedMessage8 {
  * test annotation secondline
  */
 message AnnotatedMessage9 {
-    //Field annotation
+    // Field annotation
     sint32 testField = 1;
 }
diff --git a/tests/auto/shared/data/proto/basicmessages.proto b/tests/auto/shared/data/proto/basicmessages.proto
index b73aa56..58baa0b 100644
--- a/tests/auto/shared/data/proto/basicmessages.proto
+++ b/tests/auto/shared/data/proto/basicmessages.proto
@@ -4,8 +4,7 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-message EmptyMessage {
-}
+message EmptyMessage {}
 
 message SimpleBoolMessage {
     bool testFieldBool = 1;
diff --git a/tests/auto/shared/data/proto/extranamespace.proto b/tests/auto/shared/data/proto/extranamespace.proto
index 5909831..5ed63a8 100644
--- a/tests/auto/shared/data/proto/extranamespace.proto
+++ b/tests/auto/shared/data/proto/extranamespace.proto
@@ -2,10 +2,9 @@
 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 syntax = "proto3";
 
-package qtprotobufnamespace.tests; // Generated namespaces will be prepended with
-                                   // the extra namespace
-message EmptyMessage {
-}
+package qtprotobufnamespace.tests;  // Generated namespaces will be prepended with
+                                    // the extra namespace
+message EmptyMessage {}
 
 message SimpleStringMessage {
     string testFieldString = 6;
@@ -15,4 +14,3 @@ message ComplexMessage {
     int32 testFieldInt = 1;
     SimpleStringMessage testComplexField = 2;
 }
-
diff --git a/tests/auto/shared/data/proto/mapmessages.proto b/tests/auto/shared/data/proto/mapmessages.proto
index 41d42de..1dbc853 100644
--- a/tests/auto/shared/data/proto/mapmessages.proto
+++ b/tests/auto/shared/data/proto/mapmessages.proto
@@ -6,8 +6,8 @@ import "basicmessages.proto";
 
 package qtprotobufnamespace.tests;
 
-//MAPS
-//Types to String
+// MAPS
+// Types to String
 message SimpleSInt32StringMapMessage {
     map<sint32, string> mapField = 1;
 }
@@ -52,7 +52,7 @@ message SimpleStringStringMapMessage {
     map<string, string> mapField = 13;
 }
 
-//Types to sint32
+// Types to sint32
 message SimpleSInt32SInt32MapMessage {
     map<sint32, sint32> mapField = 1;
 }
@@ -97,7 +97,7 @@ message SimpleStringSInt32MapMessage {
     map<string, sint32> mapField = 13;
 }
 
-//Types to sint64
+// Types to sint64
 message SimpleSInt32SInt64MapMessage {
     map<sint32, sint64> mapField = 1;
 }
@@ -142,7 +142,7 @@ message SimpleStringSInt64MapMessage {
     map<string, sint64> mapField = 13;
 }
 
-//Types to uint32
+// Types to uint32
 message SimpleSInt32UInt32MapMessage {
     map<sint32, uint32> mapField = 1;
 }
@@ -187,7 +187,7 @@ message SimpleStringUInt32MapMessage {
     map<string, uint32> mapField = 13;
 }
 
-//Types to uint64
+// Types to uint64
 message SimpleSInt32UInt64MapMessage {
     map<sint32, uint64> mapField = 1;
 }
@@ -232,7 +232,7 @@ message SimpleStringUInt64MapMessage {
     map<string, uint64> mapField = 13;
 }
 
-//Types to int32
+// Types to int32
 message SimpleSInt32Int32MapMessage {
     map<sint32, int32> mapField = 1;
 }
@@ -277,7 +277,7 @@ message SimpleStringInt32MapMessage {
     map<string, int32> mapField = 13;
 }
 
-//Types to int64
+// Types to int64
 message SimpleSInt32Int64MapMessage {
     map<sint32, int64> mapField = 1;
 }
@@ -322,7 +322,7 @@ message SimpleStringInt64MapMessage {
     map<string, int64> mapField = 13;
 }
 
-//Types to ComplexMessage
+// Types to ComplexMessage
 message SimpleSInt32ComplexMessageMapMessage {
     map<sint32, ComplexMessage> mapField = 1;
 }
diff --git a/tests/auto/shared/data/proto/nopackage.proto b/tests/auto/shared/data/proto/nopackage.proto
index 50749e3..532980d 100644
--- a/tests/auto/shared/data/proto/nopackage.proto
+++ b/tests/auto/shared/data/proto/nopackage.proto
@@ -4,8 +4,7 @@ syntax = "proto3";
 
 import "nopackageexternal.proto";
 
-message EmptyMessage {
-}
+message EmptyMessage {}
 
 enum TestEnum {
     LOCAL_ENUM_VALUE0 = 0;
diff --git a/tests/auto/shared/data/proto/oneofmessages.proto b/tests/auto/shared/data/proto/oneofmessages.proto
index 0e97e1d..5177029 100644
--- a/tests/auto/shared/data/proto/oneofmessages.proto
+++ b/tests/auto/shared/data/proto/oneofmessages.proto
@@ -6,26 +6,21 @@ import "basicmessages.proto";
 
 package qtprotobufnamespace.tests;
 
-message OneofSimpleMessage
-{
-    oneof testOneof
-    {
+message OneofSimpleMessage {
+    oneof testOneof {
         int32 testOneofFieldInt = 1;
         int32 testOneofFieldSecondInt = 2;
     }
 }
 
-message OneofComplexMessage
-{
+message OneofComplexMessage {
     int32 testFieldInt = 1;
-    oneof testOneof
-    {
+    oneof testOneof {
         int32 testOneofFieldInt = 42;
         ComplexMessage testOneofComplexField = 3;
         ComplexMessage testOneofSecondComplexField = 4;
     }
-    oneof secondOneof
-    {
+    oneof secondOneof {
         int32 secondFieldInt = 43;
         ComplexMessage secondComplexField = 5;
         ComplexMessage secondSecondComplexField = 6;
diff --git a/tests/auto/shared/data/proto/repeatednonpackedmessages.proto b/tests/auto/shared/data/proto/repeatednonpackedmessages.proto
index 1cc4dfc..7b4ae8d 100644
--- a/tests/auto/shared/data/proto/repeatednonpackedmessages.proto
+++ b/tests/auto/shared/data/proto/repeatednonpackedmessages.proto
@@ -4,73 +4,59 @@ syntax = "proto3";
 
 package qtprotobufnamespace.tests;
 
-message RepeatedNonPackedIntMessage
-{
-    repeated int32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedIntMessage {
+    repeated int32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSIntMessage
-{
-    repeated sint32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSIntMessage {
+    repeated sint32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedUIntMessage
-{
-    repeated uint32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedUIntMessage {
+    repeated uint32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedInt64Message
-{
-    repeated int64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedInt64Message {
+    repeated int64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSInt64Message
-{
-    repeated sint64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSInt64Message {
+    repeated sint64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedUInt64Message
-{
-    repeated uint64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedUInt64Message {
+    repeated uint64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedFixedIntMessage
-{
-    repeated fixed32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedFixedIntMessage {
+    repeated fixed32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSFixedIntMessage
-{
-    repeated sfixed32 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSFixedIntMessage {
+    repeated sfixed32 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedFixedInt64Message
-{
-    repeated fixed64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedFixedInt64Message {
+    repeated fixed64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedSFixedInt64Message
-{
-    repeated sfixed64 testRepeatedInt = 1 [ packed = false ];
+message RepeatedNonPackedSFixedInt64Message {
+    repeated sfixed64 testRepeatedInt = 1 [packed = false];
 }
 
-message RepeatedNonPackedBoolMessage
-{
-    repeated bool testRepeatedBool = 1 [ packed = false ];
+message RepeatedNonPackedBoolMessage {
+    repeated bool testRepeatedBool = 1 [packed = false];
 }
 
-message RepeatedNonPackedDoubleMessage
-{
-    repeated double testRepeatedDouble = 1 [ packed = false ];
+message RepeatedNonPackedDoubleMessage {
+    repeated double testRepeatedDouble = 1 [packed = false];
 }
 
-message RepeatedNonPackedFloatMessage
-{
-    repeated float testRepeatedFloat = 1 [ packed = false ];
+message RepeatedNonPackedFloatMessage {
+    repeated float testRepeatedFloat = 1 [packed = false];
 }
 
-message NonPackedIntMessageWithExtraMember
-{
-    repeated int32 testRepeatedInt = 1 [ packed = false ];
+message NonPackedIntMessageWithExtraMember {
+    repeated int32 testRepeatedInt = 1 [packed = false];
     string extra = 2;
 }
diff --git a/tests/auto/shared/data/proto/testservice.proto b/tests/auto/shared/data/proto/testservice.proto
index c168498..dc1dda7 100644
--- a/tests/auto/shared/data/proto/testservice.proto
+++ b/tests/auto/shared/data/proto/testservice.proto
@@ -9,7 +9,7 @@ message SimpleStringMessage {
 }
 
 message SimpleIntMessage {
-    sint32 testField= 1;
+    sint32 testField = 1;
 }
 
 message BlobMessage {
@@ -17,8 +17,8 @@ message BlobMessage {
 }
 
 service TestService {
-  rpc testMethod(SimpleStringMessage) returns (SimpleStringMessage) {}
-  rpc testMethodServerStream(SimpleStringMessage) returns (stream SimpleStringMessage) {}
-  rpc testMethodClientStream(stream SimpleStringMessage) returns (SimpleStringMessage) {}
-  rpc testMethodBiStream(stream SimpleStringMessage) returns (stream SimpleStringMessage) {}
+    rpc testMethod(SimpleStringMessage) returns (SimpleStringMessage) {}
+    rpc testMethodServerStream(SimpleStringMessage) returns (stream SimpleStringMessage) {}
+    rpc testMethodClientStream(stream SimpleStringMessage) returns (SimpleStringMessage) {}
+    rpc testMethodBiStream(stream SimpleStringMessage) returns (stream SimpleStringMessage) {}
 }
diff --git a/tests/auto/shared/data/proto/timestampmessages.proto b/tests/auto/shared/data/proto/timestampmessages.proto
index c571ae4..d7dec68 100644
--- a/tests/auto/shared/data/proto/timestampmessages.proto
+++ b/tests/auto/shared/data/proto/timestampmessages.proto
@@ -6,7 +6,6 @@ import "google/protobuf/timestamp.proto";
 
 package qtproto.tests;
 
-message TimestampMessage
-{
+message TimestampMessage {
     google.protobuf.Timestamp field = 1;
 }