From b5df32d8c9b3ce2f866f0fae729b08d0976553a6 Mon Sep 17 00:00:00 2001 From: Jeremy Lainé Date: Wed, 12 Sep 2012 22:43:17 +0200 Subject: minimum maintenance to get guiclient to compile --- examples/GuiClient/mainDialog.cpp | 5 +---- examples/GuiClient/rosterItem.cpp | 4 +--- examples/GuiClient/statusWidget.cpp | 3 +-- examples/GuiClient/utils.cpp | 6 ++---- 4 files changed, 5 insertions(+), 13 deletions(-) (limited to 'examples/GuiClient') diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp index c0b87469..0312fc48 100644 --- a/examples/GuiClient/mainDialog.cpp +++ b/examples/GuiClient/mainDialog.cpp @@ -389,10 +389,7 @@ void mainDialog::presenceTypeChanged(QXmppPresence::Type presenceType) void mainDialog::presenceStatusTypeChanged(QXmppPresence::Status::Type statusType) { QXmppPresence presence = m_xmppClient.clientPresence(); - if(statusType == QXmppPresence::Status::Offline) - presence.setType(QXmppPresence::Unavailable); - else - presence.setType(QXmppPresence::Available); + presence.setType(QXmppPresence::Available); presence.status().setType(statusType); addPhotoHash(presence); m_xmppClient.setClientPresence(presence); diff --git a/examples/GuiClient/rosterItem.cpp b/examples/GuiClient/rosterItem.cpp index c84f27af..5932ba51 100644 --- a/examples/GuiClient/rosterItem.cpp +++ b/examples/GuiClient/rosterItem.cpp @@ -27,7 +27,6 @@ rosterItem::rosterItem(const QString& bareJid) //: QStandardItem(bareJid) { - setStatusType(QXmppPresence::Status::Offline); setStatusText("Offline"); } @@ -78,8 +77,7 @@ void rosterItem::setStatusType(QXmppPresence::Status::Type type) case QXmppPresence::Status::DND: icon = "red"; break; - //case QXmppPresence::Status::Invisible: - case QXmppPresence::Status::Offline: + case QXmppPresence::Status::Invisible: icon = "gray"; break; } diff --git a/examples/GuiClient/statusWidget.cpp b/examples/GuiClient/statusWidget.cpp index bf84b3d3..5345707e 100644 --- a/examples/GuiClient/statusWidget.cpp +++ b/examples/GuiClient/statusWidget.cpp @@ -117,8 +117,7 @@ void statusWidget::setPresenceAndStatusType(QXmppPresence::Type presenceType, case QXmppPresence::Status::DND: icon = "red"; break; - //case QXmppPresence::Status::Invisible: - case QXmppPresence::Status::Offline: + case QXmppPresence::Status::Invisible: icon = "gray"; break; } diff --git a/examples/GuiClient/utils.cpp b/examples/GuiClient/utils.cpp index 412dd92e..efc209e4 100644 --- a/examples/GuiClient/utils.cpp +++ b/examples/GuiClient/utils.cpp @@ -38,8 +38,7 @@ int comparisonWeightsPresenceStatusType(QXmppPresence::Status::Type statusType) case QXmppPresence::Status::Away: case QXmppPresence::Status::XA: return 2; - case QXmppPresence::Status::Offline: - //case QXmppPresence::Status::Invisible: + case QXmppPresence::Status::Invisible: return 3; default: return 5; @@ -75,8 +74,7 @@ QString presenceToStatusText(const QXmppPresence& presence) { switch(presence.status().type()) { - //case QXmppPresence::Status::Invisible: - case QXmppPresence::Status::Offline: + case QXmppPresence::Status::Invisible: statusText = "Offline"; break; case QXmppPresence::Status::Online: -- cgit v1.2.3