add simpler accessors for QXmppPresence priority / statusText

3 files changed, 43 insertions, 2 deletions

diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index 6351bac8..780ec532 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -51,6 +51,36 @@ QXmppPresence::~QXmppPresence()
 
 }
 
+/// Returns the priority level of the resource.
+
+int QXmppPresence::priority() const
+{
+    return m_status.priority();
+}
+
+/// Sets the \a priority level of the resource.
+
+void QXmppPresence::setPriority(int priority)
+{
+    m_status.setPriority(priority);
+}
+
+/// Returns the status text, a textual description of the user's status.
+
+QString QXmppPresence::statusText() const
+{
+    return m_status.statusText();
+}
+
+/// Sets the status text, a textual description of the user's status.
+///
+/// \param str The status text, for example "Gone fishing".
+
+void QXmppPresence::setStatusText(const QString& statusText)
+{
+    m_status.setStatusText(statusText);
+}
+
 /// Returns the presence type.
 ///
 /// You can use this method to determine the action which needs to be
diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h
index fe6710a9..e327a75b 100644
--- a/src/base/QXmppPresence.h
+++ b/src/base/QXmppPresence.h
@@ -109,6 +109,9 @@ public:
         const QXmppPresence::Status& status = QXmppPresence::Status());
     ~QXmppPresence();
 
+    int priority() const;
+    void setPriority(int priority);
+
     QXmppPresence::Type type() const;
     void setType(QXmppPresence::Type);
 
@@ -116,6 +119,9 @@ public:
     const QXmppPresence::Status& status() const;
     void setStatus(const QXmppPresence::Status&);
 
+    QString statusText() const;
+    void setStatusText(const QString& statusText);
+
     /// \cond
     void parse(const QDomElement &element);
     void toXml(QXmlStreamWriter *writer) const;
diff --git a/tests/presence.cpp b/tests/presence.cpp
index e134b30b..a9235d66 100644
--- a/tests/presence.cpp
+++ b/tests/presence.cpp
@@ -76,11 +76,16 @@ void tst_QXmppPresence::testPresence()
     QXmppPresence presence;
     parsePacket(presence, xml);
     QCOMPARE(int(presence.type()), type);
-    QCOMPARE(presence.status().priority(), priority);
+    QCOMPARE(presence.priority(), priority);
     QCOMPARE(int(presence.status().type()), statusType);
-    QCOMPARE(presence.status().statusText(), statusText);
+    QCOMPARE(presence.statusText(), statusText);
     QCOMPARE(int(presence.vCardUpdateType()), vcardUpdate);
     QCOMPARE(presence.photoHash(), photoHash);
+
+    // legacy
+    QCOMPARE(presence.status().priority(), priority);
+    QCOMPARE(presence.status().statusText(), statusText);
+
     serializePacket(presence, xml);
 }