From aeae430b7f987da9733ac24d035790dbfee7e41b Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 9 Feb 2023 07:43:26 -0800 Subject: [PATCH] [ObjC] s/Objective C/Objective-C/ Just to avoid some linters complaining about the spelling in future changes. PiperOrigin-RevId: 508371353 --- objectivec/GPBAny.pbobjc.m | 4 ++-- objectivec/GPBApi.pbobjc.m | 4 ++-- objectivec/GPBDuration.pbobjc.m | 4 ++-- objectivec/GPBEmpty.pbobjc.m | 4 ++-- objectivec/GPBFieldMask.pbobjc.m | 4 ++-- objectivec/GPBSourceContext.pbobjc.m | 4 ++-- objectivec/GPBStruct.pbobjc.m | 4 ++-- objectivec/GPBTimestamp.pbobjc.m | 4 ++-- objectivec/GPBType.pbobjc.m | 4 ++-- objectivec/GPBWrappers.pbobjc.m | 4 ++-- src/google/protobuf/compiler/objectivec/field.cc | 4 ++-- src/google/protobuf/compiler/objectivec/file.cc | 12 ++++++------ src/google/protobuf/compiler/objectivec/helpers.h | 4 ++-- src/google/protobuf/compiler/objectivec/names.cc | 2 +- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/objectivec/GPBAny.pbobjc.m b/objectivec/GPBAny.pbobjc.m index 1e1b07a235..ada41e569d 100644 --- a/objectivec/GPBAny.pbobjc.m +++ b/objectivec/GPBAny.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBAny); diff --git a/objectivec/GPBApi.pbobjc.m b/objectivec/GPBApi.pbobjc.m index 1bc539adf4..a6283a84f1 100644 --- a/objectivec/GPBApi.pbobjc.m +++ b/objectivec/GPBApi.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBApi); diff --git a/objectivec/GPBDuration.pbobjc.m b/objectivec/GPBDuration.pbobjc.m index 06018bf29d..1a54a76b30 100644 --- a/objectivec/GPBDuration.pbobjc.m +++ b/objectivec/GPBDuration.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBDuration); diff --git a/objectivec/GPBEmpty.pbobjc.m b/objectivec/GPBEmpty.pbobjc.m index 6bb9e9c706..b69738c593 100644 --- a/objectivec/GPBEmpty.pbobjc.m +++ b/objectivec/GPBEmpty.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBEmpty); diff --git a/objectivec/GPBFieldMask.pbobjc.m b/objectivec/GPBFieldMask.pbobjc.m index 873ccce1d6..8de5ad42ff 100644 --- a/objectivec/GPBFieldMask.pbobjc.m +++ b/objectivec/GPBFieldMask.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBFieldMask); diff --git a/objectivec/GPBSourceContext.pbobjc.m b/objectivec/GPBSourceContext.pbobjc.m index 9db01979f7..7ae605b32a 100644 --- a/objectivec/GPBSourceContext.pbobjc.m +++ b/objectivec/GPBSourceContext.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBSourceContext); diff --git a/objectivec/GPBStruct.pbobjc.m b/objectivec/GPBStruct.pbobjc.m index 7a53de335d..eabd761866 100644 --- a/objectivec/GPBStruct.pbobjc.m +++ b/objectivec/GPBStruct.pbobjc.m @@ -21,8 +21,8 @@ #pragma clang diagnostic ignored "-Wdirect-ivar-access" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBListValue); diff --git a/objectivec/GPBTimestamp.pbobjc.m b/objectivec/GPBTimestamp.pbobjc.m index bb43aec65c..edd73498a2 100644 --- a/objectivec/GPBTimestamp.pbobjc.m +++ b/objectivec/GPBTimestamp.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBTimestamp); diff --git a/objectivec/GPBType.pbobjc.m b/objectivec/GPBType.pbobjc.m index c4211177f9..04e262c574 100644 --- a/objectivec/GPBType.pbobjc.m +++ b/objectivec/GPBType.pbobjc.m @@ -20,8 +20,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBAny); diff --git a/objectivec/GPBWrappers.pbobjc.m b/objectivec/GPBWrappers.pbobjc.m index 0e87e6ca2b..07be68bace 100644 --- a/objectivec/GPBWrappers.pbobjc.m +++ b/objectivec/GPBWrappers.pbobjc.m @@ -18,8 +18,8 @@ #pragma clang diagnostic ignored "-Wdeprecated-declarations" #pragma clang diagnostic ignored "-Wdollar-in-identifier-extension" -#pragma mark - Objective C Class declarations -// Forward declarations of Objective C classes that we can use as +#pragma mark - Objective-C Class declarations +// Forward declarations of Objective-C classes that we can use as // static values in struct initializers. // We don't use [Foo class] because it is not a static value. GPBObjCClassDeclaration(GPBBoolValue); diff --git a/src/google/protobuf/compiler/objectivec/field.cc b/src/google/protobuf/compiler/objectivec/field.cc index a898f5de43..4349d3f398 100644 --- a/src/google/protobuf/compiler/objectivec/field.cc +++ b/src/google/protobuf/compiler/objectivec/field.cc @@ -375,7 +375,7 @@ void ObjCObjFieldGenerator::GenerateFieldStorageDeclaration( void ObjCObjFieldGenerator::GeneratePropertyDeclaration( io::Printer* printer) const { // Differs from SingleFieldGenerator::GeneratePropertyDeclaration() in that - // it uses pointers and deals with Objective C's rules around storage name + // it uses pointers and deals with Objective-C's rules around storage name // conventions (init*, new*, etc.) printer->Print(variables_, "$comments$"); @@ -431,7 +431,7 @@ void RepeatedFieldGenerator::GeneratePropertyDeclaration( // Repeated fields don't need the has* properties, but they do expose a // *Count (to check without autocreation). So for the field property we need // the same logic as ObjCObjFieldGenerator::GeneratePropertyDeclaration() for - // dealing with needing Objective C's rules around storage name conventions + // dealing with needing Objective-C's rules around storage name conventions // (init*, new*, etc.) // clang-format off diff --git a/src/google/protobuf/compiler/objectivec/file.cc b/src/google/protobuf/compiler/objectivec/file.cc index c2e0bf6937..12b5de9626 100644 --- a/src/google/protobuf/compiler/objectivec/file.cc +++ b/src/google/protobuf/compiler/objectivec/file.cc @@ -356,8 +356,8 @@ void FileGenerator::GenerateSource(io::Printer* p) const { if (!fwd_decls.empty()) { p->Print( // clang-format off - "#pragma mark - Objective C Class declarations\n" - "// Forward declarations of Objective C classes that we can use as\n" + "#pragma mark - Objective-C Class declarations\n" + "// Forward declarations of Objective-C classes that we can use as\n" "// static values in struct initializers.\n" "// We don't use [Foo class] because it is not a static value.\n" "$fwd_decls$\n" @@ -406,8 +406,8 @@ void FileGenerator::GenerateGlobalSource(io::Printer* p) const { if (!fwd_decls.empty()) { p->Print( // clang-format off - "#pragma mark - Objective C Class declarations\n" - "// Forward declarations of Objective C classes that we can use as\n" + "#pragma mark - Objective-C Class declarations\n" + "// Forward declarations of Objective-C classes that we can use as\n" "// static values in struct initializers.\n" "// We don't use [Foo class] because it is not a static value.\n" "$fwd_decls$\n" @@ -450,8 +450,8 @@ void FileGenerator::GenerateSourceForMessage(int idx, io::Printer* p) const { if (!fwd_decls.empty()) { p->Print( // clang-format off - "#pragma mark - Objective C Class declarations\n" - "// Forward declarations of Objective C classes that we can use as\n" + "#pragma mark - Objective-C Class declarations\n" + "// Forward declarations of Objective-C classes that we can use as\n" "// static values in struct initializers.\n" "// We don't use [Foo class] because it is not a static value.\n" "$fwd_decls$\n" diff --git a/src/google/protobuf/compiler/objectivec/helpers.h b/src/google/protobuf/compiler/objectivec/helpers.h index 2814651098..1e1d1012d8 100644 --- a/src/google/protobuf/compiler/objectivec/helpers.h +++ b/src/google/protobuf/compiler/objectivec/helpers.h @@ -103,11 +103,11 @@ std::string DefaultValue(const FieldDescriptor* field); std::string BuildFlagsString(FlagType type, const std::vector& strings); -// Returns a symbol that can be used in C code to refer to an Objective C +// Returns a symbol that can be used in C code to refer to an Objective-C // class without initializing the class. std::string ObjCClass(absl::string_view class_name); -// Declares an Objective C class without initializing the class so that it can +// Declares an Objective-C class without initializing the class so that it can // be refrerred to by ObjCClass. std::string ObjCClassDeclaration(absl::string_view class_name); diff --git a/src/google/protobuf/compiler/objectivec/names.cc b/src/google/protobuf/compiler/objectivec/names.cc index 54af967f96..6b171d06b8 100644 --- a/src/google/protobuf/compiler/objectivec/names.cc +++ b/src/google/protobuf/compiler/objectivec/names.cc @@ -345,7 +345,7 @@ const char* const kReservedWordList[] = { // These are brought in from nsobject_methods.h that is generated // using method_dump.sh. See kNSObjectMethods below. - // Objective C "keywords" that aren't in C + // Objective-C "keywords" that aren't in C // From // http://stackoverflow.com/questions/1873630/reserved-keywords-in-objective-c // with some others added on.