qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Alexey Edelev 2023-08-17 09:45:41 +02:00
parent a3c8ff52ef
commit 36a64710a9
23 changed files with 145 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/grpc/chat/proto/simplechat.proto
View File

@ -5,8 +5,7 @@ syntax = "proto3";
//! [0] //! [0]
package qtgrpc.examples.chat; package qtgrpc.examples.chat;
message ChatMessage message ChatMessage {
{
enum ContentType { enum ContentType {
Unknown = 0; Unknown = 0;
Text = 1; Text = 1;
@ -18,13 +17,11 @@ message ChatMessage
string from = 4; string from = 4;
} }
message ChatMessages message ChatMessages {
{
repeated ChatMessage messages = 1; repeated ChatMessage messages = 1;
} }
message User message User {
{
string name = 1; string name = 1;
string password = 2; string password = 2;
} }
@ -33,11 +30,10 @@ message Users {
repeated User users = 1; repeated User users = 1;
} }
message None { } message None {}
service SimpleChat service SimpleChat {
{ rpc messageList(None) returns (stream ChatMessages) {}
rpc messageList(None) returns (stream ChatMessages) { } rpc sendMessage(ChatMessage) returns (None) {}
rpc sendMessage(ChatMessage) returns (None) { }
} }
//! [0] //! [0]

6
examples/grpc/magic8ball/proto/exampleservice.proto
View File

@ -5,13 +5,13 @@ syntax = "proto3";
package qtgrpc.examples; package qtgrpc.examples;
message AnswerRequest { message AnswerRequest {
string message = 1; string message = 1;
} }
message AnswerResponse { message AnswerResponse {
string message = 1; string message = 1;
} }
service ExampleService { service ExampleService {
rpc answerMethod(AnswerRequest) returns (AnswerResponse) {} rpc answerMethod(AnswerRequest) returns (AnswerResponse) {}
} }

9
examples/protobuf/sensors/sensors.proto
View File

@ -5,15 +5,13 @@ syntax = "proto3";
//! [0] //! [0]
package qt.examples.sensors; package qt.examples.sensors;
message Coordinates message Coordinates {
{
double longitude = 1; double longitude = 1;
double latitude = 2; double latitude = 2;
double altitude = 3; double altitude = 3;
} }
message Temperature message Temperature {
{
enum Unit { enum Unit {
Farenheit = 0; Farenheit = 0;
Celsius = 1; Celsius = 1;
@ -22,8 +20,7 @@ message Temperature
Unit units = 2; Unit units = 2;
} }
message WarningNotification message WarningNotification {
{
string text = 1; string text = 1;
} }
//! [0] //! [0]

3
examples/protobuf/sensors/tlv.proto
View File

@ -12,8 +12,7 @@ enum MessageType {
} }
// Protobuf messages imply inline data size. // Protobuf messages imply inline data size.
message TlvMessage message TlvMessage {
{
MessageType type = 1; MessageType type = 1;
bytes value = 2; bytes value = 2;
} }

4
src/protobufqttypes/protobufqtguitypes/QtGui/QtGui.proto
View File

@ -12,7 +12,7 @@ message QRgba64 {
message QColor { message QColor {
oneof color { oneof color {
QRgba64 rgba64 = 1; QRgba64 rgba64 = 1;
uint32 rgba = 2; uint32 rgba = 2;
} }
} }
@ -52,5 +52,5 @@ message QQuaternion {
message QImage { message QImage {
bytes data = 1; bytes data = 1;
string format = 2; // see QImageWriter::supportedImageFormats() string format = 2; // see QImageWriter::supportedImageFormats()
} }

5
tests/auto/grpc/shared/proto/testservice.proto
View File

@ -4,15 +4,14 @@ syntax = "proto3";
package qtgrpc.tests; package qtgrpc.tests;
message Empty { message Empty {}
}
message SimpleStringMessage { message SimpleStringMessage {
string testFieldString = 6; string testFieldString = 6;
} }
message SimpleIntMessage { message SimpleIntMessage {
sint32 testField= 1; sint32 testField = 1;
} }
message BlobMessage { message BlobMessage {

12
tests/auto/protobuf/basic/proto/basicmessages.proto
View File

@ -4,8 +4,7 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message EmptyMessage { message EmptyMessage {}
}
message SimpleBoolMessage { message SimpleBoolMessage {
bool testFieldBool = 1; bool testFieldBool = 1;
@ -72,17 +71,14 @@ message ComplexMessage {
SimpleStringMessage testComplexField = 2; SimpleStringMessage testComplexField = 2;
} }
message OneofMessage message OneofMessage {
{
int32 testFieldInt = 1; int32 testFieldInt = 1;
oneof testOneof oneof testOneof {
{
int32 testOneofFieldInt = 42; int32 testOneofFieldInt = 42;
ComplexMessage testOneofComplexField = 3; ComplexMessage testOneofComplexField = 3;
ComplexMessage testOneofSecondComplexField = 4; ComplexMessage testOneofSecondComplexField = 4;
} }
oneof secondOneof oneof secondOneof {
{
int32 secondFieldInt = 43; int32 secondFieldInt = 43;
ComplexMessage secondComplexField = 5; ComplexMessage secondComplexField = 5;
ComplexMessage secondSecondComplexField = 6; ComplexMessage secondSecondComplexField = 6;

18
tests/auto/protobuf/basic/proto/mapmessages.proto
View File

@ -6,8 +6,8 @@ import "basicmessages.proto";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
//MAPS // MAPS
//Types to String // Types to String
message SimpleSInt32StringMapMessage { message SimpleSInt32StringMapMessage {
map<sint32, string> mapField = 1; map<sint32, string> mapField = 1;
} }
@ -52,7 +52,7 @@ message SimpleStringStringMapMessage {
map<string, string> mapField = 13; map<string, string> mapField = 13;
} }
//Types to sint32 // Types to sint32
message SimpleSInt32SInt32MapMessage { message SimpleSInt32SInt32MapMessage {
map<sint32, sint32> mapField = 1; map<sint32, sint32> mapField = 1;
} }
@ -97,7 +97,7 @@ message SimpleStringSInt32MapMessage {
map<string, sint32> mapField = 13; map<string, sint32> mapField = 13;
} }
//Types to sint64 // Types to sint64
message SimpleSInt32SInt64MapMessage { message SimpleSInt32SInt64MapMessage {
map<sint32, sint64> mapField = 1; map<sint32, sint64> mapField = 1;
} }
@ -142,7 +142,7 @@ message SimpleStringSInt64MapMessage {
map<string, sint64> mapField = 13; map<string, sint64> mapField = 13;
} }
//Types to uint32 // Types to uint32
message SimpleSInt32UInt32MapMessage { message SimpleSInt32UInt32MapMessage {
map<sint32, uint32> mapField = 1; map<sint32, uint32> mapField = 1;
} }
@ -187,7 +187,7 @@ message SimpleStringUInt32MapMessage {
map<string, uint32> mapField = 13; map<string, uint32> mapField = 13;
} }
//Types to uint64 // Types to uint64
message SimpleSInt32UInt64MapMessage { message SimpleSInt32UInt64MapMessage {
map<sint32, uint64> mapField = 1; map<sint32, uint64> mapField = 1;
} }
@ -232,7 +232,7 @@ message SimpleStringUInt64MapMessage {
map<string, uint64> mapField = 13; map<string, uint64> mapField = 13;
} }
//Types to int32 // Types to int32
message SimpleSInt32Int32MapMessage { message SimpleSInt32Int32MapMessage {
map<sint32, int32> mapField = 1; map<sint32, int32> mapField = 1;
} }
@ -277,7 +277,7 @@ message SimpleStringInt32MapMessage {
map<string, int32> mapField = 13; map<string, int32> mapField = 13;
} }
//Types to int64 // Types to int64
message SimpleSInt32Int64MapMessage { message SimpleSInt32Int64MapMessage {
map<sint32, int64> mapField = 1; map<sint32, int64> mapField = 1;
} }
@ -322,7 +322,7 @@ message SimpleStringInt64MapMessage {
map<string, int64> mapField = 13; map<string, int64> mapField = 13;
} }
//Types to ComplexMessage // Types to ComplexMessage
message SimpleSInt32ComplexMessageMapMessage { message SimpleSInt32ComplexMessageMapMessage {
map<sint32, ComplexMessage> mapField = 1; map<sint32, ComplexMessage> mapField = 1;
} }

70
tests/auto/protobuf/basic/proto/repeatednonpackedmessages.proto
View File

@ -4,73 +4,59 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message RepeatedNonPackedIntMessage message RepeatedNonPackedIntMessage {
{ repeated int32 testRepeatedInt = 1 [packed = false];
repeated int32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSIntMessage message RepeatedNonPackedSIntMessage {
{ repeated sint32 testRepeatedInt = 1 [packed = false];
repeated sint32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedUIntMessage message RepeatedNonPackedUIntMessage {
{ repeated uint32 testRepeatedInt = 1 [packed = false];
repeated uint32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedInt64Message message RepeatedNonPackedInt64Message {
{ repeated int64 testRepeatedInt = 1 [packed = false];
repeated int64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSInt64Message message RepeatedNonPackedSInt64Message {
{ repeated sint64 testRepeatedInt = 1 [packed = false];
repeated sint64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedUInt64Message message RepeatedNonPackedUInt64Message {
{ repeated uint64 testRepeatedInt = 1 [packed = false];
repeated uint64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedFixedIntMessage message RepeatedNonPackedFixedIntMessage {
{ repeated fixed32 testRepeatedInt = 1 [packed = false];
repeated fixed32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSFixedIntMessage message RepeatedNonPackedSFixedIntMessage {
{ repeated sfixed32 testRepeatedInt = 1 [packed = false];
repeated sfixed32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedFixedInt64Message message RepeatedNonPackedFixedInt64Message {
{ repeated fixed64 testRepeatedInt = 1 [packed = false];
repeated fixed64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSFixedInt64Message message RepeatedNonPackedSFixedInt64Message {
{ repeated sfixed64 testRepeatedInt = 1 [packed = false];
repeated sfixed64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedBoolMessage message RepeatedNonPackedBoolMessage {
{ repeated bool testRepeatedBool = 1 [packed = false];
repeated bool testRepeatedBool = 1 [ packed = false ];
} }
message RepeatedNonPackedDoubleMessage message RepeatedNonPackedDoubleMessage {
{ repeated double testRepeatedDouble = 1 [packed = false];
repeated double testRepeatedDouble = 1 [ packed = false ];
} }
message RepeatedNonPackedFloatMessage message RepeatedNonPackedFloatMessage {
{ repeated float testRepeatedFloat = 1 [packed = false];
repeated float testRepeatedFloat = 1 [ packed = false ];
} }
message NonPackedIntMessageWithExtraMember message NonPackedIntMessageWithExtraMember {
{ repeated int32 testRepeatedInt = 1 [packed = false];
repeated int32 testRepeatedInt = 1 [ packed = false ];
string extra = 2; string extra = 2;
} }

39
tests/auto/protobuf/enums/enummessages.proto
View File

@ -5,29 +5,28 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message SimpleEnumMessage { message SimpleEnumMessage {
enum LocalEnum { enum LocalEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;
LOCAL_ENUM_VALUE1 = 1; LOCAL_ENUM_VALUE1 = 1;
LOCAL_ENUM_VALUE2 = 2; LOCAL_ENUM_VALUE2 = 2;
LOCAL_ENUM_VALUE3 = 3; LOCAL_ENUM_VALUE3 = 3;
} }
LocalEnum localEnum = 1; LocalEnum localEnum = 1;
} }
message RepeatedEnumMessage { message RepeatedEnumMessage {
enum LocalEnum { enum LocalEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;
LOCAL_ENUM_VALUE1 = 1; LOCAL_ENUM_VALUE1 = 1;
LOCAL_ENUM_VALUE2 = 2; LOCAL_ENUM_VALUE2 = 2;
LOCAL_ENUM_VALUE3 = 3; LOCAL_ENUM_VALUE3 = 3;
} }
repeated LocalEnum localEnumList = 1; repeated LocalEnum localEnumList = 1;
} }
message MixedEnumUsageMessage message MixedEnumUsageMessage {
{
enum LocalEnum { enum LocalEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;
LOCAL_ENUM_VALUE1 = 1; LOCAL_ENUM_VALUE1 = 1;
@ -72,13 +71,13 @@ message MixedEnumUsageMessage
} }
message SimpleFileEnumMessage { message SimpleFileEnumMessage {
TestEnum globalEnum = 1; TestEnum globalEnum = 1;
repeated TestEnum globalEnumList = 2; repeated TestEnum globalEnumList = 2;
} }
message StepChildEnumMessage { message StepChildEnumMessage {
SimpleEnumMessage.LocalEnum localStepChildEnum = 1; SimpleEnumMessage.LocalEnum localStepChildEnum = 1;
repeated SimpleEnumMessage.LocalEnum localStepChildList = 2; repeated SimpleEnumMessage.LocalEnum localStepChildList = 2;
} }
enum TestEnum { enum TestEnum {

8
tests/auto/protobuf/extranamespace/proto/extranamespace.proto
View File

@ -2,10 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
syntax = "proto3"; syntax = "proto3";
package qtprotobufnamespace.tests; // Generated namespaces will be prepended with package qtprotobufnamespace.tests; // Generated namespaces will be prepended with
// the extra namespace // the extra namespace
message EmptyMessage { message EmptyMessage {}
}
message SimpleStringMessage { message SimpleStringMessage {
string testFieldString = 6; string testFieldString = 6;
@ -15,4 +14,3 @@ message ComplexMessage {
int32 testFieldInt = 1; int32 testFieldInt = 1;
SimpleStringMessage testComplexField = 2; SimpleStringMessage testComplexField = 2;
} }

3
tests/auto/protobuf/recursive/recursive.proto
View File

@ -4,8 +4,7 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message RecursiveMessage message RecursiveMessage {
{
int32 testFieldInt = 1; int32 testFieldInt = 1;
RecursiveMessage testFieldRecursive = 2; RecursiveMessage testFieldRecursive = 2;
} }

1
tests/auto/protobuf/sequence/proto/sequence.proto
View File

@ -43,4 +43,3 @@ message lowerCaseSequence {
message lowerCaseSequence2 { message lowerCaseSequence2 {
bool testField = 1; bool testField = 1;
} }

18
tests/auto/shared/data/proto/additionalenums.proto
View File

@ -5,18 +5,17 @@ syntax = "proto3";
package qtprotobufnamespace.tests.enums; package qtprotobufnamespace.tests.enums;
message SimpleEnumMessage { message SimpleEnumMessage {
enum LocalEnum { enum LocalEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;
LOCAL_ENUM_VALUE1 = 1; LOCAL_ENUM_VALUE1 = 1;
LOCAL_ENUM_VALUE2 = 2; LOCAL_ENUM_VALUE2 = 2;
LOCAL_ENUM_VALUE3 = 3; LOCAL_ENUM_VALUE3 = 3;
} }
LocalEnum localEnum = 1; LocalEnum localEnum = 1;
} }
message MixedEnumUsageMessage message MixedEnumUsageMessage {
{
enum LocalEnum { enum LocalEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;
LOCAL_ENUM_VALUE1 = 1; LOCAL_ENUM_VALUE1 = 1;
@ -42,4 +41,3 @@ enum TestEnumSecondInFile {
TEST_ENUM_SIF_VALUE1 = 1; TEST_ENUM_SIF_VALUE1 = 1;
TEST_ENUM_SIF_VALUE2 = 2; TEST_ENUM_SIF_VALUE2 = 2;
} }

4
tests/auto/shared/data/proto/annotation.proto
View File

@ -4,7 +4,7 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
//test annotation // test annotation
message AnnotatedMessage1 { message AnnotatedMessage1 {
/** /**
* \brief Field annotation * \brief Field annotation
@ -73,6 +73,6 @@ message AnnotatedMessage8 {
* test annotation secondline * test annotation secondline
*/ */
message AnnotatedMessage9 { message AnnotatedMessage9 {
//Field annotation // Field annotation
sint32 testField = 1; sint32 testField = 1;
} }

3
tests/auto/shared/data/proto/basicmessages.proto
View File

@ -4,8 +4,7 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message EmptyMessage { message EmptyMessage {}
}
message SimpleBoolMessage { message SimpleBoolMessage {
bool testFieldBool = 1; bool testFieldBool = 1;

8
tests/auto/shared/data/proto/extranamespace.proto
View File

@ -2,10 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
syntax = "proto3"; syntax = "proto3";
package qtprotobufnamespace.tests; // Generated namespaces will be prepended with package qtprotobufnamespace.tests; // Generated namespaces will be prepended with
// the extra namespace // the extra namespace
message EmptyMessage { message EmptyMessage {}
}
message SimpleStringMessage { message SimpleStringMessage {
string testFieldString = 6; string testFieldString = 6;
@ -15,4 +14,3 @@ message ComplexMessage {
int32 testFieldInt = 1; int32 testFieldInt = 1;
SimpleStringMessage testComplexField = 2; SimpleStringMessage testComplexField = 2;
} }

18
tests/auto/shared/data/proto/mapmessages.proto
View File

@ -6,8 +6,8 @@ import "basicmessages.proto";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
//MAPS // MAPS
//Types to String // Types to String
message SimpleSInt32StringMapMessage { message SimpleSInt32StringMapMessage {
map<sint32, string> mapField = 1; map<sint32, string> mapField = 1;
} }
@ -52,7 +52,7 @@ message SimpleStringStringMapMessage {
map<string, string> mapField = 13; map<string, string> mapField = 13;
} }
//Types to sint32 // Types to sint32
message SimpleSInt32SInt32MapMessage { message SimpleSInt32SInt32MapMessage {
map<sint32, sint32> mapField = 1; map<sint32, sint32> mapField = 1;
} }
@ -97,7 +97,7 @@ message SimpleStringSInt32MapMessage {
map<string, sint32> mapField = 13; map<string, sint32> mapField = 13;
} }
//Types to sint64 // Types to sint64
message SimpleSInt32SInt64MapMessage { message SimpleSInt32SInt64MapMessage {
map<sint32, sint64> mapField = 1; map<sint32, sint64> mapField = 1;
} }
@ -142,7 +142,7 @@ message SimpleStringSInt64MapMessage {
map<string, sint64> mapField = 13; map<string, sint64> mapField = 13;
} }
//Types to uint32 // Types to uint32
message SimpleSInt32UInt32MapMessage { message SimpleSInt32UInt32MapMessage {
map<sint32, uint32> mapField = 1; map<sint32, uint32> mapField = 1;
} }
@ -187,7 +187,7 @@ message SimpleStringUInt32MapMessage {
map<string, uint32> mapField = 13; map<string, uint32> mapField = 13;
} }
//Types to uint64 // Types to uint64
message SimpleSInt32UInt64MapMessage { message SimpleSInt32UInt64MapMessage {
map<sint32, uint64> mapField = 1; map<sint32, uint64> mapField = 1;
} }
@ -232,7 +232,7 @@ message SimpleStringUInt64MapMessage {
map<string, uint64> mapField = 13; map<string, uint64> mapField = 13;
} }
//Types to int32 // Types to int32
message SimpleSInt32Int32MapMessage { message SimpleSInt32Int32MapMessage {
map<sint32, int32> mapField = 1; map<sint32, int32> mapField = 1;
} }
@ -277,7 +277,7 @@ message SimpleStringInt32MapMessage {
map<string, int32> mapField = 13; map<string, int32> mapField = 13;
} }
//Types to int64 // Types to int64
message SimpleSInt32Int64MapMessage { message SimpleSInt32Int64MapMessage {
map<sint32, int64> mapField = 1; map<sint32, int64> mapField = 1;
} }
@ -322,7 +322,7 @@ message SimpleStringInt64MapMessage {
map<string, int64> mapField = 13; map<string, int64> mapField = 13;
} }
//Types to ComplexMessage // Types to ComplexMessage
message SimpleSInt32ComplexMessageMapMessage { message SimpleSInt32ComplexMessageMapMessage {
map<sint32, ComplexMessage> mapField = 1; map<sint32, ComplexMessage> mapField = 1;
} }

3
tests/auto/shared/data/proto/nopackage.proto
View File

@ -4,8 +4,7 @@ syntax = "proto3";
import "nopackageexternal.proto"; import "nopackageexternal.proto";
message EmptyMessage { message EmptyMessage {}
}
enum TestEnum { enum TestEnum {
LOCAL_ENUM_VALUE0 = 0; LOCAL_ENUM_VALUE0 = 0;

15
tests/auto/shared/data/proto/oneofmessages.proto
View File

@ -6,26 +6,21 @@ import "basicmessages.proto";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message OneofSimpleMessage message OneofSimpleMessage {
{ oneof testOneof {
oneof testOneof
{
int32 testOneofFieldInt = 1; int32 testOneofFieldInt = 1;
int32 testOneofFieldSecondInt = 2; int32 testOneofFieldSecondInt = 2;
} }
} }
message OneofComplexMessage message OneofComplexMessage {
{
int32 testFieldInt = 1; int32 testFieldInt = 1;
oneof testOneof oneof testOneof {
{
int32 testOneofFieldInt = 42; int32 testOneofFieldInt = 42;
ComplexMessage testOneofComplexField = 3; ComplexMessage testOneofComplexField = 3;
ComplexMessage testOneofSecondComplexField = 4; ComplexMessage testOneofSecondComplexField = 4;
} }
oneof secondOneof oneof secondOneof {
{
int32 secondFieldInt = 43; int32 secondFieldInt = 43;
ComplexMessage secondComplexField = 5; ComplexMessage secondComplexField = 5;
ComplexMessage secondSecondComplexField = 6; ComplexMessage secondSecondComplexField = 6;

70
tests/auto/shared/data/proto/repeatednonpackedmessages.proto
View File

@ -4,73 +4,59 @@ syntax = "proto3";
package qtprotobufnamespace.tests; package qtprotobufnamespace.tests;
message RepeatedNonPackedIntMessage message RepeatedNonPackedIntMessage {
{ repeated int32 testRepeatedInt = 1 [packed = false];
repeated int32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSIntMessage message RepeatedNonPackedSIntMessage {
{ repeated sint32 testRepeatedInt = 1 [packed = false];
repeated sint32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedUIntMessage message RepeatedNonPackedUIntMessage {
{ repeated uint32 testRepeatedInt = 1 [packed = false];
repeated uint32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedInt64Message message RepeatedNonPackedInt64Message {
{ repeated int64 testRepeatedInt = 1 [packed = false];
repeated int64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSInt64Message message RepeatedNonPackedSInt64Message {
{ repeated sint64 testRepeatedInt = 1 [packed = false];
repeated sint64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedUInt64Message message RepeatedNonPackedUInt64Message {
{ repeated uint64 testRepeatedInt = 1 [packed = false];
repeated uint64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedFixedIntMessage message RepeatedNonPackedFixedIntMessage {
{ repeated fixed32 testRepeatedInt = 1 [packed = false];
repeated fixed32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSFixedIntMessage message RepeatedNonPackedSFixedIntMessage {
{ repeated sfixed32 testRepeatedInt = 1 [packed = false];
repeated sfixed32 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedFixedInt64Message message RepeatedNonPackedFixedInt64Message {
{ repeated fixed64 testRepeatedInt = 1 [packed = false];
repeated fixed64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedSFixedInt64Message message RepeatedNonPackedSFixedInt64Message {
{ repeated sfixed64 testRepeatedInt = 1 [packed = false];
repeated sfixed64 testRepeatedInt = 1 [ packed = false ];
} }
message RepeatedNonPackedBoolMessage message RepeatedNonPackedBoolMessage {
{ repeated bool testRepeatedBool = 1 [packed = false];
repeated bool testRepeatedBool = 1 [ packed = false ];
} }
message RepeatedNonPackedDoubleMessage message RepeatedNonPackedDoubleMessage {
{ repeated double testRepeatedDouble = 1 [packed = false];
repeated double testRepeatedDouble = 1 [ packed = false ];
} }
message RepeatedNonPackedFloatMessage message RepeatedNonPackedFloatMessage {
{ repeated float testRepeatedFloat = 1 [packed = false];
repeated float testRepeatedFloat = 1 [ packed = false ];
} }
message NonPackedIntMessageWithExtraMember message NonPackedIntMessageWithExtraMember {
{ repeated int32 testRepeatedInt = 1 [packed = false];
repeated int32 testRepeatedInt = 1 [ packed = false ];
string extra = 2; string extra = 2;
} }

10
tests/auto/shared/data/proto/testservice.proto
View File

@ -9,7 +9,7 @@ message SimpleStringMessage {
} }
message SimpleIntMessage { message SimpleIntMessage {
sint32 testField= 1; sint32 testField = 1;
} }
message BlobMessage { message BlobMessage {
@ -17,8 +17,8 @@ message BlobMessage {
} }
service TestService { service TestService {
rpc testMethod(SimpleStringMessage) returns (SimpleStringMessage) {} rpc testMethod(SimpleStringMessage) returns (SimpleStringMessage) {}
rpc testMethodServerStream(SimpleStringMessage) returns (stream SimpleStringMessage) {} rpc testMethodServerStream(SimpleStringMessage) returns (stream SimpleStringMessage) {}
rpc testMethodClientStream(stream SimpleStringMessage) returns (SimpleStringMessage) {} rpc testMethodClientStream(stream SimpleStringMessage) returns (SimpleStringMessage) {}
rpc testMethodBiStream(stream SimpleStringMessage) returns (stream SimpleStringMessage) {} rpc testMethodBiStream(stream SimpleStringMessage) returns (stream SimpleStringMessage) {}
} }

3
tests/auto/shared/data/proto/timestampmessages.proto
View File

@ -6,7 +6,6 @@ import "google/protobuf/timestamp.proto";
package qtproto.tests; package qtproto.tests;
message TimestampMessage message TimestampMessage {
{
google.protobuf.Timestamp field = 1; google.protobuf.Timestamp field = 1;
} }