From 4e2ae6954c20b0b7e3a9845d2331e68695153726 Mon Sep 17 00:00:00 2001 From: 0xd34df00d <0xd34df00d@gmail.com> Date: Wed, 23 Apr 2014 16:48:18 +0400 Subject: Added operator== and != for QXmppVCardAddress. --- src/base/QXmppVCardIq.cpp | 17 +++++++++++++++++ src/base/QXmppVCardIq.h | 3 +++ 2 files changed, 20 insertions(+) (limited to 'src/base') diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index 6d9f1fdb..7701b60a 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -86,6 +86,23 @@ QXmppVCardAddress& QXmppVCardAddress::operator=(const QXmppVCardAddress &other) return *this; } +/// \brief Checks if two address objects represent the same address. + +bool operator==(const QXmppVCardAddress &left, const QXmppVCardAddress &right) +{ + return left.type() == right.type() && + left.country() == right.country() && + left.locality() == right.locality() && + left.postcode() == right.postcode() && + left.region() == right.region() && + left.street() == right.street(); +} + +bool operator!=(const QXmppVCardAddress &left, const QXmppVCardAddress &right) +{ + return !(left == right); +} + /// Returns the country. QString QXmppVCardAddress::country() const diff --git a/src/base/QXmppVCardIq.h b/src/base/QXmppVCardIq.h index cb54b91d..ae0e7efc 100644 --- a/src/base/QXmppVCardIq.h +++ b/src/base/QXmppVCardIq.h @@ -84,6 +84,9 @@ private: QSharedDataPointer d; }; +QXMPP_EXPORT bool operator==(const QXmppVCardAddress&, const QXmppVCardAddress&); +QXMPP_EXPORT bool operator!=(const QXmppVCardAddress&, const QXmppVCardAddress&); + /// \brief Represents a vCard e-mail address. class QXMPP_EXPORT QXmppVCardEmail -- cgit v1.2.3 From 721d34cf7955274d788a50ac1976b5f2577ef050 Mon Sep 17 00:00:00 2001 From: 0xd34df00d <0xd34df00d@gmail.com> Date: Wed, 23 Apr 2014 17:19:32 +0400 Subject: Equality ops for QXmppVCard{Email,Phone,Organization}. --- src/base/QXmppVCardIq.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++++ src/base/QXmppVCardIq.h | 9 +++++++++ 2 files changed, 58 insertions(+) (limited to 'src/base') diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index 7701b60a..8733256b 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -98,6 +98,8 @@ bool operator==(const QXmppVCardAddress &left, const QXmppVCardAddress &right) left.street() == right.street(); } +/// \brief Checks if two address objects represent different addresses. + bool operator!=(const QXmppVCardAddress &left, const QXmppVCardAddress &right) { return !(left == right); @@ -267,6 +269,21 @@ QXmppVCardEmail& QXmppVCardEmail::operator=(const QXmppVCardEmail &other) return *this; } +/// \brief Checks if two email objects represent the same email address. + +bool operator==(const QXmppVCardEmail &left, const QXmppVCardEmail &right) +{ + return left.type() == right.type() && + left.address() == right.address(); +} + +/// \brief Checks if two email objects represent different email addresses. + +bool operator!=(const QXmppVCardEmail &left, const QXmppVCardEmail &right) +{ + return !(left == right); +} + /// Returns the e-mail address. QString QXmppVCardEmail::address() const @@ -370,6 +387,21 @@ QString QXmppVCardPhone::number() const return d->number; } +/// \brief Checks if two phone objects represent the same phone number. + +bool operator==(const QXmppVCardPhone &left, const QXmppVCardPhone &right) +{ + return left.type() == right.type() && + left.number() == right.number(); +} + +/// \brief Checks if two phone objects represent different phone numbers. + +bool operator!=(const QXmppVCardPhone &left, const QXmppVCardPhone &right) +{ + return !(left == right); +} + /// Sets the phone \a number. void QXmppVCardPhone::setNumber(const QString &number) @@ -492,6 +524,23 @@ QXmppVCardOrganization& QXmppVCardOrganization::operator=(const QXmppVCardOrgani return *this; } +/// \brief Checks if two organization objects represent the same organization. + +bool operator==(const QXmppVCardOrganization &left, const QXmppVCardOrganization &right) +{ + return left.organization() == right.organization() && + left.unit() == right.unit() && + left.title() == right.title() && + left.role() == right.role(); +} + +/// \brief Checks if two organization objects represent different organizations. + +bool operator!=(const QXmppVCardOrganization &left, const QXmppVCardOrganization &right) +{ + return !(left == right); +} + /// Returns the name of the organization. QString QXmppVCardOrganization::organization() const diff --git a/src/base/QXmppVCardIq.h b/src/base/QXmppVCardIq.h index ae0e7efc..dc3a1f78 100644 --- a/src/base/QXmppVCardIq.h +++ b/src/base/QXmppVCardIq.h @@ -124,6 +124,9 @@ private: QSharedDataPointer d; }; +QXMPP_EXPORT bool operator==(const QXmppVCardEmail&, const QXmppVCardEmail&); +QXMPP_EXPORT bool operator!=(const QXmppVCardEmail&, const QXmppVCardEmail&); + /// \brief Represents a vCard phone number. class QXMPP_EXPORT QXmppVCardPhone @@ -169,6 +172,9 @@ private: QSharedDataPointer d; }; +QXMPP_EXPORT bool operator==(const QXmppVCardPhone&, const QXmppVCardPhone&); +QXMPP_EXPORT bool operator!=(const QXmppVCardPhone&, const QXmppVCardPhone&); + /// \brief Represents organization information in XMPP vCards. /// /// This contains both information about organization itself and @@ -204,6 +210,9 @@ private: QSharedDataPointer d; }; +QXMPP_EXPORT bool operator==(const QXmppVCardOrganization&, const QXmppVCardOrganization&); +QXMPP_EXPORT bool operator!=(const QXmppVCardOrganization&, const QXmppVCardOrganization&); + /// \brief Represents the XMPP vCard. /// /// The functions names are self explanatory. -- cgit v1.2.3 From 1db9e5ebf34895c610d97f9f61718781f7b69923 Mon Sep 17 00:00:00 2001 From: 0xd34df00d <0xd34df00d@gmail.com> Date: Wed, 23 Apr 2014 17:29:21 +0400 Subject: Added equality ops for QXmppVCardIq. --- src/base/QXmppVCardIq.cpp | 28 ++++++++++++++++++++++++++++ src/base/QXmppVCardIq.h | 3 +++ 2 files changed, 31 insertions(+) (limited to 'src/base') diff --git a/src/base/QXmppVCardIq.cpp b/src/base/QXmppVCardIq.cpp index 8733256b..4a237200 100644 --- a/src/base/QXmppVCardIq.cpp +++ b/src/base/QXmppVCardIq.cpp @@ -678,6 +678,34 @@ QXmppVCardIq& QXmppVCardIq::operator=(const QXmppVCardIq &other) return *this; } +/// \brief Checks if two VCard objects represent the same VCard. + +bool operator==(const QXmppVCardIq &left, const QXmppVCardIq &right) +{ + return left.birthday() == right.birthday() && + left.description() == right.description() && + left.email() == right.email() && + left.firstName() == right.firstName() && + left.fullName() == right.fullName() && + left.lastName() == right.lastName() && + left.middleName() == right.middleName() && + left.nickName() == right.nickName() && + left.photo() == right.photo() && + left.photoType() == right.photoType() && + left.url() == right.url() && + left.addresses() == right.addresses() && + left.emails() == right.emails() && + left.phones() == right.phones() && + left.organization() == right.organization(); +} + +/// \brief Checks if two VCard objects represent different VCards. + +bool operator!=(const QXmppVCardIq &left, const QXmppVCardIq &right) +{ + return !(left == right); +} + /// Returns the date of birth of the individual associated with the vCard. /// diff --git a/src/base/QXmppVCardIq.h b/src/base/QXmppVCardIq.h index dc3a1f78..966ff632 100644 --- a/src/base/QXmppVCardIq.h +++ b/src/base/QXmppVCardIq.h @@ -291,4 +291,7 @@ private: QSharedDataPointer d; }; +QXMPP_EXPORT bool operator==(const QXmppVCardIq&, const QXmppVCardIq&); +QXMPP_EXPORT bool operator!=(const QXmppVCardIq&, const QXmppVCardIq&); + #endif // QXMPPVCARDIQ_H -- cgit v1.2.3 From ea6996ebd746b3b704ed480ce920c201dca54d6b Mon Sep 17 00:00:00 2001 From: 0xd34df00d <0xd34df00d@gmail.com> Date: Wed, 23 Apr 2014 17:29:49 +0400 Subject: Incremented version in QXmppGlobal.h. So that we can now in the calling code that we can use newer features. --- src/base/QXmppGlobal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/base') diff --git a/src/base/QXmppGlobal.h b/src/base/QXmppGlobal.h index 52303f5f..ebddab73 100644 --- a/src/base/QXmppGlobal.h +++ b/src/base/QXmppGlobal.h @@ -52,7 +52,7 @@ /// available. /// -#define QXMPP_VERSION 0x000800 +#define QXMPP_VERSION 0x000801 QXMPP_EXPORT QString QXmppVersion(); -- cgit v1.2.3 From 1ba4eb02f5015a0fcc5d7bdce03bac62e4b0f183 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Tue, 20 May 2014 14:52:45 +0100 Subject: XEP-0333: Chat Markers --- src/base/QXmppConstants.cpp | 2 + src/base/QXmppConstants.h | 2 + src/base/QXmppMessage.cpp | 96 +++++++++++++++++ src/base/QXmppMessage.h | 18 ++++ tests/qxmppmessage/tst_qxmppmessage.cpp | 180 ++++++++++++++++++++++++++++++++ 5 files changed, 298 insertions(+) (limited to 'src/base') diff --git a/src/base/QXmppConstants.cpp b/src/base/QXmppConstants.cpp index ec314376..76098d58 100644 --- a/src/base/QXmppConstants.cpp +++ b/src/base/QXmppConstants.cpp @@ -114,3 +114,5 @@ const char* ns_attention = "urn:xmpp:attention:0"; const char* ns_bob = "urn:xmpp:bob"; // XEP-0249: Direct MUC Invitations const char* ns_conference = "jabber:x:conference"; +// XEP-0333: Chat Markers +const char* ns_chat_markers = "urn:xmpp:chat-markers:0"; diff --git a/src/base/QXmppConstants.h b/src/base/QXmppConstants.h index 85030c12..bf544159 100644 --- a/src/base/QXmppConstants.h +++ b/src/base/QXmppConstants.h @@ -115,5 +115,7 @@ extern const char* ns_attention; extern const char* ns_bob; // XEP-0249: Direct MUC Invitations extern const char* ns_conference; +// XEP-0333: Char Markers +extern const char* ns_chat_markers; #endif // QXMPPCONSTANTS_H diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index e32465b7..c4743b98 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -48,6 +48,13 @@ static const char* message_types[] = { "headline" }; +static const char* marker_types[] = { + "", + "received", + "displayed", + "acknowledged" +}; + static const char *ns_xhtml = "http://www.w3.org/1999/xhtml"; enum StampType @@ -80,6 +87,12 @@ public: QString mucInvitationJid; QString mucInvitationPassword; QString mucInvitationReason; + + // XEP-0333: Chat Markers + bool markable; + QXmppMessage::Marker marker; + QString markedId; + QString markedThread; }; /// Constructs a QXmppMessage. @@ -101,6 +114,9 @@ QXmppMessage::QXmppMessage(const QString& from, const QString& to, const d->body = body; d->thread = thread; d->receiptRequested = false; + + d->markable = false; + d->marker = NoMarker; } /// Constructs a copy of \a other. @@ -363,6 +379,40 @@ namespace } } +bool QXmppMessage::isMarkable() const +{ + return d->markable; +} + +void QXmppMessage::setMarkable(const bool markable) +{ + d->markable = markable; +} + +QXmppMessage::Marker QXmppMessage::marker() const +{ + return d->marker; +} + +QString QXmppMessage::markedId() const +{ + return d->markedId; +} + +QString QXmppMessage::markedThread() const +{ + return d->markedThread; +} + +void QXmppMessage::setMarker(const Marker marker, + const QString& id, + const QString& thread) +{ + d->marker = marker; + d->markedId = id; + d->markedThread = thread; +} + /// \cond void QXmppMessage::parse(const QDomElement &element) { @@ -433,6 +483,36 @@ void QXmppMessage::parse(const QDomElement &element) // XEP-0224: Attention d->attentionRequested = element.firstChildElement("attention").namespaceURI() == ns_attention; + // XEP-0333: Chat Markers + QDomElement markableElement = element.firstChildElement("markable"); + if (!markableElement.isNull()) + { + d->markable = true; + } + // check for all the marker types + QDomElement chatStateElement; + QXmppMessage::Marker marker = QXmppMessage::NoMarker; + for (int i = Received; i <= Acknowledged; i++) + { + chatStateElement = element.firstChildElement(marker_types[i]); + if (!chatStateElement.isNull() && + chatStateElement.namespaceURI() == ns_chat_markers) + { + marker = static_cast(i); + break; + } + } + // if marker is present, check it's the right ns + if (!chatStateElement.isNull()) + { + if (chatStateElement.namespaceURI() == ns_chat_markers) + { + d->marker = marker; + d->markedId = chatStateElement.attribute("id", QString()); + d->markedThread = chatStateElement.attribute("thread", QString()); + } + } + const QList > &knownElems = knownMessageSubelems(); QXmppElementList extensions; @@ -555,6 +635,22 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const xmlWriter->writeEndElement(); } + // XEP-0333: Chat Markers + if (d->markable) { + xmlWriter->writeStartElement("markable"); + xmlWriter->writeAttribute("xmlns", ns_chat_markers); + xmlWriter->writeEndElement(); + } + if (d->marker != NoMarker) { + xmlWriter->writeStartElement(marker_types[d->marker]); + xmlWriter->writeAttribute("xmlns", ns_chat_markers); + xmlWriter->writeAttribute("id", d->markedId); + if (!d->markedThread.isNull() && !d->markedThread.isEmpty()) { + xmlWriter->writeAttribute("thread", d->markedThread); + } + xmlWriter->writeEndElement(); + } + // other extensions QXmppStanza::extensionsToXml(xmlWriter); diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index e927a85c..193ac6d2 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -60,8 +60,18 @@ public: Paused, ///< User had been composing but now has stopped. }; + /// This enum describes a chat marker as defined by + /// XEP-0333 : Char Markers + enum Marker { + NoMarker = 0, + Received, + Displayed, + Acknowledged + }; + QXmppMessage(const QString& from = QString(), const QString& to = QString(), const QString& body = QString(), const QString& thread = QString()); + QXmppMessage(const QXmppMessage &other); ~QXmppMessage(); @@ -106,6 +116,14 @@ public: QString xhtml() const; void setXhtml(const QString &xhtml); + // XEP-0333 + bool isMarkable() const; + void setMarkable(const bool); + Marker marker() const; + QString markedId() const; + QString markedThread() const; + void setMarker(const Marker, const QString& id, const QString& thread = QString()); + /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index 218ff962..d97f45c6 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -43,6 +43,7 @@ private slots: void testState(); void testXhtml(); void testSubextensions(); + void testChatMarkers(); }; void tst_QXmppMessage::testBasic_data() @@ -331,5 +332,184 @@ void tst_QXmppMessage::testSubextensions() serializePacket(message, xml); } +void tst_QXmppMessage::testChatMarkers() +{ + const QByteArray markableXml( + "" + "sleeping" + "My lord, dispatch; read o'er these articles." + "" + ""); + + QXmppMessage markableMessage; + parsePacket(markableMessage, markableXml); + QCOMPARE(markableMessage.isMarkable(), true); + QCOMPARE(markableMessage.marker(), QXmppMessage::NoMarker); + QCOMPARE(markableMessage.id(), QString("message-1")); + QCOMPARE(markableMessage.markedId(), QString()); + QCOMPARE(markableMessage.thread(), QString("sleeping")); + QCOMPARE(markableMessage.markedThread(), QString()); + + const QByteArray receivedXml( + "" + "" + ""); + + QXmppMessage receivedMessage; + parsePacket(receivedMessage, receivedXml); + QCOMPARE(receivedMessage.isMarkable(), false); + QCOMPARE(receivedMessage.marker(), QXmppMessage::Received); + QCOMPARE(receivedMessage.id(), QString("message-2")); + QCOMPARE(receivedMessage.markedId(), QString("message-1")); + QCOMPARE(receivedMessage.thread(), QString()); + QCOMPARE(receivedMessage.markedThread(), QString("sleeping")); + + const QByteArray displayedXml( + "" + "" + ""); + + QXmppMessage displayedMessage; + parsePacket(displayedMessage, displayedXml); + QCOMPARE(displayedMessage.isMarkable(), false); + QCOMPARE(displayedMessage.marker(), QXmppMessage::Displayed); + QCOMPARE(displayedMessage.id(), QString("message-2")); + QCOMPARE(displayedMessage.markedId(), QString("message-1")); + QCOMPARE(displayedMessage.thread(), QString()); + QCOMPARE(displayedMessage.markedThread(), QString("sleeping")); + + const QByteArray acknowledgedXml( + "" + "" + ""); + + QXmppMessage acknowledgedMessage; + parsePacket(acknowledgedMessage, acknowledgedXml); + QCOMPARE(acknowledgedMessage.isMarkable(), false); + QCOMPARE(acknowledgedMessage.marker(), QXmppMessage::Acknowledged); + QCOMPARE(acknowledgedMessage.id(), QString("message-2")); + QCOMPARE(acknowledgedMessage.markedId(), QString("message-1")); + QCOMPARE(acknowledgedMessage.thread(), QString()); + QCOMPARE(acknowledgedMessage.markedThread(), QString("sleeping")); + + const QByteArray emptyThreadXml( + "" + "" + ""); + + QXmppMessage emptyThreadMessage; + parsePacket(emptyThreadMessage, emptyThreadXml); + QCOMPARE(emptyThreadMessage.isMarkable(), false); + QCOMPARE(emptyThreadMessage.marker(), QXmppMessage::Received); + QCOMPARE(emptyThreadMessage.id(), QString("message-2")); + QCOMPARE(emptyThreadMessage.markedId(), QString("message-1")); + QCOMPARE(emptyThreadMessage.thread(), QString()); + QCOMPARE(emptyThreadMessage.markedThread(), QString()); + + const QByteArray notMarkableSerialisation( + ""); + + QXmppMessage serialisationMessage; + serialisationMessage.setFrom("kingrichard@royalty.england.lit/throne"); + serialisationMessage.setTo("northumberland@shakespeare.lit/westminster"); + serialisationMessage.setId("message-3"); + serialisationMessage.setMarkable(false); + serializePacket(serialisationMessage, notMarkableSerialisation); + + const QByteArray markableSerialisation( + "" + "" + ""); + + serialisationMessage.setMarkable(true); + serializePacket(serialisationMessage, markableSerialisation); + + const QByteArray receivedSerialisation( + "" + "" + ""); + + serialisationMessage.setMarkable(false); + serialisationMessage.setMarker(QXmppMessage::Received, "message-2"); + serializePacket(serialisationMessage, receivedSerialisation); + + const QByteArray receivedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Received, "message-2", "sleeping"); + serializePacket(serialisationMessage, receivedThreadSerialisation); + + const QByteArray displayedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Displayed, "message-2", "sleeping"); + serializePacket(serialisationMessage, displayedThreadSerialisation); + + const QByteArray acknowledgedThreadSerialisation( + "" + "" + ""); + + serialisationMessage.setMarker(QXmppMessage::Acknowledged, "message-2", "sleeping"); + serializePacket(serialisationMessage, acknowledgedThreadSerialisation); +} + QTEST_MAIN(tst_QXmppMessage) #include "tst_qxmppmessage.moc" -- cgit v1.2.3 From 599cf81e6a785d8c748db375f9959547392e4467 Mon Sep 17 00:00:00 2001 From: Juan Aragon Date: Wed, 21 May 2014 16:09:23 +0100 Subject: XEP-0333 updated: -Methods documented -Symmetrical getters/setters -Unit tests updated --- src/base/QXmppMessage.cpp | 48 ++++++++++++++++++++++++++------- src/base/QXmppMessage.h | 11 +++++--- tests/qxmppmessage/tst_qxmppmessage.cpp | 15 ++++++++--- 3 files changed, 58 insertions(+), 16 deletions(-) (limited to 'src/base') diff --git a/src/base/QXmppMessage.cpp b/src/base/QXmppMessage.cpp index c4743b98..4bdc6329 100644 --- a/src/base/QXmppMessage.cpp +++ b/src/base/QXmppMessage.cpp @@ -379,38 +379,68 @@ namespace } } +/// Returns true if a message is markable, as defined +/// XEP-0333: Chat Markers. + bool QXmppMessage::isMarkable() const { return d->markable; } +/// Sets if the message is markable, as defined +/// XEP-0333: Chat Markers. + void QXmppMessage::setMarkable(const bool markable) { d->markable = markable; } -QXmppMessage::Marker QXmppMessage::marker() const -{ - return d->marker; -} +/// Returns the message's marker id, as defined +/// XEP-0333: Chat Markers. QString QXmppMessage::markedId() const { return d->markedId; } +/// Sets the message's marker id, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkerId(const QString &markerId) +{ + d->markedId = markerId; +} + +/// Returns the message's marker thread, as defined +/// XEP-0333: Chat Markers. + QString QXmppMessage::markedThread() const { return d->markedThread; } -void QXmppMessage::setMarker(const Marker marker, - const QString& id, - const QString& thread) +/// Sets the message's marked thread, as defined +/// XEP-0333: Chat Markers. + +void QXmppMessage::setMarkedThread(const QString &markedThread) +{ + d->markedThread = markedThread; +} + +/// Returns the message's marker, as defined +/// XEP-0333: Chat Markers. + +QXmppMessage::Marker QXmppMessage::marker() const +{ + return d->marker; +} + +/// Sets the message's marker, as defined +/// XEP-0333: Chat Markers + +void QXmppMessage::setMarker(const Marker marker) { d->marker = marker; - d->markedId = id; - d->markedThread = thread; } /// \cond diff --git a/src/base/QXmppMessage.h b/src/base/QXmppMessage.h index 193ac6d2..119dba3e 100644 --- a/src/base/QXmppMessage.h +++ b/src/base/QXmppMessage.h @@ -119,11 +119,16 @@ public: // XEP-0333 bool isMarkable() const; void setMarkable(const bool); - Marker marker() const; + QString markedId() const; + void setMarkerId(const QString&); + QString markedThread() const; - void setMarker(const Marker, const QString& id, const QString& thread = QString()); - + void setMarkedThread(const QString&); + + Marker marker() const; + void setMarker(const Marker); + /// \cond void parse(const QDomElement &element); void toXml(QXmlStreamWriter *writer) const; diff --git a/tests/qxmppmessage/tst_qxmppmessage.cpp b/tests/qxmppmessage/tst_qxmppmessage.cpp index d97f45c6..1ec4f18b 100644 --- a/tests/qxmppmessage/tst_qxmppmessage.cpp +++ b/tests/qxmppmessage/tst_qxmppmessage.cpp @@ -465,7 +465,8 @@ void tst_QXmppMessage::testChatMarkers() ""); serialisationMessage.setMarkable(false); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); serializePacket(serialisationMessage, receivedSerialisation); const QByteArray receivedThreadSerialisation( @@ -479,7 +480,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Received, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Received); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, receivedThreadSerialisation); const QByteArray displayedThreadSerialisation( @@ -493,7 +496,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Displayed, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Displayed); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, displayedThreadSerialisation); const QByteArray acknowledgedThreadSerialisation( @@ -507,7 +512,9 @@ void tst_QXmppMessage::testChatMarkers() "thread=\"sleeping\"/>" ""); - serialisationMessage.setMarker(QXmppMessage::Acknowledged, "message-2", "sleeping"); + serialisationMessage.setMarker(QXmppMessage::Acknowledged); + serialisationMessage.setMarkerId("message-2"); + serialisationMessage.setMarkedThread("sleeping"); serializePacket(serialisationMessage, acknowledgedThreadSerialisation); } -- cgit v1.2.3