diff options
| author | Melvin Keskin <melvo@olomono.de> | 2022-01-08 08:26:46 +0000 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2022-01-15 14:04:15 +0100 |
| commit | fd11e024a6079be3e0bc62911b6e3070c7553224 (patch) | |
| tree | 199a3d658bc1641259faffd588534788fadb05dd /src/base | |
| parent | ee1ea9091f128164f91d29d7a3598d792326c1a7 (diff) | |
| download | qxmpp-fd11e024a6079be3e0bc62911b6e3070c7553224.tar.gz | |
Run 'clang-format' on all files
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/QXmppArchiveIq.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppConstants.cpp | 208 | ||||
| -rw-r--r-- | src/base/QXmppConstants_p.h | 208 | ||||
| -rw-r--r-- | src/base/QXmppDataForm.cpp | 3 | ||||
| -rw-r--r-- | src/base/QXmppDataFormBase.cpp | 4 | ||||
| -rw-r--r-- | src/base/QXmppDataFormBase.h | 5 | ||||
| -rw-r--r-- | src/base/QXmppEntityTimeIq.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppFutureUtils_p.h | 26 | ||||
| -rw-r--r-- | src/base/QXmppGlobal.h.in | 10 | ||||
| -rw-r--r-- | src/base/QXmppMixIq.cpp | 22 | ||||
| -rw-r--r-- | src/base/QXmppMixItem.cpp | 30 | ||||
| -rw-r--r-- | src/base/QXmppNonza.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppPacket.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppPubSubEvent.cpp | 4 | ||||
| -rw-r--r-- | src/base/QXmppPubSubMetadata.cpp | 3 | ||||
| -rw-r--r-- | src/base/QXmppPubSubMetadata.h | 6 | ||||
| -rw-r--r-- | src/base/QXmppPubSubSubAuthorization.cpp | 2 | ||||
| -rw-r--r-- | src/base/QXmppPubSubSubAuthorization.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppResultSet.cpp | 16 | ||||
| -rw-r--r-- | src/base/QXmppSendResult.h | 10 | ||||
| -rw-r--r-- | src/base/QXmppStream.cpp | 6 | ||||
| -rw-r--r-- | src/base/QXmppStream.h | 2 | ||||
| -rw-r--r-- | src/base/QXmppStreamManagement.cpp | 3 | ||||
| -rw-r--r-- | src/base/QXmppStun.cpp | 3 | ||||
| -rw-r--r-- | src/base/QXmppUtils.h | 28 |
25 files changed, 308 insertions, 301 deletions
diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp index 92fc5ef9..592f788c 100644 --- a/src/base/QXmppArchiveIq.cpp +++ b/src/base/QXmppArchiveIq.cpp @@ -239,7 +239,7 @@ bool QXmppArchiveChatIq::isArchiveChatIq(const QDomElement &element) { QDomElement chatElement = element.firstChildElement(QStringLiteral("chat")); return !chatElement.attribute(QStringLiteral("with")).isEmpty(); - //return (chatElement.namespaceURI() == ns_archive); + // return (chatElement.namespaceURI() == ns_archive); } void QXmppArchiveChatIq::parseElementFromChild(const QDomElement &element) diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp index ce5b47b0..d6e46ae6 100644 --- a/src/base/QXmppConstants.cpp +++ b/src/base/QXmppConstants.cpp @@ -4,169 +4,169 @@ #include "QXmppConstants_p.h" -const char* ns_stream = "http://etherx.jabber.org/streams"; -const char* ns_client = "jabber:client"; -const char* ns_server = "jabber:server"; -const char* ns_roster = "jabber:iq:roster"; -const char* ns_tls = "urn:ietf:params:xml:ns:xmpp-tls"; -const char* ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl"; -const char* ns_bind = "urn:ietf:params:xml:ns:xmpp-bind"; -const char* ns_session = "urn:ietf:params:xml:ns:xmpp-session"; -const char* ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas"; -const char* ns_pre_approval = "urn:xmpp:features:pre-approval"; -const char* ns_rosterver = "urn:xmpp:features:rosterver"; +const char *ns_stream = "http://etherx.jabber.org/streams"; +const char *ns_client = "jabber:client"; +const char *ns_server = "jabber:server"; +const char *ns_roster = "jabber:iq:roster"; +const char *ns_tls = "urn:ietf:params:xml:ns:xmpp-tls"; +const char *ns_sasl = "urn:ietf:params:xml:ns:xmpp-sasl"; +const char *ns_bind = "urn:ietf:params:xml:ns:xmpp-bind"; +const char *ns_session = "urn:ietf:params:xml:ns:xmpp-session"; +const char *ns_stanza = "urn:ietf:params:xml:ns:xmpp-stanzas"; +const char *ns_pre_approval = "urn:xmpp:features:pre-approval"; +const char *ns_rosterver = "urn:xmpp:features:rosterver"; // XEP-0009: Jabber-RPC -const char* ns_rpc = "jabber:iq:rpc"; +const char *ns_rpc = "jabber:iq:rpc"; // XEP-0020: Feature Negotiation -const char* ns_feature_negotiation = "http://jabber.org/protocol/feature-neg"; +const char *ns_feature_negotiation = "http://jabber.org/protocol/feature-neg"; // XEP-0027: Current Jabber OpenPGP Usage -const char* ns_legacy_openpgp = "jabber:x:encrypted"; +const char *ns_legacy_openpgp = "jabber:x:encrypted"; // XEP-0030: Service Discovery -const char* ns_disco_info = "http://jabber.org/protocol/disco#info"; -const char* ns_disco_items = "http://jabber.org/protocol/disco#items"; +const char *ns_disco_info = "http://jabber.org/protocol/disco#info"; +const char *ns_disco_items = "http://jabber.org/protocol/disco#items"; // XEP-0033: Extended Stanza Addressing -const char* ns_extended_addressing = "http://jabber.org/protocol/address"; +const char *ns_extended_addressing = "http://jabber.org/protocol/address"; // XEP-0045: Multi-User Chat -const char* ns_muc = "http://jabber.org/protocol/muc"; -const char* ns_muc_admin = "http://jabber.org/protocol/muc#admin"; -const char* ns_muc_owner = "http://jabber.org/protocol/muc#owner"; -const char* ns_muc_user = "http://jabber.org/protocol/muc#user"; +const char *ns_muc = "http://jabber.org/protocol/muc"; +const char *ns_muc_admin = "http://jabber.org/protocol/muc#admin"; +const char *ns_muc_owner = "http://jabber.org/protocol/muc#owner"; +const char *ns_muc_user = "http://jabber.org/protocol/muc#user"; // XEP-0047: In-Band Bytestreams -const char* ns_ibb = "http://jabber.org/protocol/ibb"; +const char *ns_ibb = "http://jabber.org/protocol/ibb"; // XEP-0049: Private XML Storage -const char* ns_private = "jabber:iq:private"; +const char *ns_private = "jabber:iq:private"; // XEP-0054: vcard-temp -const char* ns_vcard = "vcard-temp"; +const char *ns_vcard = "vcard-temp"; // XEP-0059: Result Set Management -const char* ns_rsm = "http://jabber.org/protocol/rsm"; +const char *ns_rsm = "http://jabber.org/protocol/rsm"; // XEP-0060: Publish-Subscribe -const char* ns_pubsub = "http://jabber.org/protocol/pubsub"; -const char* ns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors"; -const char* ns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; -const char* ns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; -const char* ns_pubsub_rsm = "http://jabber.org/protocol/pubsub#rsm"; +const char *ns_pubsub = "http://jabber.org/protocol/pubsub"; +const char *ns_pubsub_errors = "http://jabber.org/protocol/pubsub#errors"; +const char *ns_pubsub_event = "http://jabber.org/protocol/pubsub#event"; +const char *ns_pubsub_owner = "http://jabber.org/protocol/pubsub#owner"; +const char *ns_pubsub_rsm = "http://jabber.org/protocol/pubsub#rsm"; // XEP-0065: SOCKS5 Bytestreams -const char* ns_bytestreams = "http://jabber.org/protocol/bytestreams"; +const char *ns_bytestreams = "http://jabber.org/protocol/bytestreams"; // XEP-0066: Out of Band Data -const char* ns_oob = "jabber:x:oob"; +const char *ns_oob = "jabber:x:oob"; // XEP-0071: XHTML-IM -const char* ns_xhtml = "http://www.w3.org/1999/xhtml"; -const char* ns_xhtml_im = "http://jabber.org/protocol/xhtml-im"; +const char *ns_xhtml = "http://www.w3.org/1999/xhtml"; +const char *ns_xhtml_im = "http://jabber.org/protocol/xhtml-im"; // XEP-0077: In-Band Registration -const char* ns_register = "jabber:iq:register"; -const char* ns_register_feature = "http://jabber.org/features/iq-register"; +const char *ns_register = "jabber:iq:register"; +const char *ns_register_feature = "http://jabber.org/features/iq-register"; // XEP-0078: Non-SASL Authentication -const char* ns_auth = "jabber:iq:auth"; -const char* ns_authFeature = "http://jabber.org/features/iq-auth"; +const char *ns_auth = "jabber:iq:auth"; +const char *ns_authFeature = "http://jabber.org/features/iq-auth"; // XEP-0085: Chat State Notifications -const char* ns_chat_states = "http://jabber.org/protocol/chatstates"; +const char *ns_chat_states = "http://jabber.org/protocol/chatstates"; // XEP-0091: Legacy Delayed Delivery -const char* ns_legacy_delayed_delivery = "jabber:x:delay"; +const char *ns_legacy_delayed_delivery = "jabber:x:delay"; // XEP-0092: Software Version -const char* ns_version = "jabber:iq:version"; -const char* ns_data = "jabber:x:data"; +const char *ns_version = "jabber:iq:version"; +const char *ns_data = "jabber:x:data"; // XEP-0095: Stream Initiation -const char* ns_stream_initiation = "http://jabber.org/protocol/si"; -const char* ns_stream_initiation_file_transfer = "http://jabber.org/protocol/si/profile/file-transfer"; +const char *ns_stream_initiation = "http://jabber.org/protocol/si"; +const char *ns_stream_initiation_file_transfer = "http://jabber.org/protocol/si/profile/file-transfer"; // XEP-0108: User Activity -const char* ns_activity = "http://jabber.org/protocol/activity"; +const char *ns_activity = "http://jabber.org/protocol/activity"; // XEP-0115: Entity Capabilities -const char* ns_capabilities = "http://jabber.org/protocol/caps"; +const char *ns_capabilities = "http://jabber.org/protocol/caps"; // XEP-0118: User Tune -const char* ns_tune = "http://jabber.org/protocol/tune"; -const char* ns_tune_notify = "http://jabber.org/protocol/tune+notify"; +const char *ns_tune = "http://jabber.org/protocol/tune"; +const char *ns_tune_notify = "http://jabber.org/protocol/tune+notify"; // XEP-0136: Message Archiving -const char* ns_archive = "urn:xmpp:archive"; +const char *ns_archive = "urn:xmpp:archive"; // XEP-0138: Stream Compression -const char* ns_compress = "http://jabber.org/protocol/compress"; -const char* ns_compressFeature = "http://jabber.org/features/compress"; +const char *ns_compress = "http://jabber.org/protocol/compress"; +const char *ns_compressFeature = "http://jabber.org/features/compress"; // XEP-0145: Annotations -const char* ns_rosternotes = "storage:rosternotes"; +const char *ns_rosternotes = "storage:rosternotes"; // XEP-0153: vCard-Based Avatars -const char* ns_vcard_update = "vcard-temp:x:update"; +const char *ns_vcard_update = "vcard-temp:x:update"; // XEP-0158: CAPTCHA Forms -const char* ns_captcha = "urn:xmpp:captcha"; +const char *ns_captcha = "urn:xmpp:captcha"; // XEP-0166: Jingle -const char* ns_jingle = "urn:xmpp:jingle:1"; -const char* ns_jingle_raw_udp = "urn:xmpp:jingle:transports:raw-udp:1"; -const char* ns_jingle_ice_udp = "urn:xmpp:jingle:transports:ice-udp:1"; -const char* ns_jingle_rtp = "urn:xmpp:jingle:apps:rtp:1"; -const char* ns_jingle_rtp_audio = "urn:xmpp:jingle:apps:rtp:audio"; -const char* ns_jingle_rtp_video = "urn:xmpp:jingle:apps:rtp:video"; +const char *ns_jingle = "urn:xmpp:jingle:1"; +const char *ns_jingle_raw_udp = "urn:xmpp:jingle:transports:raw-udp:1"; +const char *ns_jingle_ice_udp = "urn:xmpp:jingle:transports:ice-udp:1"; +const char *ns_jingle_rtp = "urn:xmpp:jingle:apps:rtp:1"; +const char *ns_jingle_rtp_audio = "urn:xmpp:jingle:apps:rtp:audio"; +const char *ns_jingle_rtp_video = "urn:xmpp:jingle:apps:rtp:video"; // XEP-0184: Message Receipts -const char* ns_message_receipts = "urn:xmpp:receipts"; +const char *ns_message_receipts = "urn:xmpp:receipts"; // XEP-0198: Stream Management -const char* ns_stream_management = "urn:xmpp:sm:3"; +const char *ns_stream_management = "urn:xmpp:sm:3"; // XEP-0199: XMPP Ping -const char* ns_ping = "urn:xmpp:ping"; +const char *ns_ping = "urn:xmpp:ping"; // XEP-0202: Entity Time -const char* ns_entity_time = "urn:xmpp:time"; +const char *ns_entity_time = "urn:xmpp:time"; // XEP-0203: Delayed Delivery -const char* ns_delayed_delivery = "urn:xmpp:delay"; +const char *ns_delayed_delivery = "urn:xmpp:delay"; // XEP-0220: Server Dialback -const char* ns_server_dialback = "jabber:server:dialback"; +const char *ns_server_dialback = "jabber:server:dialback"; // XEP-0221: Data Forms Media Element -const char* ns_media_element = "urn:xmpp:media-element"; +const char *ns_media_element = "urn:xmpp:media-element"; // XEP-0224: Attention -const char* ns_attention = "urn:xmpp:attention:0"; +const char *ns_attention = "urn:xmpp:attention:0"; // XEP-0231: Bits of Binary -const char* ns_bob = "urn:xmpp:bob"; +const char *ns_bob = "urn:xmpp:bob"; // XEP-0249: Direct MUC Invitations -const char* ns_conference = "jabber:x:conference"; +const char *ns_conference = "jabber:x:conference"; // XEP-0280: Message Carbons -const char* ns_carbons = "urn:xmpp:carbons:2"; +const char *ns_carbons = "urn:xmpp:carbons:2"; // XEP-0297: Stanza Forwarding -const char* ns_forwarding = "urn:xmpp:forward:0"; +const char *ns_forwarding = "urn:xmpp:forward:0"; // XEP-0308: Last Message Correction -const char* ns_message_correct = "urn:xmpp:message-correct:0"; +const char *ns_message_correct = "urn:xmpp:message-correct:0"; // XEP-0313: Message Archive Management -const char* ns_mam = "urn:xmpp:mam:2"; +const char *ns_mam = "urn:xmpp:mam:2"; // XEP-0319: Last User Interaction in Presence -const char* ns_idle = "urn:xmpp:idle:1"; +const char *ns_idle = "urn:xmpp:idle:1"; // XEP-0333: Chat Markers -const char* ns_chat_markers = "urn:xmpp:chat-markers:0"; +const char *ns_chat_markers = "urn:xmpp:chat-markers:0"; // XEP-0334: Message Processing Hints -const char* ns_message_processing_hints = "urn:xmpp:hints"; +const char *ns_message_processing_hints = "urn:xmpp:hints"; // XEP-0352: Client State Indication -const char* ns_csi = "urn:xmpp:csi:0"; +const char *ns_csi = "urn:xmpp:csi:0"; // XEP-0357: Push Notifications -const char* ns_push = "urn:xmpp:push:0"; +const char *ns_push = "urn:xmpp:push:0"; // XEP-0359: Unique and Stable Stanza IDs -const char* ns_sid = "urn:xmpp:sid:0"; +const char *ns_sid = "urn:xmpp:sid:0"; // XEP-0363: HTTP File Upload -const char* ns_http_upload = "urn:xmpp:http:upload:0"; +const char *ns_http_upload = "urn:xmpp:http:upload:0"; // XEP-0364: Current Off-the-Record Messaging Usage -const char* ns_otr = "urn:xmpp:otr:0"; +const char *ns_otr = "urn:xmpp:otr:0"; // XEP-0367: Message Attaching -const char* ns_message_attaching = "urn:xmpp:message-attaching:1"; +const char *ns_message_attaching = "urn:xmpp:message-attaching:1"; // XEP-0369: Mediated Information eXchange (MIX) -const char* ns_mix = "urn:xmpp:mix:core:1"; -const char* ns_mix_create_channel = "urn:xmpp:mix:core:1#create-channel"; -const char* ns_mix_searchable = "urn:xmpp:mix:core:1#searchable"; -const char* ns_mix_node_messages = "urn:xmpp:mix:nodes:messages"; -const char* ns_mix_node_participants = "urn:xmpp:mix:nodes:participants"; -const char* ns_mix_node_presence = "urn:xmpp:mix:nodes:presence"; -const char* ns_mix_node_config = "urn:xmpp:mix:nodes:config"; -const char* ns_mix_node_info = "urn:xmpp:mix:nodes:info"; +const char *ns_mix = "urn:xmpp:mix:core:1"; +const char *ns_mix_create_channel = "urn:xmpp:mix:core:1#create-channel"; +const char *ns_mix_searchable = "urn:xmpp:mix:core:1#searchable"; +const char *ns_mix_node_messages = "urn:xmpp:mix:nodes:messages"; +const char *ns_mix_node_participants = "urn:xmpp:mix:nodes:participants"; +const char *ns_mix_node_presence = "urn:xmpp:mix:nodes:presence"; +const char *ns_mix_node_config = "urn:xmpp:mix:nodes:config"; +const char *ns_mix_node_info = "urn:xmpp:mix:nodes:info"; // XEP-0373: OpenPGP for XMPP -const char* ns_ox = "urn:xmpp:openpgp:0"; +const char *ns_ox = "urn:xmpp:openpgp:0"; // XEP-0380: Explicit Message Encryption -const char* ns_eme = "urn:xmpp:eme:0"; +const char *ns_eme = "urn:xmpp:eme:0"; // XEP-0382: Spoiler messages -const char* ns_spoiler = "urn:xmpp:spoiler:0"; +const char *ns_spoiler = "urn:xmpp:spoiler:0"; // XEP-0384: OMEMO Encryption -const char* ns_omemo = "eu.siacs.conversations.axolotl"; -const char* ns_omemo_1 = "urn:xmpp:omemo:1"; -const char* ns_omemo_2 = "urn:xmpp:omemo:2"; +const char *ns_omemo = "eu.siacs.conversations.axolotl"; +const char *ns_omemo_1 = "urn:xmpp:omemo:1"; +const char *ns_omemo_2 = "urn:xmpp:omemo:2"; // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements -const char* ns_mix_pam = "urn:xmpp:mix:pam:1"; -const char* ns_mix_roster = "urn:xmpp:mix:roster:0"; -const char* ns_mix_presence = "urn:xmpp:presence:0"; +const char *ns_mix_pam = "urn:xmpp:mix:pam:1"; +const char *ns_mix_roster = "urn:xmpp:mix:roster:0"; +const char *ns_mix_presence = "urn:xmpp:presence:0"; // XEP-0407: Mediated Information eXchange (MIX): Miscellaneous Capabilities -const char* ns_mix_misc = "urn:xmpp:mix:misc:0"; +const char *ns_mix_misc = "urn:xmpp:mix:misc:0"; // XEP-0428: Fallback Indication -const char* ns_fallback_indication = "urn:xmpp:fallback:0"; +const char *ns_fallback_indication = "urn:xmpp:fallback:0"; // XEP-0434: Trust Messages (TM) -const char* ns_tm = "urn:xmpp:tm:1"; +const char *ns_tm = "urn:xmpp:tm:1"; // XEP-0450: Automatic Trust Management (ATM) -const char* ns_atm = "urn:xmpp:atm:1"; +const char *ns_atm = "urn:xmpp:atm:1"; diff --git a/src/base/QXmppConstants_p.h b/src/base/QXmppConstants_p.h index 5de41f7b..7fa7afd5 100644 --- a/src/base/QXmppConstants_p.h +++ b/src/base/QXmppConstants_p.h @@ -16,171 +16,171 @@ // We mean it. // -extern const char* ns_stream; -extern const char* ns_client; -extern const char* ns_server; -extern const char* ns_roster; -extern const char* ns_tls; -extern const char* ns_sasl; -extern const char* ns_bind; -extern const char* ns_session; -extern const char* ns_stanza; -extern const char* ns_pre_approval; -extern const char* ns_rosterver; +extern const char *ns_stream; +extern const char *ns_client; +extern const char *ns_server; +extern const char *ns_roster; +extern const char *ns_tls; +extern const char *ns_sasl; +extern const char *ns_bind; +extern const char *ns_session; +extern const char *ns_stanza; +extern const char *ns_pre_approval; +extern const char *ns_rosterver; // XEP-0009: Jabber-RPC -extern const char* ns_rpc; +extern const char *ns_rpc; // XEP-0020: Feature Negotiation -extern const char* ns_feature_negotiation; +extern const char *ns_feature_negotiation; // XEP-0027: Current Jabber OpenPGP Usage -extern const char* ns_legacy_openpgp; +extern const char *ns_legacy_openpgp; // XEP-0030: Service Discovery -extern const char* ns_disco_info; -extern const char* ns_disco_items; +extern const char *ns_disco_info; +extern const char *ns_disco_items; // XEP-0033: Extended Stanza Addressing -extern const char* ns_extended_addressing; +extern const char *ns_extended_addressing; // XEP-0045: Multi-User Chat -extern const char* ns_muc; -extern const char* ns_muc_admin; -extern const char* ns_muc_owner; -extern const char* ns_muc_user; +extern const char *ns_muc; +extern const char *ns_muc_admin; +extern const char *ns_muc_owner; +extern const char *ns_muc_user; // XEP-0047: In-Band Bytestreams -extern const char* ns_ibb; +extern const char *ns_ibb; // XEP-0049: Private XML Storage -extern const char* ns_private; +extern const char *ns_private; // XEP-0054: vcard-temp -extern const char* ns_vcard; +extern const char *ns_vcard; // XEP-0059: Result Set Management -extern const char* ns_rsm; +extern const char *ns_rsm; // XEP-0060: Publish-Subscribe -extern const char* ns_pubsub; -extern const char* ns_pubsub_errors; -extern const char* ns_pubsub_event; -extern const char* ns_pubsub_owner; -extern const char* ns_pubsub_rsm; +extern const char *ns_pubsub; +extern const char *ns_pubsub_errors; +extern const char *ns_pubsub_event; +extern const char *ns_pubsub_owner; +extern const char *ns_pubsub_rsm; // XEP-0065: SOCKS5 Bytestreams -extern const char* ns_bytestreams; +extern const char *ns_bytestreams; // XEP-0066: Out of Band Data -extern const char* ns_oob; +extern const char *ns_oob; // XEP-0071: XHTML-IM -extern const char* ns_xhtml; -extern const char* ns_xhtml_im; +extern const char *ns_xhtml; +extern const char *ns_xhtml_im; // XEP-0077: In-Band Registration -extern const char* ns_register; -extern const char* ns_register_feature; +extern const char *ns_register; +extern const char *ns_register_feature; // XEP-0078: Non-SASL Authentication -extern const char* ns_auth; -extern const char* ns_authFeature; +extern const char *ns_auth; +extern const char *ns_authFeature; // XEP-0085: Chat State Notifications -extern const char* ns_chat_states; +extern const char *ns_chat_states; // XEP-0091: Legacy Delayed Delivery -extern const char* ns_legacy_delayed_delivery; +extern const char *ns_legacy_delayed_delivery; // XEP-0092: Software Version -extern const char* ns_version; -extern const char* ns_data; +extern const char *ns_version; +extern const char *ns_data; // XEP-0095: Stream Initiation -extern const char* ns_stream_initiation; -extern const char* ns_stream_initiation_file_transfer; +extern const char *ns_stream_initiation; +extern const char *ns_stream_initiation_file_transfer; // XEP-0108: User Activity -extern const char* ns_activity; +extern const char *ns_activity; // XEP-0115: Entity Capabilities -extern const char* ns_capabilities; +extern const char *ns_capabilities; // XEP-0118: User Tune -extern const char* ns_tune; -extern const char* ns_tune_notify; +extern const char *ns_tune; +extern const char *ns_tune_notify; // XEP-0136: Message Archiving -extern const char* ns_archive; +extern const char *ns_archive; // XEP-0138: Stream Compression -extern const char* ns_compress; -extern const char* ns_compressFeature; +extern const char *ns_compress; +extern const char *ns_compressFeature; // XEP-0145: Annotations -extern const char* ns_rosternotes; +extern const char *ns_rosternotes; // XEP-0153: vCard-Based Avatars -extern const char* ns_vcard_update; +extern const char *ns_vcard_update; // XEP-0158: CAPTCHA Forms -extern const char* ns_captcha; +extern const char *ns_captcha; // XEP-0166: Jingle -extern const char* ns_jingle; -extern const char* ns_jingle_ice_udp; -extern const char* ns_jingle_raw_udp; -extern const char* ns_jingle_rtp; -extern const char* ns_jingle_rtp_audio; -extern const char* ns_jingle_rtp_video; +extern const char *ns_jingle; +extern const char *ns_jingle_ice_udp; +extern const char *ns_jingle_raw_udp; +extern const char *ns_jingle_rtp; +extern const char *ns_jingle_rtp_audio; +extern const char *ns_jingle_rtp_video; // XEP-0184: Message Receipts -extern const char* ns_message_receipts; +extern const char *ns_message_receipts; // XEP-0198: Stream Management -extern const char* ns_stream_management; +extern const char *ns_stream_management; // XEP-0199: XMPP Ping -extern const char* ns_ping; +extern const char *ns_ping; // XEP-0202: Entity Time -extern const char* ns_entity_time; +extern const char *ns_entity_time; // XEP-0203: Delayed Delivery -extern const char* ns_delayed_delivery; +extern const char *ns_delayed_delivery; // XEP-0220: Server Dialback -extern const char* ns_server_dialback; +extern const char *ns_server_dialback; // XEP-0221: Data Forms Media Element -extern const char* ns_media_element; +extern const char *ns_media_element; // XEP-0224: Attention -extern const char* ns_attention; +extern const char *ns_attention; // XEP-0231: Bits of Binary -extern const char* ns_bob; +extern const char *ns_bob; // XEP-0249: Direct MUC Invitations -extern const char* ns_conference; +extern const char *ns_conference; // XEP-0280: Message Carbons -extern const char* ns_carbons; +extern const char *ns_carbons; // XEP-0297: Stanza Forwarding -extern const char* ns_forwarding; +extern const char *ns_forwarding; // XEP-0308: Last Message Correction -extern const char* ns_message_correct; +extern const char *ns_message_correct; // XEP-0313: Message Archive Management -extern const char* ns_mam; +extern const char *ns_mam; // XEP-0319: Last User Interaction in Presence -extern const char* ns_idle; +extern const char *ns_idle; // XEP-0333: Char Markers -extern const char* ns_chat_markers; +extern const char *ns_chat_markers; // XEP-0334: Message Processing Hints: -extern const char* ns_message_processing_hints; +extern const char *ns_message_processing_hints; // XEP-0352: Client State Indication -extern const char* ns_csi; +extern const char *ns_csi; // XEP-0357: Push Notifications -extern const char* ns_push; +extern const char *ns_push; // XEP-0359: Unique and Stable Stanza IDs -extern const char* ns_sid; +extern const char *ns_sid; // XEP-0363: HTTP File Upload -extern const char* ns_http_upload; +extern const char *ns_http_upload; // XEP-0364: Current Off-the-Record Messaging Usage -extern const char* ns_otr; +extern const char *ns_otr; // XEP-0367: Message Attaching -extern const char* ns_message_attaching; +extern const char *ns_message_attaching; // XEP-0369: Mediated Information eXchange (MIX) -extern const char* ns_mix; -extern const char* ns_mix_create_channel; -extern const char* ns_mix_searchable; -extern const char* ns_mix_node_messages; -extern const char* ns_mix_node_participants; -extern const char* ns_mix_node_presence; -extern const char* ns_mix_node_config; -extern const char* ns_mix_node_info; +extern const char *ns_mix; +extern const char *ns_mix_create_channel; +extern const char *ns_mix_searchable; +extern const char *ns_mix_node_messages; +extern const char *ns_mix_node_participants; +extern const char *ns_mix_node_presence; +extern const char *ns_mix_node_config; +extern const char *ns_mix_node_info; // XEP-0373: OpenPGP for XMPP -extern const char* ns_ox; +extern const char *ns_ox; // XEP-0380: Explicit Message Encryption -extern const char* ns_eme; +extern const char *ns_eme; // XEP-0382: Spoiler messages -extern const char* ns_spoiler; +extern const char *ns_spoiler; // XEP-0384: OMEMO Encryption -extern const char* ns_omemo; -extern const char* ns_omemo_1; -extern const char* ns_omemo_2; +extern const char *ns_omemo; +extern const char *ns_omemo_1; +extern const char *ns_omemo_2; // XEP-0405: Mediated Information eXchange (MIX): Participant Server Requirements -extern const char* ns_mix_pam; -extern const char* ns_mix_roster; -extern const char* ns_mix_presence; +extern const char *ns_mix_pam; +extern const char *ns_mix_roster; +extern const char *ns_mix_presence; // XEP-0407: Mediated Information eXchange (MIX): Miscellaneous Capabilities -extern const char* ns_mix_misc; +extern const char *ns_mix_misc; // XEP-0428: Fallback Indication -extern const char* ns_fallback_indication; +extern const char *ns_fallback_indication; // XEP-0434: Trust Messages (TM) -extern const char* ns_tm; +extern const char *ns_tm; // XEP-0450: Automatic Trust Management (ATM) -extern const char* ns_atm; +extern const char *ns_atm; #endif // QXMPPCONSTANTS_H diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp index af05c9b1..2b165aec 100644 --- a/src/base/QXmppDataForm.cpp +++ b/src/base/QXmppDataForm.cpp @@ -19,7 +19,8 @@ #include <QStringList> #include <QUrl> -struct field_type { +struct field_type +{ QXmppDataForm::Field::Type type; const char *str; }; diff --git a/src/base/QXmppDataFormBase.cpp b/src/base/QXmppDataFormBase.cpp index 5aacbc7c..754c13ee 100644 --- a/src/base/QXmppDataFormBase.cpp +++ b/src/base/QXmppDataFormBase.cpp @@ -194,8 +194,8 @@ void QXmppExtensibleDataFormBase::parseForm(const QXmppDataForm &form) for (const auto &field : fields) { // FORM_TYPE fields are not saved (override this function to save them) if (!parseField(field) && - !(field.type() == QXmppDataForm::Field::HiddenField && - field.key() == QStringLiteral("FORM_TYPE"))) { + !(field.type() == QXmppDataForm::Field::HiddenField && + field.key() == QStringLiteral("FORM_TYPE"))) { d->unknownFields << field; } } diff --git a/src/base/QXmppDataFormBase.h b/src/base/QXmppDataFormBase.h index 866f647c..b5751f1d 100644 --- a/src/base/QXmppDataFormBase.h +++ b/src/base/QXmppDataFormBase.h @@ -74,7 +74,8 @@ protected: } template<typename T, typename ValueConverter = T (*)(T)> - static void serializeOptional(QXmppDataForm &form, QXmppDataForm::Field::Type type, const QString &name, const std::optional<T> &optional, ValueConverter convert = [](T a) { return a; }) + static void serializeOptional( + QXmppDataForm &form, QXmppDataForm::Field::Type type, const QString &name, const std::optional<T> &optional, ValueConverter convert = [](T a) { return a; }) { if (optional.has_value()) { serializeValue(form, type, name, convert(*optional)); @@ -118,4 +119,4 @@ private: QSharedDataPointer<QXmppExtensibleDataFormBasePrivate> d; }; -#endif // QXMPPDATAFORMBASED_H +#endif // QXMPPDATAFORMBASED_H diff --git a/src/base/QXmppEntityTimeIq.h b/src/base/QXmppEntityTimeIq.h index aac9de51..1d9f5b15 100644 --- a/src/base/QXmppEntityTimeIq.h +++ b/src/base/QXmppEntityTimeIq.h @@ -37,4 +37,4 @@ private: QDateTime m_utc; }; -#endif //QXMPPENTITYTIMEIQ_H +#endif // QXMPPENTITYTIMEIQ_H diff --git a/src/base/QXmppFutureUtils_p.h b/src/base/QXmppFutureUtils_p.h index 6becf879..61a9075b 100644 --- a/src/base/QXmppFutureUtils_p.h +++ b/src/base/QXmppFutureUtils_p.h @@ -28,7 +28,8 @@ namespace QXmpp::Private { // helper for std::visit template<class... Ts> -struct overloaded : Ts... { +struct overloaded : Ts... +{ using Ts::operator()...; }; // explicit deduction guide (not needed as of C++20) @@ -42,7 +43,8 @@ template<typename F, typename Ret, typename A, typename... Rest> A lambda_helper(Ret (F::*)(A, Rest...) const); template<typename F> -struct first_argument { +struct first_argument +{ using type = decltype(lambda_helper(&F::operator())); }; @@ -70,10 +72,10 @@ void awaitLast(const QFuture<T> &future, QObject *context, Handler handler) auto *watcher = new QFutureWatcher<T>(context); QObject::connect(watcher, &QFutureWatcherBase::finished, context, [watcher, handler { std::move(handler) }]() { - auto future = watcher->future(); - handler(future.resultAt(future.resultCount() - 1)); - watcher->deleteLater(); - }); + auto future = watcher->future(); + handler(future.resultAt(future.resultCount() - 1)); + watcher->deleteLater(); + }); watcher->setFuture(future); } @@ -83,9 +85,9 @@ void await(const QFuture<T> &future, QObject *context, Handler handler) auto *watcher = new QFutureWatcher<T>(context); QObject::connect(watcher, &QFutureWatcherBase::finished, context, [watcher, handler { std::move(handler) }]() { - handler(watcher->result()); - watcher->deleteLater(); - }); + handler(watcher->result()); + watcher->deleteLater(); + }); watcher->setFuture(future); } @@ -95,9 +97,9 @@ void await(const QFuture<void> &future, QObject *context, Handler handler) auto *watcher = new QFutureWatcher<void>(context); QObject::connect(watcher, &QFutureWatcherBase::finished, context, [watcher, handler { std::move(handler) }]() { - handler(); - watcher->deleteLater(); - }); + handler(); + watcher->deleteLater(); + }); watcher->setFuture(future); } diff --git a/src/base/QXmppGlobal.h.in b/src/base/QXmppGlobal.h.in index 1ecfc554..61b2e965 100644 --- a/src/base/QXmppGlobal.h.in +++ b/src/base/QXmppGlobal.h.in @@ -77,9 +77,9 @@ namespace QXmpp { /// \since QXmpp 1.5 /// enum SceMode : uint8_t { - SceAll, ///< Processes all known elements. - ScePublic, ///< Only processes 'public' elements (e.g. needed for routing). - SceSensitive, ///< Only processes sensitive elements that should be encrypted. + SceAll, ///< Processes all known elements. + ScePublic, ///< Only processes 'public' elements (e.g. needed for routing). + SceSensitive, ///< Only processes sensitive elements that should be encrypted. }; /// @@ -100,7 +100,9 @@ inline constexpr bool operator&(SceMode mode1, SceMode mode2) /// /// \since QXmpp 1.5 /// -struct Success {}; +struct Success +{ +}; } diff --git a/src/base/QXmppMixIq.cpp b/src/base/QXmppMixIq.cpp index 11cd49ea..d137ddea 100644 --- a/src/base/QXmppMixIq.cpp +++ b/src/base/QXmppMixIq.cpp @@ -39,12 +39,12 @@ QXmppMixIq::QXmppMixIq() } /// Default copy-constructor -QXmppMixIq::QXmppMixIq(const QXmppMixIq&) = default; +QXmppMixIq::QXmppMixIq(const QXmppMixIq &) = default; QXmppMixIq::~QXmppMixIq() = default; /// Default assignment operator -QXmppMixIq& QXmppMixIq::operator=(const QXmppMixIq&) = default; +QXmppMixIq &QXmppMixIq::operator=(const QXmppMixIq &) = default; /// Returns the channel JID. It also contains a participant id for Join/ /// ClientJoin results. @@ -57,7 +57,7 @@ QString QXmppMixIq::jid() const /// Sets the channel JID. For results of Join/ClientJoin queries this also /// needs to contain a participant id. -void QXmppMixIq::setJid(const QString& jid) +void QXmppMixIq::setJid(const QString &jid) { d->jid = jid; } @@ -74,7 +74,7 @@ QString QXmppMixIq::channelName() const /// create a new channel, this can also be left empty to let the server /// generate a name. -void QXmppMixIq::setChannelName(const QString& channelName) +void QXmppMixIq::setChannelName(const QString &channelName) { d->channelName = channelName; } @@ -89,7 +89,7 @@ QStringList QXmppMixIq::nodes() const /// Sets the nodes to subscribe to. Note that for UpdateSubscription queries /// you only need to include the new subscriptions. -void QXmppMixIq::setNodes(const QStringList& nodes) +void QXmppMixIq::setNodes(const QStringList &nodes) { d->nodes = nodes; } @@ -103,7 +103,7 @@ QString QXmppMixIq::nick() const /// Sets the nickname for the channel. -void QXmppMixIq::setNick(const QString& nick) +void QXmppMixIq::setNick(const QString &nick) { d->nick = nick; } @@ -123,13 +123,13 @@ void QXmppMixIq::setActionType(QXmppMixIq::Type type) } /// \cond -bool QXmppMixIq::isMixIq(const QDomElement& element) +bool QXmppMixIq::isMixIq(const QDomElement &element) { - const QDomElement& child = element.firstChildElement(); + const QDomElement &child = element.firstChildElement(); return !child.isNull() && (child.namespaceURI() == ns_mix || child.namespaceURI() == ns_mix_pam); } -void QXmppMixIq::parseElementFromChild(const QDomElement& element) +void QXmppMixIq::parseElementFromChild(const QDomElement &element) { QDomElement child = element.firstChildElement(); // determine action type @@ -160,7 +160,7 @@ void QXmppMixIq::parseElementFromChild(const QDomElement& element) } } -void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const +void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter *writer) const { if (d->actionType == None) return; @@ -182,7 +182,7 @@ void QXmppMixIq::toXmlElementFromChild(QXmlStreamWriter* writer) const if (type() == Result) helperToXmlAddAttribute(writer, QStringLiteral("jid"), d->jid); - for (const auto& node : d->nodes) { + for (const auto &node : d->nodes) { writer->writeStartElement(QStringLiteral("subscribe")); writer->writeAttribute(QStringLiteral("node"), node); writer->writeEndElement(); diff --git a/src/base/QXmppMixItem.cpp b/src/base/QXmppMixItem.cpp index 1174fdbe..329b1cce 100644 --- a/src/base/QXmppMixItem.cpp +++ b/src/base/QXmppMixItem.cpp @@ -38,10 +38,10 @@ QXmppMixInfoItem::QXmppMixInfoItem() } /// Default copy-constructor -QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem&) = default; +QXmppMixInfoItem::QXmppMixInfoItem(const QXmppMixInfoItem &) = default; /// Default assignment operator -QXmppMixInfoItem& QXmppMixInfoItem::operator=(const QXmppMixInfoItem&) = default; +QXmppMixInfoItem &QXmppMixInfoItem::operator=(const QXmppMixInfoItem &) = default; QXmppMixInfoItem::~QXmppMixInfoItem() = default; @@ -57,7 +57,7 @@ QString QXmppMixInfoItem::name() const /// /// Sets the name of the channel. /// -void QXmppMixInfoItem::setName(const QString& name) +void QXmppMixInfoItem::setName(const QString &name) { d->name = name; } @@ -73,7 +73,7 @@ QString QXmppMixInfoItem::description() const /// /// Sets the longer channel description. /// -void QXmppMixInfoItem::setDescription(const QString& description) +void QXmppMixInfoItem::setDescription(const QString &description) { d->description = description; } @@ -89,7 +89,7 @@ QStringList QXmppMixInfoItem::contactJids() const /// /// Sets a list of public JIDs that are responsible for this channel. /// -void QXmppMixInfoItem::setContactJids(const QStringList& contactJids) +void QXmppMixInfoItem::setContactJids(const QStringList &contactJids) { d->contactJids = contactJids; } @@ -97,11 +97,11 @@ void QXmppMixInfoItem::setContactJids(const QStringList& contactJids) /// /// Returns true, if the given dom element is a MIX channel info item. /// -bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement& element) +bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement &element) { QXmppDataForm form; form.parse(element); - for (const auto& field : form.fields()) { + for (const auto &field : form.fields()) { if (field.key() == QStringLiteral("FORM_TYPE")) return field.value() == ns_mix; } @@ -109,12 +109,12 @@ bool QXmppMixInfoItem::isMixChannelInfo(const QDomElement& element) } /// \cond -void QXmppMixInfoItem::parse(const QXmppElement& element) +void QXmppMixInfoItem::parse(const QXmppElement &element) { QXmppDataForm form; form.parse(element.sourceDomElement()); - for (auto& field : form.fields()) { + for (auto &field : form.fields()) { if (field.key() == QStringLiteral("Name")) d->name = field.value().toString(); else if (field.key() == QStringLiteral("Description")) @@ -190,10 +190,10 @@ QXmppMixParticipantItem::QXmppMixParticipantItem() } /// Default copy-constructor -QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem&) = default; +QXmppMixParticipantItem::QXmppMixParticipantItem(const QXmppMixParticipantItem &) = default; /// Default assignment operator -QXmppMixParticipantItem& QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem&) = default; +QXmppMixParticipantItem &QXmppMixParticipantItem::operator=(const QXmppMixParticipantItem &) = default; QXmppMixParticipantItem::~QXmppMixParticipantItem() = default; @@ -208,7 +208,7 @@ QString QXmppMixParticipantItem::nick() const /// /// Sets the participants nickname. /// -void QXmppMixParticipantItem::setNick(const QString& nick) +void QXmppMixParticipantItem::setNick(const QString &nick) { d->nick = nick; } @@ -224,13 +224,13 @@ QString QXmppMixParticipantItem::jid() const /// /// Sets the participant's JID. /// -void QXmppMixParticipantItem::setJid(const QString& jid) +void QXmppMixParticipantItem::setJid(const QString &jid) { d->jid = jid; } /// \cond -void QXmppMixParticipantItem::parse(const QXmppElement& itemContent) +void QXmppMixParticipantItem::parse(const QXmppElement &itemContent) { d->nick = itemContent.firstChildElement(QStringLiteral("nick")).value(); d->jid = itemContent.firstChildElement(QStringLiteral("jid")).value(); @@ -259,7 +259,7 @@ QXmppElement QXmppMixParticipantItem::toElement() const /// /// Returns true, if this dom element is a MIX participant item. /// -bool QXmppMixParticipantItem::isMixParticipantItem(const QDomElement& element) +bool QXmppMixParticipantItem::isMixParticipantItem(const QDomElement &element) { return element.tagName() == QStringLiteral("participant") && element.namespaceURI() == ns_mix; } diff --git a/src/base/QXmppNonza.h b/src/base/QXmppNonza.h index 6a9584d4..03517d2b 100644 --- a/src/base/QXmppNonza.h +++ b/src/base/QXmppNonza.h @@ -21,4 +21,4 @@ public: virtual void toXml(QXmlStreamWriter *writer) const = 0; }; -#endif // QXMPPNONZA_H +#endif // QXMPPNONZA_H diff --git a/src/base/QXmppPacket.cpp b/src/base/QXmppPacket.cpp index d228b57d..f058a569 100644 --- a/src/base/QXmppPacket.cpp +++ b/src/base/QXmppPacket.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: LGPL-2.1-or-later -#include "QXmppPacket_p.h" #include "QXmppNonza.h" +#include "QXmppPacket_p.h" #include <QFuture> #include <QXmlStreamWriter> diff --git a/src/base/QXmppPubSubEvent.cpp b/src/base/QXmppPubSubEvent.cpp index 0e780903..a0809389 100644 --- a/src/base/QXmppPubSubEvent.cpp +++ b/src/base/QXmppPubSubEvent.cpp @@ -292,8 +292,8 @@ bool QXmppPubSubEventBase::isPubSubEvent(const QDomElement &stanza, std::functio bool QXmppPubSubEventBase::parseExtension(const QDomElement &eventElement, QXmpp::SceMode sceMode) { if (sceMode & QXmpp::SceSensitive && - eventElement.tagName() == QStringLiteral("event") && - eventElement.namespaceURI() == ns_pubsub_event) { + eventElement.tagName() == QStringLiteral("event") && + eventElement.namespaceURI() == ns_pubsub_event) { // check that the query type is valid const auto eventTypeElement = eventElement.firstChildElement(); if (const auto index = PUBSUB_EVENTS.indexOf(eventTypeElement.tagName()); diff --git a/src/base/QXmppPubSubMetadata.cpp b/src/base/QXmppPubSubMetadata.cpp index 09f971b9..3b5a3a0a 100644 --- a/src/base/QXmppPubSubMetadata.cpp +++ b/src/base/QXmppPubSubMetadata.cpp @@ -8,7 +8,8 @@ // helper for std::visit template<class... Ts> -struct overloaded : Ts... { +struct overloaded : Ts... +{ using Ts::operator()...; }; // explicit deduction guide (not needed as of C++20) diff --git a/src/base/QXmppPubSubMetadata.h b/src/base/QXmppPubSubMetadata.h index 9bb5a200..ac830164 100644 --- a/src/base/QXmppPubSubMetadata.h +++ b/src/base/QXmppPubSubMetadata.h @@ -15,9 +15,11 @@ class QXmppPubSubMetadataPrivate; class QXMPP_EXPORT QXmppPubSubMetadata : public QXmppExtensibleDataFormBase { public: - struct Unset { + struct Unset + { }; - struct Max { + struct Max + { }; using ItemLimit = std::variant<Unset, quint64, Max>; diff --git a/src/base/QXmppPubSubSubAuthorization.cpp b/src/base/QXmppPubSubSubAuthorization.cpp index d81acc73..9905e640 100644 --- a/src/base/QXmppPubSubSubAuthorization.cpp +++ b/src/base/QXmppPubSubSubAuthorization.cpp @@ -35,7 +35,7 @@ public: std::optional<QXmppPubSubSubAuthorization> QXmppPubSubSubAuthorization::fromDataForm(const QXmppDataForm &form) { if (auto parsed = QXmppPubSubSubAuthorization(); - QXmppDataFormBase::fromDataForm(form, parsed)) { + QXmppDataFormBase::fromDataForm(form, parsed)) { return parsed; } return std::nullopt; diff --git a/src/base/QXmppPubSubSubAuthorization.h b/src/base/QXmppPubSubSubAuthorization.h index dad820a3..fdc23b3a 100644 --- a/src/base/QXmppPubSubSubAuthorization.h +++ b/src/base/QXmppPubSubSubAuthorization.h @@ -41,4 +41,4 @@ private: QSharedDataPointer<QXmppPubSubSubAuthorizationPrivate> d; }; -#endif // QXMPPPUBSUBSUBAUTHORIZATION_H +#endif // QXMPPPUBSUBSUBAUTHORIZATION_H diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp index f3b6f75d..d0e0fa2a 100644 --- a/src/base/QXmppResultSet.cpp +++ b/src/base/QXmppResultSet.cpp @@ -65,7 +65,7 @@ QString QXmppResultSetQuery::before() const /// /// This is used for for paging backwards through results. -void QXmppResultSetQuery::setBefore(const QString& before) +void QXmppResultSetQuery::setBefore(const QString &before) { m_before = before; } @@ -83,7 +83,7 @@ QString QXmppResultSetQuery::after() const /// /// This is used for for paging forwards through results. -void QXmppResultSetQuery::setAfter(const QString& after) +void QXmppResultSetQuery::setAfter(const QString &after) { m_after = after; } @@ -96,7 +96,7 @@ bool QXmppResultSetQuery::isNull() const } /// \cond -void QXmppResultSetQuery::parse(const QDomElement& element) +void QXmppResultSetQuery::parse(const QDomElement &element) { QDomElement setElement = (element.tagName() == QStringLiteral("set")) ? element : element.firstChildElement(QStringLiteral("set")); if (setElement.namespaceURI() == ns_rsm) { @@ -112,7 +112,7 @@ void QXmppResultSetQuery::parse(const QDomElement& element) } } -void QXmppResultSetQuery::toXml(QXmlStreamWriter* writer) const +void QXmppResultSetQuery::toXml(QXmlStreamWriter *writer) const { if (isNull()) return; @@ -144,7 +144,7 @@ QString QXmppResultSetReply::first() const /// Sets the UID of the first result in the page. -void QXmppResultSetReply::setFirst(const QString& first) +void QXmppResultSetReply::setFirst(const QString &first) { m_first = first; } @@ -158,7 +158,7 @@ QString QXmppResultSetReply::last() const /// Sets the UID of the last result in the page. -void QXmppResultSetReply::setLast(const QString& last) +void QXmppResultSetReply::setLast(const QString &last) { m_last = last; } @@ -211,7 +211,7 @@ bool QXmppResultSetReply::isNull() const } /// \cond -void QXmppResultSetReply::parse(const QDomElement& element) +void QXmppResultSetReply::parse(const QDomElement &element) { QDomElement setElement = (element.tagName() == "set") ? element : element.firstChildElement("set"); if (setElement.namespaceURI() == ns_rsm) { @@ -226,7 +226,7 @@ void QXmppResultSetReply::parse(const QDomElement& element) } } -void QXmppResultSetReply::toXml(QXmlStreamWriter* writer) const +void QXmppResultSetReply::toXml(QXmlStreamWriter *writer) const { if (isNull()) return; diff --git a/src/base/QXmppSendResult.h b/src/base/QXmppSendResult.h index aa288438..eeb9bc9e 100644 --- a/src/base/QXmppSendResult.h +++ b/src/base/QXmppSendResult.h @@ -20,9 +20,9 @@ struct SendError { /// Describes the type of an error. enum Type : uint8_t { - SocketWriteError, ///< The packet was written to the socket with no success (only happens when Stream Management is disabled). - Disconnected, ///< The packet couldn't be sent because the connection hasn't been (re)established. - EncryptionError, ///< The packet couldn't be sent because prior encryption failed. + SocketWriteError, ///< The packet was written to the socket with no success (only happens when Stream Management is disabled). + Disconnected, ///< The packet couldn't be sent because the connection hasn't been (re)established. + EncryptionError, ///< The packet couldn't be sent because prior encryption failed. }; /// Text describing the error. @@ -36,7 +36,7 @@ struct SendError /// /// \since QXmpp 1.5 /// -struct SendSuccess +struct SendSuccess { /// Indicates whether the packet has been acknowledged by the other peer. bool acknowledged = false; @@ -49,4 +49,4 @@ using SendResult = std::variant<SendSuccess, SendError>; } -#endif // QXMPPSENDRESULT_H +#endif // QXMPPSENDRESULT_H diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index 54319e54..25dea1b7 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -235,8 +235,7 @@ QFuture<QXmppStream::IqResult> QXmppStream::sendIq(QXmppPacket &&packet, const Q if (id.isEmpty() || d->runningIqs.contains(id)) { return makeReadyFuture<IqResult>(QXmpp::SendError { QStringLiteral("Invalid IQ id: empty or in use."), - SendError::Disconnected - }); + SendError::Disconnected }); } auto sendFuture = send(std::move(packet)); @@ -273,8 +272,7 @@ void QXmppStream::cancelOngoingIqs() for (auto &state : d->runningIqs) { state.reportResult(QXmpp::SendError { QStringLiteral("IQ has been cancelled."), - QXmpp::SendError::Disconnected - }); + QXmpp::SendError::Disconnected }); state.reportFinished(); } d->runningIqs.clear(); diff --git a/src/base/QXmppStream.h b/src/base/QXmppStream.h index d6180baa..aba73785 100644 --- a/src/base/QXmppStream.h +++ b/src/base/QXmppStream.h @@ -9,8 +9,8 @@ #include "QXmppLogger.h" #include "QXmppSendResult.h" -#include <variant> #include <memory> +#include <variant> #include <QAbstractSocket> #include <QObject> diff --git a/src/base/QXmppStreamManagement.cpp b/src/base/QXmppStreamManagement.cpp index 47f77868..63c6e3fd 100644 --- a/src/base/QXmppStreamManagement.cpp +++ b/src/base/QXmppStreamManagement.cpp @@ -350,8 +350,7 @@ void QXmppStreamManager::handlePacketSent(QXmppPacket &packet, bool sentData) } else { packet.reportResult(QXmpp::SendError { QStringLiteral("Couldn't write data to socket. No stream management enabled."), - QXmpp::SendError::SocketWriteError - }); + QXmpp::SendError::SocketWriteError }); } packet.reportFinished(); } diff --git a/src/base/QXmppStun.cpp b/src/base/QXmppStun.cpp index fe766a33..dd031a93 100644 --- a/src/base/QXmppStun.cpp +++ b/src/base/QXmppStun.cpp @@ -1738,7 +1738,8 @@ QXmppIcePrivate::QXmppIcePrivate() tieBreaker = QXmppUtils::generateRandomBytes(8); } -struct QXmppIceTransportDetails { +struct QXmppIceTransportDetails +{ QXmppIceTransport *transport; QHostAddress stunHost; quint16 stunPort; diff --git a/src/base/QXmppUtils.h b/src/base/QXmppUtils.h index b5772c7a..455f3d96 100644 --- a/src/base/QXmppUtils.h +++ b/src/base/QXmppUtils.h @@ -25,28 +25,28 @@ class QXMPP_EXPORT QXmppUtils { public: // XEP-0082: XMPP Date and Time Profiles - static QDateTime datetimeFromString(const QString& str); - static QString datetimeToString(const QDateTime& dt); - static int timezoneOffsetFromString(const QString& str); + static QDateTime datetimeFromString(const QString &str); + static QString datetimeToString(const QDateTime &dt); + static int timezoneOffsetFromString(const QString &str); static QString timezoneOffsetToString(int secs); - static QString jidToDomain(const QString& jid); - static QString jidToResource(const QString& jid); - static QString jidToUser(const QString& jid); - static QString jidToBareJid(const QString& jid); + static QString jidToDomain(const QString &jid); + static QString jidToResource(const QString &jid); + static QString jidToUser(const QString &jid); + static QString jidToBareJid(const QString &jid); - static quint32 generateCrc32(const QByteArray& input); - static QByteArray generateHmacMd5(const QByteArray& key, const QByteArray& text); - static QByteArray generateHmacSha1(const QByteArray& key, const QByteArray& text); + static quint32 generateCrc32(const QByteArray &input); + static QByteArray generateHmacMd5(const QByteArray &key, const QByteArray &text); + static QByteArray generateHmacSha1(const QByteArray &key, const QByteArray &text); static int generateRandomInteger(int N); static QByteArray generateRandomBytes(int length); static QString generateStanzaUuid(); static QString generateStanzaHash(int length = 36); }; -void helperToXmlAddAttribute(QXmlStreamWriter* stream, const QString& name, - const QString& value); -void helperToXmlAddTextElement(QXmlStreamWriter* stream, const QString& name, - const QString& value); +void helperToXmlAddAttribute(QXmlStreamWriter *stream, const QString &name, + const QString &value); +void helperToXmlAddTextElement(QXmlStreamWriter *stream, const QString &name, + const QString &value); #endif // QXMPPUTILS_H |
