diff options
| author | Linus Jahn <lnj@kaidan.im> | 2023-05-09 22:22:54 +0200 |
|---|---|---|
| committer | Linus Jahn <lnj@kaidan.im> | 2023-05-14 23:58:01 +0200 |
| commit | 8fc2225897de24f29bc3c36383cf97d5dc89a719 (patch) | |
| tree | b45889892915f08e06b42d2046c81b3da9aca3c4 /src/base | |
| parent | eab17404ecccc6719decb7e8846d9c8e75e917c1 (diff) | |
| download | qxmpp-8fc2225897de24f29bc3c36383cf97d5dc89a719.tar.gz | |
Jingle: Remove namespaceUri attribute
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/QXmppJingleData.cpp | 30 | ||||
| -rw-r--r-- | src/base/QXmppJingleData.h | 3 |
2 files changed, 1 insertions, 32 deletions
diff --git a/src/base/QXmppJingleData.cpp b/src/base/QXmppJingleData.cpp index 78cd4017..ec926556 100644 --- a/src/base/QXmppJingleData.cpp +++ b/src/base/QXmppJingleData.cpp @@ -1023,7 +1023,6 @@ public: QString m_text; QXmppJingleReason::Type m_type; QXmppJingleReason::RtpErrorCondition m_rtpErrorCondition; - QString m_namespaceUri; }; QXmppJingleIqReasonPrivate::QXmppJingleIqReasonPrivate() @@ -1104,22 +1103,6 @@ void QXmppJingleReason::setRtpErrorCondition(RtpErrorCondition rtpErrorCondition d->m_rtpErrorCondition = rtpErrorCondition; } -/// -/// Returns the namespace URI of a reason element. -/// -QString QXmppJingleReason::namespaceUri() const -{ - return d->m_namespaceUri; -} - -/// -/// Sets the namespace URI of a reason element. -/// -void QXmppJingleReason::setNamespaceUri(const QString &namespaceUri) -{ - d->m_namespaceUri = namespaceUri; -} - /// \cond void QXmppJingleReason::parse(const QDomElement &element) { @@ -1142,10 +1125,6 @@ void QXmppJingleReason::parse(const QDomElement &element) break; } } - - if (!element.namespaceURI().isEmpty() && !element.parentNode().isNull() && element.parentNode().namespaceURI() != element.namespaceURI()) { - d->m_namespaceUri = element.namespaceURI(); - } } void QXmppJingleReason::toXml(QXmlStreamWriter *writer) const @@ -1155,10 +1134,7 @@ void QXmppJingleReason::toXml(QXmlStreamWriter *writer) const } writer->writeStartElement(QStringLiteral("reason")); - - if (!d->m_namespaceUri.isEmpty()) { - writer->writeDefaultNamespace(d->m_namespaceUri); - } + writer->writeDefaultNamespace(ns_jingle); if (!d->m_text.isEmpty()) { helperToXmlAddTextElement(writer, QStringLiteral("text"), d->m_text); @@ -3090,10 +3066,6 @@ std::optional<QXmppJingleReason> QXmppJingleMessageInitiationElement::reason() c void QXmppJingleMessageInitiationElement::setReason(std::optional<QXmppJingleReason> reason) { d->reason = reason; - - if (d->reason) { - d->reason->setNamespaceUri(ns_jingle); - } } /// diff --git a/src/base/QXmppJingleData.h b/src/base/QXmppJingleData.h index 82ef8c00..997eb3c3 100644 --- a/src/base/QXmppJingleData.h +++ b/src/base/QXmppJingleData.h @@ -384,9 +384,6 @@ public: RtpErrorCondition rtpErrorCondition() const; void setRtpErrorCondition(RtpErrorCondition rtpErrorCondition); - QString namespaceUri() const; - void setNamespaceUri(const QString &namespaceUri); - /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; |