deprecate QXmppPresence::Status

5 files changed, 24 insertions, 16 deletions

diff --git a/CHANGELOG b/CHANGELOG
index dba7dcd5..e326a79e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -7,6 +7,9 @@ QXmpp 0.6.2 (UNRELEASED)
   - Improve SASL code test coverage.
   - Improve QXmppMessage test coverage.
   - Add a "reason" argument to QXmppRosterManager's subscription methods.
+  - Refactor QXmppPresence:
+    * add availableStatusType(), priority(), statusText()
+    * deprecate QXmppPresence::Status
 
 QXmpp 0.6.1 (Jul 20, 2012)
 --------------------------
diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index ac6b715b..ee07d47f 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -32,7 +32,12 @@
 /// Constructs a QXmppPresence.
 ///
 /// \param type
-/// \param status
+
+QXmppPresence::QXmppPresence(QXmppPresence::Type type)
+    : m_type(type),
+    m_vCardUpdateType(VCardUpdateNone)
+{
+}
 
 QXmppPresence::QXmppPresence(QXmppPresence::Type type,
                              const QXmppPresence::Status& status)
@@ -41,7 +46,6 @@ QXmppPresence::QXmppPresence(QXmppPresence::Type type,
     m_status(status),
     m_vCardUpdateType(VCardUpdateNone)
 {
-
 }
 
 /// Destroys a QXmppPresence.
@@ -58,7 +62,7 @@ QXmppPresence::~QXmppPresence()
 
 QXmppPresence::AvailableStatusType QXmppPresence::availableStatusType() const
 {
-    return static_cast<AvailableStatusType>(m_status.type());
+    return static_cast<QXmppPresence::AvailableStatusType>(m_status.type());
 }
 
 /// Sets the availability status type, for instance busy or away.
diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h
index be80ceb0..414bed63 100644
--- a/src/base/QXmppPresence.h
+++ b/src/base/QXmppPresence.h
@@ -71,11 +71,8 @@ public:
 /// (empty photo element) and mere support for the protocol (empty update child).
     };
 
-    /// \brief The QXmppPresence::Status class represents the status of an XMPP entity.
-    ///
-    /// It stores information such as the "away", "busy" status of a user, or
-    /// a human-readable description.
-
+    /// \cond
+    // Deprecated since 0.7.0
     class QXMPP_EXPORT Status
     {
     public:
@@ -102,10 +99,8 @@ public:
         int priority() const;
         void setPriority(int);
 
-        /// \cond
         void parse(const QDomElement &element);
         void toXml(QXmlStreamWriter *writer) const;
-        /// \endcond
 
     private:
         QString getTypeStr() const;
@@ -116,8 +111,13 @@ public:
         int m_priority;
     };
 
-    QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available,
-        const QXmppPresence::Status& status = QXmppPresence::Status());
+    Q_DECL_DEPRECATED QXmppPresence(QXmppPresence::Type type, const QXmppPresence::Status& status);
+    QXmppPresence::Status Q_DECL_DEPRECATED &status();
+    const QXmppPresence::Status Q_DECL_DEPRECATED &status() const;
+    void Q_DECL_DEPRECATED setStatus(const QXmppPresence::Status&);
+    /// \endcond
+
+    QXmppPresence(QXmppPresence::Type type = QXmppPresence::Available);
     ~QXmppPresence();
 
     AvailableStatusType availableStatusType() const;
@@ -129,10 +129,6 @@ public:
     QXmppPresence::Type type() const;
     void setType(QXmppPresence::Type);
 
-    QXmppPresence::Status& status();
-    const QXmppPresence::Status& status() const;
-    void setStatus(const QXmppPresence::Status&);
-
     QString statusText() const;
     void setStatusText(const QString& statusText);
 
diff --git a/tests/presence.cpp b/tests/presence.cpp
index ce7168a6..de9bdfda 100644
--- a/tests/presence.cpp
+++ b/tests/presence.cpp
@@ -29,6 +29,8 @@
 
 void tst_QXmppPresence::testPresence_data()
 {
+    QXmppPresence foo;
+
     QTest::addColumn<QByteArray>("xml");
     QTest::addColumn<int>("type");
     QTest::addColumn<int>("priority");
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 46e04aab..bf394d8e 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -1190,6 +1190,9 @@ int main(int argc, char *argv[])
 {
     QCoreApplication app(argc, argv);
 
+    QXmppPresence pres;
+    pres.availableStatusType();
+
     // run tests
     int errors = 0;