From e489c70d71ced95ba8a3a894125e11ef59554568 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Thu, 8 Sep 2016 20:38:47 +0200 Subject: clarify the fact QXmppConstants_p.h is not API --- src/base/QXmppArchiveIq.cpp | 2 +- src/base/QXmppBindIq.cpp | 2 +- src/base/QXmppByteStreamIq.cpp | 2 +- src/base/QXmppConstants.cpp | 2 +- src/base/QXmppConstants.h | 123 -------------------------------- src/base/QXmppConstants_p.h | 134 +++++++++++++++++++++++++++++++++++ src/base/QXmppDataForm.cpp | 2 +- src/base/QXmppDiscoveryIq.cpp | 2 +- src/base/QXmppEntityTimeIq.cpp | 2 +- src/base/QXmppIbbIq.cpp | 2 +- src/base/QXmppJingleIq.cpp | 2 +- src/base/QXmppMessage.cpp | 2 +- src/base/QXmppMucIq.cpp | 2 +- src/base/QXmppNonSASLAuth.cpp | 2 +- src/base/QXmppPingIq.cpp | 2 +- src/base/QXmppPresence.cpp | 2 +- src/base/QXmppPubSubIq.cpp | 2 +- src/base/QXmppRegisterIq.cpp | 2 +- src/base/QXmppResultSet.cpp | 2 +- src/base/QXmppRosterIq.cpp | 2 +- src/base/QXmppRpcIq.cpp | 2 +- src/base/QXmppSessionIq.cpp | 2 +- src/base/QXmppStanza.cpp | 2 +- src/base/QXmppStream.cpp | 2 +- src/base/QXmppStreamFeatures.cpp | 2 +- src/base/QXmppStreamInitiationIq.cpp | 2 +- src/base/QXmppVCardIq.cpp | 2 +- src/base/QXmppVersionIq.cpp | 2 +- src/base/base.pri | 2 +- 29 files changed, 161 insertions(+), 150 deletions(-) delete mode 100644 src/base/QXmppConstants.h create mode 100644 src/base/QXmppConstants_p.h (limited to 'src/base') diff --git a/src/base/QXmppArchiveIq.cpp b/src/base/QXmppArchiveIq.cpp index 6137b1fb..253496cb 100644 --- a/src/base/QXmppArchiveIq.cpp +++ b/src/base/QXmppArchiveIq.cpp @@ -24,7 +24,7 @@ #include #include "QXmppArchiveIq.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" QXmppArchiveMessage::QXmppArchiveMessage() diff --git a/src/base/QXmppBindIq.cpp b/src/base/QXmppBindIq.cpp index ac520c40..2252c791 100644 --- a/src/base/QXmppBindIq.cpp +++ b/src/base/QXmppBindIq.cpp @@ -28,7 +28,7 @@ #include "QXmppBindIq.h" #include "QXmppUtils.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" /// Returns the bound JID. /// diff --git a/src/base/QXmppByteStreamIq.cpp b/src/base/QXmppByteStreamIq.cpp index 7f22d03b..bb2f4e2a 100644 --- a/src/base/QXmppByteStreamIq.cpp +++ b/src/base/QXmppByteStreamIq.cpp @@ -24,7 +24,7 @@ #include #include "QXmppByteStreamIq.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" QString QXmppByteStreamIq::StreamHost::host() const diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp index 85b02fba..a1a62de0 100644 --- a/src/base/QXmppConstants.cpp +++ b/src/base/QXmppConstants.cpp @@ -22,7 +22,7 @@ */ -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" const char* ns_stream = "http://etherx.jabber.org/streams"; const char* ns_client = "jabber:client"; diff --git a/src/base/QXmppConstants.h b/src/base/QXmppConstants.h deleted file mode 100644 index 210f8319..00000000 --- a/src/base/QXmppConstants.h +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright (C) 2008-2014 The QXmpp developers - * - * Author: - * Manjeet Dahiya - * - * Source: - * https://github.com/qxmpp-project/qxmpp - * - * This file is a part of QXmpp library. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - */ - - -#ifndef QXMPPCONSTANTS_H -#define QXMPPCONSTANTS_H - -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; -// XEP-0009: Jabber-RPC -extern const char* ns_rpc; -// XEP-0020: Feature Negotiation -extern const char* ns_feature_negotiation; -// XEP-0030: Service Discovery -extern const char* ns_disco_info; -extern const char* ns_disco_items; -// XEP-0033: Extended Stanza 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; -// XEP-0047: In-Band Bytestreams -extern const char* ns_ibb; -// XEP-0049: Private XML Storage -extern const char* ns_private; -// XEP-0054: vcard-temp -extern const char* ns_vcard; -// XEP-0059: Result Set Management -extern const char* ns_rsm; -// XEP-0065: SOCKS5 Bytestreams -extern const char* ns_bytestreams; -// XEP-0071: XHTML-IM -extern const char *ns_xhtml_im; -// XEP-0077: In-Band Registration -extern const char* ns_register; -// XEP-0078: Non-SASL Authentication -extern const char* ns_auth; -extern const char* ns_authFeature; -// XEP-0085: Chat State Notifications -extern const char* ns_chat_states; -// XEP-0091: Legacy Delayed Delivery -extern const char* ns_legacy_delayed_delivery; -// XEP-0092: Software Version -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; -// XEP-0108: User Activity -extern const char* ns_activity; -// XEP-0115: Entity Capabilities -extern const char* ns_capabilities; -// XEP-0136: Message Archiving -extern const char* ns_archive; -// XEP-0138: Stream Compression -extern const char* ns_compress; -extern const char* ns_compressFeature; -// XEP-0145: Annotations -extern const char* ns_rosternotes; -// XEP-0153: vCard-Based Avatars -extern const char* ns_vcard_update; -// XEP-0158: CAPTCHA Forms -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; -// XEP-0184: Message Receipts -extern const char* ns_message_receipts; -// XEP-0199: XMPP Ping -extern const char* ns_ping; -// XEP-0202: Entity Time -extern const char* ns_entity_time; -// XEP-0203: Delayed Delivery -extern const char* ns_delayed_delivery; -// XEP-0220: Server Dialback -extern const char* ns_server_dialback; -// XEP-0221: Data Forms Media Element -extern const char* ns_media_element; -// XEP-0224: Attention -extern const char* ns_attention; -// XEP-0231: Bits of Binary -extern const char* ns_bob; -// XEP-0249: Direct MUC Invitations -extern const char* ns_conference; -// XEP-0280: Message Carbons -extern const char* ns_carbons; -// XEP-0333: Char Markers -extern const char* ns_chat_markers; - -#endif // QXMPPCONSTANTS_H diff --git a/src/base/QXmppConstants_p.h b/src/base/QXmppConstants_p.h new file mode 100644 index 00000000..df8e6154 --- /dev/null +++ b/src/base/QXmppConstants_p.h @@ -0,0 +1,134 @@ +/* + * Copyright (C) 2008-2014 The QXmpp developers + * + * Author: + * Manjeet Dahiya + * + * Source: + * https://github.com/qxmpp-project/qxmpp + * + * This file is a part of QXmpp library. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + */ + + +#ifndef QXMPPCONSTANTS_H +#define QXMPPCONSTANTS_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the QXmpp API. It exists for the convenience +// of the QXmppTransferManager class. This header file may change from +// version to version without notice, or even be removed. +// +// 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; +// XEP-0009: Jabber-RPC +extern const char* ns_rpc; +// XEP-0020: Feature Negotiation +extern const char* ns_feature_negotiation; +// XEP-0030: Service Discovery +extern const char* ns_disco_info; +extern const char* ns_disco_items; +// XEP-0033: Extended Stanza 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; +// XEP-0047: In-Band Bytestreams +extern const char* ns_ibb; +// XEP-0049: Private XML Storage +extern const char* ns_private; +// XEP-0054: vcard-temp +extern const char* ns_vcard; +// XEP-0059: Result Set Management +extern const char* ns_rsm; +// XEP-0065: SOCKS5 Bytestreams +extern const char* ns_bytestreams; +// XEP-0071: XHTML-IM +extern const char *ns_xhtml_im; +// XEP-0077: In-Band Registration +extern const char* ns_register; +// XEP-0078: Non-SASL Authentication +extern const char* ns_auth; +extern const char* ns_authFeature; +// XEP-0085: Chat State Notifications +extern const char* ns_chat_states; +// XEP-0091: Legacy Delayed Delivery +extern const char* ns_legacy_delayed_delivery; +// XEP-0092: Software Version +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; +// XEP-0108: User Activity +extern const char* ns_activity; +// XEP-0115: Entity Capabilities +extern const char* ns_capabilities; +// XEP-0136: Message Archiving +extern const char* ns_archive; +// XEP-0138: Stream Compression +extern const char* ns_compress; +extern const char* ns_compressFeature; +// XEP-0145: Annotations +extern const char* ns_rosternotes; +// XEP-0153: vCard-Based Avatars +extern const char* ns_vcard_update; +// XEP-0158: CAPTCHA Forms +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; +// XEP-0184: Message Receipts +extern const char* ns_message_receipts; +// XEP-0199: XMPP Ping +extern const char* ns_ping; +// XEP-0202: Entity Time +extern const char* ns_entity_time; +// XEP-0203: Delayed Delivery +extern const char* ns_delayed_delivery; +// XEP-0220: Server Dialback +extern const char* ns_server_dialback; +// XEP-0221: Data Forms Media Element +extern const char* ns_media_element; +// XEP-0224: Attention +extern const char* ns_attention; +// XEP-0231: Bits of Binary +extern const char* ns_bob; +// XEP-0249: Direct MUC Invitations +extern const char* ns_conference; +// XEP-0280: Message Carbons +extern const char* ns_carbons; +// XEP-0333: Char Markers +extern const char* ns_chat_markers; + +#endif // QXMPPCONSTANTS_H diff --git a/src/base/QXmppDataForm.cpp b/src/base/QXmppDataForm.cpp index 9894a59f..641632d4 100644 --- a/src/base/QXmppDataForm.cpp +++ b/src/base/QXmppDataForm.cpp @@ -26,7 +26,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppDataForm.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppDiscoveryIq.cpp b/src/base/QXmppDiscoveryIq.cpp index 5bf6014a..14c141cc 100644 --- a/src/base/QXmppDiscoveryIq.cpp +++ b/src/base/QXmppDiscoveryIq.cpp @@ -24,7 +24,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppDiscoveryIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppEntityTimeIq.cpp b/src/base/QXmppEntityTimeIq.cpp index 1148fb10..83bed430 100644 --- a/src/base/QXmppEntityTimeIq.cpp +++ b/src/base/QXmppEntityTimeIq.cpp @@ -26,7 +26,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" /// Returns the timezone offset in seconds. diff --git a/src/base/QXmppIbbIq.cpp b/src/base/QXmppIbbIq.cpp index d4e9f43f..62d4aab5 100644 --- a/src/base/QXmppIbbIq.cpp +++ b/src/base/QXmppIbbIq.cpp @@ -25,7 +25,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppIbbIq.h" QXmppIbbOpenIq::QXmppIbbOpenIq() : QXmppIq(QXmppIq::Set), m_block_size(1024) diff --git a/src/base/QXmppJingleIq.cpp b/src/base/QXmppJingleIq.cpp index 899509e7..8ad1d3c4 100644 --- a/src/base/QXmppJingleIq.cpp +++ b/src/base/QXmppJingleIq.cpp @@ -26,7 +26,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppJingleIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index b7e83ddf..cdccba73 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -27,7 +27,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppMessage.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppMucIq.cpp b/src/base/QXmppMucIq.cpp index 5ddfd96e..f1003434 100644 --- a/src/base/QXmppMucIq.cpp +++ b/src/base/QXmppMucIq.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppMucIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppNonSASLAuth.cpp b/src/base/QXmppNonSASLAuth.cpp index efc7ed6d..9a212d9b 100644 --- a/src/base/QXmppNonSASLAuth.cpp +++ b/src/base/QXmppNonSASLAuth.cpp @@ -25,7 +25,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppNonSASLAuth.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppPingIq.cpp b/src/base/QXmppPingIq.cpp index e2531a2b..a0278887 100644 --- a/src/base/QXmppPingIq.cpp +++ b/src/base/QXmppPingIq.cpp @@ -21,7 +21,7 @@ * */ -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppPingIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp index e518e6d7..07d0aa9e 100644 --- a/src/base/QXmppPresence.cpp +++ b/src/base/QXmppPresence.cpp @@ -27,7 +27,7 @@ #include #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" static const char* presence_types[] = { "error", diff --git a/src/base/QXmppPubSubIq.cpp b/src/base/QXmppPubSubIq.cpp index 3f311e9c..1ab6aaa0 100644 --- a/src/base/QXmppPubSubIq.cpp +++ b/src/base/QXmppPubSubIq.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppPubSubIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppRegisterIq.cpp b/src/base/QXmppRegisterIq.cpp index 80462e57..e8517c87 100644 --- a/src/base/QXmppRegisterIq.cpp +++ b/src/base/QXmppRegisterIq.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppRegisterIq.h" /// Returns the email for this registration IQ. diff --git a/src/base/QXmppResultSet.cpp b/src/base/QXmppResultSet.cpp index 364e7d0e..51635bcd 100644 --- a/src/base/QXmppResultSet.cpp +++ b/src/base/QXmppResultSet.cpp @@ -22,7 +22,7 @@ */ -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppResultSet.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppRosterIq.cpp b/src/base/QXmppRosterIq.cpp index 488e2e6e..b41dc799 100644 --- a/src/base/QXmppRosterIq.cpp +++ b/src/base/QXmppRosterIq.cpp @@ -26,7 +26,7 @@ #include #include "QXmppRosterIq.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" /// Adds an item to the roster IQ. diff --git a/src/base/QXmppRpcIq.cpp b/src/base/QXmppRpcIq.cpp index 05e065f6..f96b8d91 100644 --- a/src/base/QXmppRpcIq.cpp +++ b/src/base/QXmppRpcIq.cpp @@ -28,7 +28,7 @@ #include #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppRpcIq.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppSessionIq.cpp b/src/base/QXmppSessionIq.cpp index e4ee2aa0..f472e3f2 100644 --- a/src/base/QXmppSessionIq.cpp +++ b/src/base/QXmppSessionIq.cpp @@ -26,7 +26,7 @@ #include #include "QXmppSessionIq.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" /// \cond diff --git a/src/base/QXmppStanza.cpp b/src/base/QXmppStanza.cpp index 1e512145..99b0692e 100644 --- a/src/base/QXmppStanza.cpp +++ b/src/base/QXmppStanza.cpp @@ -26,7 +26,7 @@ #include "QXmppStanza.h" #include "QXmppUtils.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include #include diff --git a/src/base/QXmppStream.cpp b/src/base/QXmppStream.cpp index d497dbb5..9ea20856 100644 --- a/src/base/QXmppStream.cpp +++ b/src/base/QXmppStream.cpp @@ -23,7 +23,7 @@ */ -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppLogger.h" #include "QXmppStanza.h" #include "QXmppStream.h" diff --git a/src/base/QXmppStreamFeatures.cpp b/src/base/QXmppStreamFeatures.cpp index 6102eb24..322530b5 100644 --- a/src/base/QXmppStreamFeatures.cpp +++ b/src/base/QXmppStreamFeatures.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppStreamFeatures.h" QXmppStreamFeatures::QXmppStreamFeatures() diff --git a/src/base/QXmppStreamInitiationIq.cpp b/src/base/QXmppStreamInitiationIq.cpp index 926eb31a..c75bab43 100644 --- a/src/base/QXmppStreamInitiationIq.cpp +++ b/src/base/QXmppStreamInitiationIq.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppStreamInitiationIq_p.h" #include "QXmppUtils.h" diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index 448a97ca..86c01d78 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -27,7 +27,7 @@ #include "QXmppVCardIq.h" #include "QXmppUtils.h" -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" static QString getImageType(const QByteArray &contents) { diff --git a/src/base/QXmppVersionIq.cpp b/src/base/QXmppVersionIq.cpp index a6f7de26..f75cb344 100644 --- a/src/base/QXmppVersionIq.cpp +++ b/src/base/QXmppVersionIq.cpp @@ -23,7 +23,7 @@ #include -#include "QXmppConstants.h" +#include "QXmppConstants_p.h" #include "QXmppUtils.h" #include "QXmppVersionIq.h" diff --git a/src/base/base.pri b/src/base/base.pri index 88bf918b..3326d07d 100644 --- a/src/base/base.pri +++ b/src/base/base.pri @@ -4,7 +4,6 @@ INSTALL_HEADERS += \ base/QXmppBindIq.h \ base/QXmppBookmarkSet.h \ base/QXmppByteStreamIq.h \ - base/QXmppConstants.h \ base/QXmppDataForm.h \ base/QXmppDiscoveryIq.h \ base/QXmppElement.h \ @@ -39,6 +38,7 @@ INSTALL_HEADERS += \ HEADERS += \ base/QXmppCodec_p.h \ + base/QXmppConstants_p.h \ base/QXmppSasl_p.h \ base/QXmppStreamInitiationIq_p.h \ base/QXmppStun_p.h -- cgit v1.2.3