fix compilation of GuiClient

5 files changed, 14 insertions, 12 deletions

diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp
index f172383b..2c5bc000 100644
--- a/examples/GuiClient/mainDialog.cpp
+++ b/examples/GuiClient/mainDialog.cpp
@@ -347,7 +347,7 @@ chatDialog* mainDialog::getChatDialog(const QString& bareJid)
             m_chatDlgsList[bareJid]->setDisplayName(m_rosterItemModel.
                                                 getRosterItemFromBareJid(bareJid)->getName());
         else
-            m_chatDlgsList[bareJid]->setDisplayName(jidToUser(bareJid));
+            m_chatDlgsList[bareJid]->setDisplayName(QXmppUtils::jidToUser(bareJid));
 
         m_chatDlgsList[bareJid]->setQXmppClient(&m_xmppClient);
     }
@@ -364,8 +364,8 @@ void mainDialog::showChatDialog(const QString& bareJid)
 void mainDialog::messageReceived(const QXmppMessage& msg)
 {
     QString from = msg.from();
-    getChatDialog(jidToBareJid(from))->show();
-    getChatDialog(jidToBareJid(from))->messageReceived(msg.body());
+    getChatDialog(QXmppUtils::jidToBareJid(from))->show();
+    getChatDialog(QXmppUtils::jidToBareJid(from))->messageReceived(msg.body());
 }
 
 void mainDialog::statusTextChanged(const QString& status)
diff --git a/examples/GuiClient/profileDialog.cpp b/examples/GuiClient/profileDialog.cpp
index 8dbbbd58..1a06364f 100644
--- a/examples/GuiClient/profileDialog.cpp
+++ b/examples/GuiClient/profileDialog.cpp
@@ -98,14 +98,14 @@ void profileDialog::setStatusText(const QString& status)
 
 void profileDialog::versionReceived(const QXmppVersionIq& ver)
 {
-    m_versions[jidToResource(ver.from())] = ver;
+    m_versions[QXmppUtils::jidToResource(ver.from())] = ver;
     if(ver.type() == QXmppIq::Result)
         updateText();
 }
 
 void profileDialog::timeReceived(const QXmppEntityTimeIq& time)
 {
-    m_time[jidToResource(time.from())] = time;
+    m_time[QXmppUtils::jidToResource(time.from())] = time;
     if(time.type() == QXmppIq::Result)
         updateText();
 }
@@ -135,7 +135,7 @@ void profileDialog::updateText()
         {
             statusText += "<B>Time: </B>" + QString("utc=%1 [tzo=%2]").
                           arg(m_time[resource].utc().toString()).
-                          arg(timezoneOffsetToString(m_time[resource].tzo()));
+                          arg(QXmppUtils::timezoneOffsetToString(m_time[resource].tzo()));
             statusText += "<BR>";
         }
 
diff --git a/examples/GuiClient/rosterItem.cpp b/examples/GuiClient/rosterItem.cpp
index 44d62b92..1d286ca0 100644
--- a/examples/GuiClient/rosterItem.cpp
+++ b/examples/GuiClient/rosterItem.cpp
@@ -78,7 +78,7 @@ void rosterItem::setStatusType(QXmppPresence::Status::Type type)
     case QXmppPresence::Status::DND:
         icon = "red";
         break;
-    case QXmppPresence::Status::Invisible:
+    //case QXmppPresence::Status::Invisible:
     case QXmppPresence::Status::Offline:
         icon = "gray";
         break;
diff --git a/examples/GuiClient/statusWidget.cpp b/examples/GuiClient/statusWidget.cpp
index 4db28009..da5e260e 100644
--- a/examples/GuiClient/statusWidget.cpp
+++ b/examples/GuiClient/statusWidget.cpp
@@ -50,8 +50,8 @@ statusWidget::statusWidget(QWidget* parent)
     Q_ASSERT(check);
     check = connect(actionAway, SIGNAL(triggered()), SLOT(presenceMenuTriggered()));
     Q_ASSERT(check);
-    check = connect(actionInvisible, SIGNAL(triggered()), SLOT(presenceMenuTriggered()));
-    Q_ASSERT(check);
+//    check = connect(actionInvisible, SIGNAL(triggered()), SLOT(presenceMenuTriggered()));
+//    Q_ASSERT(check);
     check = connect(actionSign_out, SIGNAL(triggered()), SLOT(presenceMenuTriggered()));
     Q_ASSERT(check);
 
@@ -83,11 +83,13 @@ void statusWidget::presenceMenuTriggered()
         emit presenceStatusTypeChanged(QXmppPresence::Status::Away);
         icon = "orange";
     }
+#if 0
     else if(action == actionInvisible)
     {
         emit presenceStatusTypeChanged(QXmppPresence::Status::Invisible);
         icon = "gray";
     }
+#endif
     else if(action == actionSign_out)
     {
         emit presenceTypeChanged(QXmppPresence::Unavailable);
@@ -115,7 +117,7 @@ void statusWidget::setPresenceAndStatusType(QXmppPresence::Type presenceType,
         case QXmppPresence::Status::DND:
             icon = "red";
             break;
-        case QXmppPresence::Status::Invisible:
+        //case QXmppPresence::Status::Invisible:
         case QXmppPresence::Status::Offline:
             icon = "gray";
             break;
diff --git a/examples/GuiClient/utils.cpp b/examples/GuiClient/utils.cpp
index c74c9675..da6d6a1d 100644
--- a/examples/GuiClient/utils.cpp
+++ b/examples/GuiClient/utils.cpp
@@ -39,7 +39,7 @@ int comparisonWeightsPresenceStatusType(QXmppPresence::Status::Type statusType)
         case QXmppPresence::Status::XA:
             return 2;
         case QXmppPresence::Status::Offline:
-        case QXmppPresence::Status::Invisible:
+        //case QXmppPresence::Status::Invisible:
             return 3;
         default:
             return 5;
@@ -75,7 +75,7 @@ QString presenceToStatusText(const QXmppPresence& presence)
         {
             switch(presence.status().type())
             {
-            case QXmppPresence::Status::Invisible:
+            //case QXmppPresence::Status::Invisible:
             case QXmppPresence::Status::Offline:
                 statusText = "Offline";
                 break;