From f6f5eaeabaa9f231fdd7b0db25e1b12e6f565a50 Mon Sep 17 00:00:00 2001 From: Jannis Voelker Date: Tue, 27 Feb 2024 16:02:22 +0100 Subject: Always add a comma to the last entry of an enum Change-Id: I17ed482908d50b0f16f695b0b6a61d744f21fd0a Reviewed-by: Ivan Solovev (cherry picked from commit c98a63262b29e1657f0f2a668b0646deeabe6f25) Reviewed-by: Qt Cherry-pick Bot --- .../opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h | 2 +- src/declarative_opcua/opcuadatachangefilter_p.h | 4 ++-- src/declarative_opcua/opcuafilterelement_p.h | 2 +- src/declarative_opcua/opcuanode_p.h | 2 +- src/opcua/client/qopcuaapplicationdescription.h | 2 +- src/opcua/client/qopcuabrowserequest.h | 2 +- src/opcua/client/qopcuaclient.h | 4 ++-- src/opcua/client/qopcuacontentfilterelement.h | 2 +- src/opcua/client/qopcuaendpointdescription.h | 2 +- src/opcua/client/qopcuaerrorstate.h | 2 +- src/opcua/client/qopcuaextensionobject.h | 2 +- src/opcua/client/qopcuagenericstructhandler.h | 2 +- src/opcua/client/qopcuahistoryreadresponse.h | 2 +- src/opcua/client/qopcuamonitoringparameters.h | 10 +++++----- src/opcua/client/qopcuanodecreationattributes_p.h | 2 +- src/opcua/client/qopcuatype.h | 12 ++++++------ src/opcua/client/qopcuausertokenpolicy.h | 2 +- src/opcua/client/qopcuavariant.h | 2 +- src/opcua/x509/qopcuakeypair.h | 6 +++--- src/opcua/x509/qopcuax509certificatesigningrequest.h | 4 ++-- src/opcua/x509/qopcuax509extensionkeyusage.h | 2 +- src/opcua/x509/qopcuax509extensionsubjectalternativename.h | 2 +- tools/datatypecodegenerator/recursivedescentparser.h | 2 +- 23 files changed, 37 insertions(+), 37 deletions(-) diff --git a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h index 26c79a1..f2ea08d 100644 --- a/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h +++ b/examples/opcua/waterpump/waterpump-qmlcpp/opcuamachinebackend.h @@ -16,7 +16,7 @@ public: enum class MachineState : quint32 { Idle, Pumping, - Flushing + Flushing, }; Q_ENUM(MachineState) diff --git a/src/declarative_opcua/opcuadatachangefilter_p.h b/src/declarative_opcua/opcuadatachangefilter_p.h index 75c3d87..b9344a7 100644 --- a/src/declarative_opcua/opcuadatachangefilter_p.h +++ b/src/declarative_opcua/opcuadatachangefilter_p.h @@ -35,7 +35,7 @@ public: enum class DataChangeTrigger { Status = 0, StatusOrValue = 1, - StatusOrValueOrTimestamp = 2 + StatusOrValueOrTimestamp = 2, }; Q_ENUM(DataChangeTrigger) @@ -43,7 +43,7 @@ public: enum class DeadbandType { None = 0, Absolute = 1, - Percent = 2 + Percent = 2, }; Q_ENUM(DeadbandType) diff --git a/src/declarative_opcua/opcuafilterelement_p.h b/src/declarative_opcua/opcuafilterelement_p.h index 0e5de1d..958ea55 100644 --- a/src/declarative_opcua/opcuafilterelement_p.h +++ b/src/declarative_opcua/opcuafilterelement_p.h @@ -56,7 +56,7 @@ public: OfType = 14, RelatedTo = 15, BitwiseAnd = 16, - BitwiseOr = 17 + BitwiseOr = 17, }; Q_ENUM(FilterOperator); diff --git a/src/declarative_opcua/opcuanode_p.h b/src/declarative_opcua/opcuanode_p.h index 2f436f3..160e1f9 100644 --- a/src/declarative_opcua/opcuanode_p.h +++ b/src/declarative_opcua/opcuanode_p.h @@ -68,7 +68,7 @@ public: FailedToSetupMonitoring, FailedToWriteAttribute, FailedToModifyMonitoring, - FailedToDisableMonitoring + FailedToDisableMonitoring, }; Q_ENUM(Status); diff --git a/src/opcua/client/qopcuaapplicationdescription.h b/src/opcua/client/qopcuaapplicationdescription.h index 0a83901..e76cfb6 100644 --- a/src/opcua/client/qopcuaapplicationdescription.h +++ b/src/opcua/client/qopcuaapplicationdescription.h @@ -34,7 +34,7 @@ public: Server = 0, Client = 1, ClientAndServer = 2, - DiscoveryServer = 3 + DiscoveryServer = 3, }; Q_ENUM(ApplicationType) diff --git a/src/opcua/client/qopcuabrowserequest.h b/src/opcua/client/qopcuabrowserequest.h index ccec2cf..f042f05 100644 --- a/src/opcua/client/qopcuabrowserequest.h +++ b/src/opcua/client/qopcuabrowserequest.h @@ -18,7 +18,7 @@ public: enum class BrowseDirection : quint32 { Forward = 0, Inverse = 1, - Both = 2 + Both = 2, }; QOpcUaBrowseRequest(); diff --git a/src/opcua/client/qopcuaclient.h b/src/opcua/client/qopcuaclient.h index 2331f3f..a914d7a 100644 --- a/src/opcua/client/qopcuaclient.h +++ b/src/opcua/client/qopcuaclient.h @@ -46,7 +46,7 @@ public: Disconnected, Connecting, Connected, - Closing + Closing, }; Q_ENUM(ClientState) @@ -56,7 +56,7 @@ public: AccessDenied, ConnectionError, UnknownError, - UnsupportedAuthenticationInformation + UnsupportedAuthenticationInformation, }; Q_ENUM(ClientError) diff --git a/src/opcua/client/qopcuacontentfilterelement.h b/src/opcua/client/qopcuacontentfilterelement.h index 4d268c8..a0856fb 100644 --- a/src/opcua/client/qopcuacontentfilterelement.h +++ b/src/opcua/client/qopcuacontentfilterelement.h @@ -47,7 +47,7 @@ public: OfType = 14, RelatedTo = 15, BitwiseAnd = 16, - BitwiseOr = 17 + BitwiseOr = 17, }; QOpcUaContentFilterElement &operator<<(FilterOperator op); diff --git a/src/opcua/client/qopcuaendpointdescription.h b/src/opcua/client/qopcuaendpointdescription.h index 213c2a4..076bece 100644 --- a/src/opcua/client/qopcuaendpointdescription.h +++ b/src/opcua/client/qopcuaendpointdescription.h @@ -33,7 +33,7 @@ public: Invalid = 0, None = 1, Sign = 2, - SignAndEncrypt = 3 + SignAndEncrypt = 3, }; Q_ENUM(MessageSecurityMode) diff --git a/src/opcua/client/qopcuaerrorstate.h b/src/opcua/client/qopcuaerrorstate.h index a6d0a92..9092413 100644 --- a/src/opcua/client/qopcuaerrorstate.h +++ b/src/opcua/client/qopcuaerrorstate.h @@ -20,7 +20,7 @@ public: CertificateValidation, OpenSecureChannel, CreateSession, - ActivateSession + ActivateSession, }; QOpcUaErrorState(); diff --git a/src/opcua/client/qopcuaextensionobject.h b/src/opcua/client/qopcuaextensionobject.h index c525493..eaa8b39 100644 --- a/src/opcua/client/qopcuaextensionobject.h +++ b/src/opcua/client/qopcuaextensionobject.h @@ -18,7 +18,7 @@ public: enum Encoding { NoBody = 0, ByteString = 1, - Xml = 2 + Xml = 2, }; QOpcUaExtensionObject(); diff --git a/src/opcua/client/qopcuagenericstructhandler.h b/src/opcua/client/qopcuagenericstructhandler.h index 06f2c96..419de63 100644 --- a/src/opcua/client/qopcuagenericstructhandler.h +++ b/src/opcua/client/qopcuagenericstructhandler.h @@ -50,7 +50,7 @@ public: Unknown = 0, Struct = 1, Enum = 2, - Other = 3 + Other = 3, }; Q_ENUM(DataTypeKind) diff --git a/src/opcua/client/qopcuahistoryreadresponse.h b/src/opcua/client/qopcuahistoryreadresponse.h index 3a8948e..f4e435c 100644 --- a/src/opcua/client/qopcuahistoryreadresponse.h +++ b/src/opcua/client/qopcuahistoryreadresponse.h @@ -30,7 +30,7 @@ public: Reading, Finished, MoreDataAvailable, - Error + Error, }; Q_ENUM(State) diff --git a/src/opcua/client/qopcuamonitoringparameters.h b/src/opcua/client/qopcuamonitoringparameters.h index ead74a8..9669536 100644 --- a/src/opcua/client/qopcuamonitoringparameters.h +++ b/src/opcua/client/qopcuamonitoringparameters.h @@ -25,12 +25,12 @@ public: enum class MonitoringMode { Disabled = 0, Sampling = 1, - Reporting = 2 + Reporting = 2, }; enum class SubscriptionType { Shared, - Exclusive + Exclusive, }; enum class Parameter { @@ -45,7 +45,7 @@ public: QueueSize = (1 << 8), DiscardOldest = (1 << 9), MonitoringMode = (1 << 10), - TriggeredItemIds = (1 << 11) + TriggeredItemIds = (1 << 11), }; Q_ENUM(Parameter) Q_DECLARE_FLAGS(Parameters, Parameter) @@ -58,13 +58,13 @@ public: enum class DataChangeTrigger { Status = 0, StatusOrValue = 1, - StatusOrValueOrTimestamp = 2 + StatusOrValueOrTimestamp = 2, }; enum class DeadbandType { None = 0, Absolute = 1, - Percent = 2 + Percent = 2, }; DataChangeFilter(); diff --git a/src/opcua/client/qopcuanodecreationattributes_p.h b/src/opcua/client/qopcuanodecreationattributes_p.h index 49a693a..ed9021f 100644 --- a/src/opcua/client/qopcuanodecreationattributes_p.h +++ b/src/opcua/client/qopcuanodecreationattributes_p.h @@ -49,7 +49,7 @@ public: UserWriteMask = 18, ValueRank = 19, WriteMask = 20, - Value = 21 + Value = 21, }; void setAttributeInMask(QOpcUaNodeCreationAttributesPrivate::BitMask attribute) diff --git a/src/opcua/client/qopcuatype.h b/src/opcua/client/qopcuatype.h index bd091ad..8956062 100644 --- a/src/opcua/client/qopcuatype.h +++ b/src/opcua/client/qopcuatype.h @@ -114,7 +114,7 @@ enum class EventNotifierBit : quint8 { None = 0, SubscribeToEvents = (1 << 0), HistoryRead = (1 << 2), - HistoryWrite = (1 << 3) + HistoryWrite = (1 << 3), }; Q_ENUM_NS(EventNotifierBit) Q_DECLARE_FLAGS(EventNotifier, EventNotifierBit) @@ -124,7 +124,7 @@ enum class TimestampsToReturn { Server = 1, Both = 2, Neither = 4, - Invalid = 5 + Invalid = 5, }; Q_ENUM_NS(TimestampsToReturn) @@ -205,7 +205,7 @@ enum class ReferenceTypeId : quint32 { HasContainedComponent = 25263, HasAttachedComponent = 25264, IsExecutingOn = 25265, - HasPushedSecurityGroup = 25345 + HasPushedSecurityGroup = 25345, }; Q_ENUM_NS(ReferenceTypeId) @@ -252,7 +252,7 @@ enum Types RelativePathElement = 38, ContentFilterElement = 39, EventFilter = 40, - Undefined = 0xFFFFFFFF + Undefined = 0xFFFFFFFF, }; Q_ENUM_NS(Types) @@ -533,7 +533,7 @@ enum class ErrorCategory { ArgumentError, TypeError, ConnectionError, - UnspecifiedError + UnspecifiedError, }; Q_ENUM_NS(ErrorCategory) @@ -560,7 +560,7 @@ typedef QPair TypedVariant; enum class AxisScale : quint32 { Linear = 0, Log = 1, - Ln = 2 + Ln = 2, }; Q_OPCUA_EXPORT QOpcUa::Types metaTypeToQOpcUaType(QMetaType::Type type); diff --git a/src/opcua/client/qopcuausertokenpolicy.h b/src/opcua/client/qopcuausertokenpolicy.h index 737c5b2..5e40c8a 100644 --- a/src/opcua/client/qopcuausertokenpolicy.h +++ b/src/opcua/client/qopcuausertokenpolicy.h @@ -26,7 +26,7 @@ public: Anonymous = 0, Username = 1, Certificate = 2, - IssuedToken = 3 + IssuedToken = 3, }; Q_ENUMS(TokenType) diff --git a/src/opcua/client/qopcuavariant.h b/src/opcua/client/qopcuavariant.h index c094134..d6746bc 100644 --- a/src/opcua/client/qopcuavariant.h +++ b/src/opcua/client/qopcuavariant.h @@ -45,7 +45,7 @@ public: ExtensionObject = 22, DataValue = 23, Variant = 24, - DiagnosticInfo = 25 + DiagnosticInfo = 25, }; Q_OPCUA_EXPORT QOpcUaVariant(); diff --git a/src/opcua/x509/qopcuakeypair.h b/src/opcua/x509/qopcuakeypair.h index 501abc9..90c834a 100644 --- a/src/opcua/x509/qopcuakeypair.h +++ b/src/opcua/x509/qopcuakeypair.h @@ -22,18 +22,18 @@ public: enum class RsaKeyStrength { Bits1024 = 1024, Bits2048 = 2048, - Bits4096 = 4096 + Bits4096 = 4096, }; enum class KeyType { Rsa, Empty, - Unknown + Unknown, }; enum class Cipher { Aes128Cbc, - Unencrypted + Unencrypted, }; QOpcUaKeyPair(QObject *parent = nullptr); diff --git a/src/opcua/x509/qopcuax509certificatesigningrequest.h b/src/opcua/x509/qopcuax509certificatesigningrequest.h index de97bc7..a94404e 100644 --- a/src/opcua/x509/qopcuax509certificatesigningrequest.h +++ b/src/opcua/x509/qopcuax509certificatesigningrequest.h @@ -20,11 +20,11 @@ class Q_OPCUA_EXPORT QOpcUaX509CertificateSigningRequest public: enum class MessageDigest { - SHA256 + SHA256, }; enum class Encoding { PEM, - DER + DER, }; QOpcUaX509CertificateSigningRequest(); diff --git a/src/opcua/x509/qopcuax509extensionkeyusage.h b/src/opcua/x509/qopcuax509extensionkeyusage.h index f336cd2..13f3553 100644 --- a/src/opcua/x509/qopcuax509extensionkeyusage.h +++ b/src/opcua/x509/qopcuax509extensionkeyusage.h @@ -21,7 +21,7 @@ public: CertificateSigning, CrlSigning, EnciptherOnly, - DecipherOnly + DecipherOnly, }; QOpcUaX509ExtensionKeyUsage(); diff --git a/src/opcua/x509/qopcuax509extensionsubjectalternativename.h b/src/opcua/x509/qopcuax509extensionsubjectalternativename.h index 341caf6..6244440 100644 --- a/src/opcua/x509/qopcuax509extensionsubjectalternativename.h +++ b/src/opcua/x509/qopcuax509extensionsubjectalternativename.h @@ -17,7 +17,7 @@ public: Email, URI, DNS, - IP + IP, }; QOpcUaX509ExtensionSubjectAlternativeName(); diff --git a/tools/datatypecodegenerator/recursivedescentparser.h b/tools/datatypecodegenerator/recursivedescentparser.h index 3e540f4..ab9377e 100644 --- a/tools/datatypecodegenerator/recursivedescentparser.h +++ b/tools/datatypecodegenerator/recursivedescentparser.h @@ -27,7 +27,7 @@ public: MissingDependency, CannotFullyGenerateNamespaceZero, UnableToWriteFile, - UnableToResolveDependency + UnableToResolveDependency, }; Q_ENUM(ParsingError) -- cgit v1.2.3