Commit 039a14a0 authored by LNJ's avatar LNJ 🖖

Message: Remove QXmpp < 1.0 compatibility code

This should have been removed earlier, but I obviously forgot that.
parent 78a41ced
Pipeline #10399 passed with stages
in 19 minutes and 3 seconds
......@@ -86,9 +86,7 @@ static bool operator==(const QXmppMessage &left, const QXmppMessage &right) {
&& left.marker() == right.marker()
&& left.isPrivate() == right.isPrivate()
&& left.isXmppStanza() == right.isXmppStanza()
#if (QXMPP_VERSION) >= QT_VERSION_CHECK(1, 0, 0)
&& left.outOfBandUrl() == right.outOfBandUrl()
#endif
&& left.replaceId() == right.replaceId();
}
......@@ -118,9 +116,6 @@ bool Message::operator==(const Message &m) const
&& m.isEdited() == isEdited()
&& m.isSent() == isSent()
&& m.isDelivered() == isDelivered()
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
&& m.outOfBandUrl() == outOfBandUrl()
#endif
&& m.mediaLocation() == mediaLocation()
&& m.mediaContentType() == mediaContentType()
&& m.mediaLastModified() == mediaLastModified()
......@@ -243,15 +238,3 @@ void Message::setSpoilerHint(const QString &spoilerHint)
{
m_spoilerHint = spoilerHint;
}
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString Message::outOfBandUrl() const
{
return m_outOfBandUrl;
}
void Message::setOutOfBandUrl(const QString &outOfBandUrl)
{
m_outOfBandUrl = outOfBandUrl;
}
#endif
......@@ -87,11 +87,6 @@ public:
QString spoilerHint() const;
void setSpoilerHint(const QString &spoilerHint);
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString outOfBandUrl() const;
void setOutOfBandUrl(const QString &outOfBandUrl);
#endif
private:
/**
* Media type of the message, e.g. a text or image.
......@@ -147,10 +142,6 @@ private:
* Hint of the spoiler message.
*/
QString m_spoilerHint;
#if (QXMPP_VERSION) < QT_VERSION_CHECK(1, 0, 0)
QString m_outOfBandUrl;
#endif
};
#endif // MESSAGE_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment