diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-03-13 00:16:40 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2015-03-13 00:16:40 +0100 |
| commit | 05bff44937922c0a7519952201f6854b72d38483 (patch) | |
| tree | 1b05e4263c4621f99a477d13d2362143bdaa8e03 /src/base | |
| parent | 69afc4644606d40f0928a0eb0775ec9a03fdb661 (diff) | |
| download | qxmpp-05bff44937922c0a7519952201f6854b72d38483.tar.gz | |
Remove trailing comma after last item in enums
This allows compilation with GCC in pedantic mode.
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/QXmppByteStreamIq.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppCodec.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppDataForm.h | 4 | ||||
| -rw-r--r-- | src/base/QXmppDiscoveryIq.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppJingleIq.h | 6 | ||||
| -rw-r--r-- | src/base/QXmppLogger.h | 4 | ||||
| -rw-r--r-- | src/base/QXmppMessage.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppMucIq.h | 4 | ||||
| -rw-r--r-- | src/base/QXmppPubSubIq.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppRtpChannel.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppRtpChannel.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppSocks.cpp | 10 | ||||
| -rw-r--r-- | src/base/QXmppStreamInitiationIq_p.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppStun.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppStun.h | 6 |
15 files changed, 26 insertions, 26 deletions
diff --git a/src/base/QXmppByteStreamIq.h b/src/base/QXmppByteStreamIq.h index 79cea15e..a6a34aa5 100644 --- a/src/base/QXmppByteStreamIq.h +++ b/src/base/QXmppByteStreamIq.h @@ -34,7 +34,7 @@ public: enum Mode { None = 0, Tcp, - Udp, + Udp }; class QXMPP_EXPORT StreamHost diff --git a/src/base/QXmppCodec.cpp b/src/base/QXmppCodec.cpp index 64ff37a0..556295b4 100644 --- a/src/base/QXmppCodec.cpp +++ b/src/base/QXmppCodec.cpp @@ -72,7 +72,7 @@ enum FragmentType { NoFragment = 0, StartFragment, MiddleFragment, - EndFragment, + EndFragment }; static qint16 seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF, diff --git a/src/base/QXmppDataForm.h b/src/base/QXmppDataForm.h index 81ea497f..b5136c68 100644 --- a/src/base/QXmppDataForm.h +++ b/src/base/QXmppDataForm.h @@ -87,7 +87,7 @@ public: ListSingleField, TextMultiField, TextPrivateField, - TextSingleField, + TextSingleField }; Field(QXmppDataForm::Field::Type type = QXmppDataForm::Field::TextSingleField); @@ -134,7 +134,7 @@ public: ///< form-processing entity. Cancel, ///< The form-submitting entity has cancelled submission ///< of data to the form-processing entity. - Result, ///< The form-processing entity is returning data + Result ///< The form-processing entity is returning data ///< (e.g., search results) to the form-submitting entity, ///< or the data is a generic data set. }; diff --git a/src/base/QXmppDiscoveryIq.h b/src/base/QXmppDiscoveryIq.h index 74e28fc2..2a774ad9 100644 --- a/src/base/QXmppDiscoveryIq.h +++ b/src/base/QXmppDiscoveryIq.h @@ -72,7 +72,7 @@ public: enum QueryType { InfoQuery, - ItemsQuery, + ItemsQuery }; QStringList features() const; diff --git a/src/base/QXmppJingleIq.h b/src/base/QXmppJingleIq.h index c46295d4..34c0bcef 100644 --- a/src/base/QXmppJingleIq.h +++ b/src/base/QXmppJingleIq.h @@ -90,7 +90,7 @@ public: ///< the address/port as seen from the peer. ServerReflexiveType, ///< Server-reflexive candidate, ///< the address/port as seen by the STUN server - RelayedType, ///< Relayed candidate, a candidate from + RelayedType ///< Relayed candidate, a candidate from ///< a TURN relay. }; @@ -170,7 +170,7 @@ public: TransportAccept, TransportInfo, TransportReject, - TransportReplace, + TransportReplace }; /// \internal @@ -255,7 +255,7 @@ public: Success, Timeout, UnsupportedApplications, - UnsupportedTransports, + UnsupportedTransports }; Reason(); diff --git a/src/base/QXmppLogger.h b/src/base/QXmppLogger.h index 76629a30..701449c0 100644 --- a/src/base/QXmppLogger.h +++ b/src/base/QXmppLogger.h @@ -58,7 +58,7 @@ public: NoLogging = 0, ///< Log messages are discarded FileLogging = 1, ///< Log messages are written to a file StdoutLogging = 2, ///< Log messages are written to the standard output - SignalLogging = 4, ///< Log messages are emitted as a signal + SignalLogging = 4 ///< Log messages are emitted as a signal }; /// This enum describes a type of log message. @@ -70,7 +70,7 @@ public: WarningMessage = 4, ///< Warning message ReceivedMessage = 8, ///< Message received from server SentMessage = 16, ///< Message sent to server - AnyMessage = 31, ///< Any message type + AnyMessage = 31 ///< Any message type }; Q_DECLARE_FLAGS(MessageTypes, MessageType) diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index 119dba3e..03c4a408 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -57,7 +57,7 @@ public: Inactive, ///< User has not been actively participating in the chat session. Gone, ///< User has effectively ended their participation in the chat session. Composing, ///< User is composing a message. - Paused, ///< User had been composing but now has stopped. + Paused ///< User had been composing but now has stopped. }; /// This enum describes a chat marker as defined by diff --git a/src/base/QXmppMucIq.h b/src/base/QXmppMucIq.h index ddbb730c..7f8f858e 100644 --- a/src/base/QXmppMucIq.h +++ b/src/base/QXmppMucIq.h @@ -43,7 +43,7 @@ public: NoAffiliation, MemberAffiliation, AdminAffiliation, - OwnerAffiliation, + OwnerAffiliation }; /// This enum is used to represent short-lived permissions in a room (roles). @@ -52,7 +52,7 @@ public: NoRole, VisitorRole, ParticipantRole, - ModeratorRole, + ModeratorRole }; QXmppMucItem(); diff --git a/src/base/QXmppPubSubIq.h b/src/base/QXmppPubSubIq.h index 66e9d2e1..2d613ac4 100644 --- a/src/base/QXmppPubSubIq.h +++ b/src/base/QXmppPubSubIq.h @@ -68,7 +68,7 @@ public: SubscribeQuery, SubscriptionQuery, SubscriptionsQuery, - UnsubscribeQuery, + UnsubscribeQuery }; QXmppPubSubIq::QueryType queryType() const; diff --git a/src/base/QXmppRtpChannel.cpp b/src/base/QXmppRtpChannel.cpp index ff478fd4..7c093192 100644 --- a/src/base/QXmppRtpChannel.cpp +++ b/src/base/QXmppRtpChannel.cpp @@ -176,7 +176,7 @@ enum CodecId { L16Stereo = 10, L16Mono = 11, G728 = 15, - G729 = 18, + G729 = 18 }; struct ToneInfo diff --git a/src/base/QXmppRtpChannel.h b/src/base/QXmppRtpChannel.h index a86c0c8b..0b1b0c0b 100644 --- a/src/base/QXmppRtpChannel.h +++ b/src/base/QXmppRtpChannel.h @@ -200,7 +200,7 @@ public: ///< sub-sampled (U-Y-V-Y), i.e. two horizontally adjacent ///< pixels are stored as a 32-bit macropixel which has a Y ///< value for each pixel and common U and V values. - Format_YUYV = 21, ///< The frame is stored using an 8-bit per component packed + Format_YUYV = 21 ///< The frame is stored using an 8-bit per component packed ///< YUV format with the U and V planes horizontally ///< sub-sampled (Y-U-Y-V), i.e. two horizontally adjacent ///< pixels are stored as a 32-bit macropixel which has a Y diff --git a/src/base/QXmppSocks.cpp b/src/base/QXmppSocks.cpp index 1bfc1111..82ccd096 100644 --- a/src/base/QXmppSocks.cpp +++ b/src/base/QXmppSocks.cpp @@ -33,19 +33,19 @@ const static char SocksVersion = 5; enum AuthenticationMethod { NoAuthentication = 0, GSSAPI = 1, - UsernamePassword = 2, + UsernamePassword = 2 }; enum Command { ConnectCommand = 1, BindCommand = 2, - AssociateCommand = 3, + AssociateCommand = 3 }; enum AddressType { IPv4Address = 1, DomainName = 3, - IPv6Address = 4, + IPv6Address = 4 }; enum ReplyType { @@ -57,13 +57,13 @@ enum ReplyType { ConnectionRefused = 5, TtlExpired = 6, CommandNotSupported = 7, - AddressTypeNotSupported = 8, + AddressTypeNotSupported = 8 }; enum State { ConnectState = 0, CommandState = 1, - ReadyState = 2, + ReadyState = 2 }; static QByteArray encodeHostAndPort(quint8 type, const QByteArray &host, quint16 port) diff --git a/src/base/QXmppStreamInitiationIq_p.h b/src/base/QXmppStreamInitiationIq_p.h index bbf5da9c..6a37bed1 100644 --- a/src/base/QXmppStreamInitiationIq_p.h +++ b/src/base/QXmppStreamInitiationIq_p.h @@ -48,7 +48,7 @@ class QXMPP_AUTOTEST_EXPORT QXmppStreamInitiationIq : public QXmppIq public: enum Profile { None = 0, - FileTransfer, + FileTransfer }; QXmppDataForm featureForm() const; diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp index 55e9c1a1..9a341111 100644 --- a/src/base/QXmppStun.cpp +++ b/src/base/QXmppStun.cpp @@ -67,7 +67,7 @@ enum AttributeType { Fingerprint = 0x8028, // RFC5389 IceControlled = 0x8029, // RFC5245 IceControlling = 0x802a, // RFC5245 - OtherAddress = 0x802c, // RFC5780 + OtherAddress = 0x802c // RFC5780 }; // FIXME : we need to set local preference to discriminate between diff --git a/src/base/QXmppStun.h b/src/base/QXmppStun.h index b2725ce5..32f3ec23 100644 --- a/src/base/QXmppStun.h +++ b/src/base/QXmppStun.h @@ -49,14 +49,14 @@ public: Send = 0x6, Data = 0x7, CreatePermission = 0x8, - ChannelBind = 0x9, + ChannelBind = 0x9 }; enum ClassType { Request = 0x000, Indication = 0x010, Response = 0x100, - Error = 0x110, + Error = 0x110 }; QXmppStunMessage(); @@ -201,7 +201,7 @@ public: UnconnectedState, ConnectingState, ConnectedState, - ClosingState, + ClosingState }; QXmppTurnAllocation(QObject *parent = 0); |
