remove confusing QXmppPresence::Status::Offline

4 files changed, 1 insertions, 8 deletions

diff --git a/src/base/QXmppPresence.cpp b/src/base/QXmppPresence.cpp
index e5821068..6351bac8 100644
--- a/src/base/QXmppPresence.cpp
+++ b/src/base/QXmppPresence.cpp
@@ -307,7 +307,6 @@ void QXmppPresence::Status::setType(QXmppPresence::Status::Type type)
 
 void QXmppPresence::Status::setTypeFromStr(const QString& str)
 {
-    // FIXME: there is no keyword for Offline
     if(str == "")
         m_type = QXmppPresence::Status::Online;
     else if(str == "away")
@@ -332,9 +331,6 @@ QString QXmppPresence::Status::getTypeStr() const
     switch(m_type) {
     case QXmppPresence::Status::Online:
         return "";
-    case QXmppPresence::Status::Offline:
-        // FIXME: there is no keyword for Offline
-        return "";
     case QXmppPresence::Status::Away:
         return "away";
     case QXmppPresence::Status::XA:
diff --git a/src/base/QXmppPresence.h b/src/base/QXmppPresence.h
index a34526c4..fe6710a9 100644
--- a/src/base/QXmppPresence.h
+++ b/src/base/QXmppPresence.h
@@ -71,8 +71,7 @@ public:
         /// This enum is used to describe an availability status.
         enum Type
         {
-            Offline = 0,
-            Online,      ///< The entity or resource is online.
+            Online = 0,  ///< The entity or resource is online.
             Away,        ///< The entity or resource is temporarily away.
             XA,          ///< The entity or resource is away for an extended period.
             DND,         ///< The entity or resource is busy ("Do Not Disturb").
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index d42b4966..f9d185ad 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -341,7 +341,6 @@ void QXmppClient::disconnectFromServer()
     d->reconnectionTimer->stop();
 
     d->clientPresence.setType(QXmppPresence::Unavailable);
-    d->clientPresence.status().setType(QXmppPresence::Status::Offline);
     d->clientPresence.status().setStatusText("Logged out");
     if (d->stream->isConnected())
         sendPacket(d->clientPresence);
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index c2da19a2..ebe41887 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -398,7 +398,6 @@ QXmppPresence QXmppRosterManager::getPresence(const QString& bareJid,
     {
         QXmppPresence presence;
         presence.setType(QXmppPresence::Unavailable);
-        presence.setStatus(QXmppPresence::Status::Offline);
         return presence;
     }
 }