stop using deprecated methods

10 files changed, 49 insertions, 49 deletions

diff --git a/examples/GuiClient/mainDialog.cpp b/examples/GuiClient/mainDialog.cpp
index 0312fc48..62dcf42f 100644
--- a/examples/GuiClient/mainDialog.cpp
+++ b/examples/GuiClient/mainDialog.cpp
@@ -141,8 +141,8 @@ mainDialog::mainDialog(QWidget *parent): QDialog(parent, Qt::Window),
                     SLOT(presenceTypeChanged(QXmppPresence::Type)));
     Q_ASSERT(check);
     check = connect(&m_statusWidget,
-                    SIGNAL(presenceStatusTypeChanged(QXmppPresence::Status::Type)),
-                    SLOT(presenceStatusTypeChanged(QXmppPresence::Status::Type)));
+                    SIGNAL(presenceStatusTypeChanged(QXmppPresence::AvailableStatusType)),
+                    SLOT(presenceStatusTypeChanged(QXmppPresence::AvailableStatusType)));
     Q_ASSERT(check);
     check = connect(&m_statusWidget,
                     SIGNAL(avatarChanged(QImage)),
@@ -363,7 +363,7 @@ void mainDialog::messageReceived(const QXmppMessage& msg)
 void mainDialog::statusTextChanged(const QString& status)
 {
     QXmppPresence presence = m_xmppClient.clientPresence();
-    presence.status().setStatusText(status);
+    presence.setStatusText(status);
     addPhotoHash(presence);
     m_xmppClient.setClientPresence(presence);
 }
@@ -378,7 +378,7 @@ void mainDialog::presenceTypeChanged(QXmppPresence::Type presenceType)
     {
         QXmppPresence newPresence = m_xmppClient.clientPresence();
         newPresence.setType(presenceType);
-        newPresence.status().setType(QXmppPresence::Status::Online);
+        newPresence.setAvailableStatusType(QXmppPresence::Online);
         addPhotoHash(newPresence);
         m_xmppClient.setClientPresence(newPresence);
     }
@@ -386,11 +386,11 @@ void mainDialog::presenceTypeChanged(QXmppPresence::Type presenceType)
             presenceToStatusText(m_xmppClient.clientPresence()));
 }
 
-void mainDialog::presenceStatusTypeChanged(QXmppPresence::Status::Type statusType)
+void mainDialog::presenceStatusTypeChanged(QXmppPresence::AvailableStatusType statusType)
 {
     QXmppPresence presence = m_xmppClient.clientPresence();
     presence.setType(QXmppPresence::Available);
-    presence.status().setType(statusType);
+    presence.setAvailableStatusType(statusType);
     addPhotoHash(presence);
     m_xmppClient.setClientPresence(presence);
     m_statusWidget.setStatusText(
@@ -429,7 +429,7 @@ void mainDialog::updateStatusWidget()
     m_statusWidget.setDisplayName(m_xmppClient.configuration().jidBare());
     m_statusWidget.setStatusText(presenceToStatusText(m_xmppClient.clientPresence()));
     m_statusWidget.setPresenceAndStatusType(m_xmppClient.clientPresence().type(),
-                                            m_xmppClient.clientPresence().status().type());
+                                            m_xmppClient.clientPresence().availableStatusType());
 }
 
 void mainDialog::signIn()
diff --git a/examples/GuiClient/mainDialog.h b/examples/GuiClient/mainDialog.h
index 75a1b2bd..21892729 100644
--- a/examples/GuiClient/mainDialog.h
+++ b/examples/GuiClient/mainDialog.h
@@ -69,7 +69,7 @@ private slots:
     void messageReceived(const QXmppMessage& msg);
     void statusTextChanged(const QString&);
     void presenceTypeChanged(QXmppPresence::Type);
-    void presenceStatusTypeChanged(QXmppPresence::Status::Type);
+    void presenceStatusTypeChanged(QXmppPresence::AvailableStatusType);
     void signIn();
     void cancelSignIn();
     void showSignInPage();
diff --git a/examples/GuiClient/rosterItem.cpp b/examples/GuiClient/rosterItem.cpp
index 5932ba51..becdcfe5 100644
--- a/examples/GuiClient/rosterItem.cpp
+++ b/examples/GuiClient/rosterItem.cpp
@@ -60,24 +60,24 @@ QString rosterItem::getStatusText()
     return data(rosterItem::StatusText).toString();
 }
 
-void rosterItem::setStatusType(QXmppPresence::Status::Type type)
+void rosterItem::setStatusType(QXmppPresence::AvailableStatusType type)
 {
     setData(static_cast<int>(type), StatusType);
     QString icon;
     switch(type)
     {
-    case QXmppPresence::Status::Online:
-    case QXmppPresence::Status::Chat:
+    case QXmppPresence::Online:
+    case QXmppPresence::Chat:
         icon = "green";
         break;
-    case QXmppPresence::Status::Away:
-    case QXmppPresence::Status::XA:
+    case QXmppPresence::Away:
+    case QXmppPresence::XA:
         icon = "orange";
         break;
-    case QXmppPresence::Status::DND:
+    case QXmppPresence::DND:
         icon = "red";
         break;
-    case QXmppPresence::Status::Invisible:
+    case QXmppPresence::Invisible:
         icon = "gray";
         break;
     }
@@ -85,9 +85,9 @@ void rosterItem::setStatusType(QXmppPresence::Status::Type type)
         setIcon(QIcon(":/icons/resource/"+icon+".png"));
 }
 
-QXmppPresence::Status::Type rosterItem::getStatusType()
+QXmppPresence::AvailableStatusType rosterItem::getStatusType()
 {
-    return static_cast<QXmppPresence::Status::Type>(data(StatusType).toInt());
+    return static_cast<QXmppPresence::AvailableStatusType>(data(StatusType).toInt());
 }
 
 void rosterItem::setPresenceType(QXmppPresence::Type type)
diff --git a/examples/GuiClient/rosterItem.h b/examples/GuiClient/rosterItem.h
index a5441e2d..f348ee3e 100644
--- a/examples/GuiClient/rosterItem.h
+++ b/examples/GuiClient/rosterItem.h
@@ -48,13 +48,13 @@ public:
     QString getName();
     void setBareJid(const QString& bareJid);
     void setStatusText(const QString& text);
-    void setStatusType(QXmppPresence::Status::Type type);
+    void setStatusType(QXmppPresence::AvailableStatusType type);
     void setPresenceType(QXmppPresence::Type type);
     void setAvatar(const QImage& image);
     QImage getAvatar();
     QString getBareJid();
     QString getStatusText();
-    QXmppPresence::Status::Type getStatusType();
+    QXmppPresence::AvailableStatusType getStatusType();
     QXmppPresence::Type getPresenceType();
 };
 
diff --git a/examples/GuiClient/rosterItemModel.cpp b/examples/GuiClient/rosterItemModel.cpp
index 8f12ef79..eed42804 100644
--- a/examples/GuiClient/rosterItemModel.cpp
+++ b/examples/GuiClient/rosterItemModel.cpp
@@ -58,8 +58,8 @@ void rosterItemModel::updatePresence(const QString& bareJid, const QMap<QString,
 
     if(presences.count() > 0)
     {
-        QString statusText = presences.begin().value().status().statusText();
-        QXmppPresence::Status::Type statusType = presences.begin().value().status().type();
+        QString statusText = presences.begin().value().statusText();
+        QXmppPresence::AvailableStatusType statusType = presences.begin().value().availableStatusType();
         QXmppPresence::Type presenceType = presences.begin().value().type();
 
         if(statusText.isEmpty())
diff --git a/examples/GuiClient/rosterItemSortFilterProxyModel.cpp b/examples/GuiClient/rosterItemSortFilterProxyModel.cpp
index 329f26c0..2be25925 100644
--- a/examples/GuiClient/rosterItemSortFilterProxyModel.cpp
+++ b/examples/GuiClient/rosterItemSortFilterProxyModel.cpp
@@ -66,8 +66,8 @@ bool rosterItemSortFilterProxyModel::lessThan(const QModelIndex &left, const QMo
             }
             else
             {
-                return comparisonWeightsPresenceStatusType(static_cast<QXmppPresence::Status::Type>(leftStatusType)) <
-                        comparisonWeightsPresenceStatusType(static_cast<QXmppPresence::Status::Type>(rightStatusType));
+                return comparisonWeightsPresenceStatusType(static_cast<QXmppPresence::AvailableStatusType>(leftStatusType)) <
+                        comparisonWeightsPresenceStatusType(static_cast<QXmppPresence::AvailableStatusType>(rightStatusType));
             }
         }
         else
diff --git a/examples/GuiClient/statusWidget.cpp b/examples/GuiClient/statusWidget.cpp
index 5345707e..12236f97 100644
--- a/examples/GuiClient/statusWidget.cpp
+++ b/examples/GuiClient/statusWidget.cpp
@@ -75,18 +75,18 @@ void statusWidget::presenceMenuTriggered()
     }
     else if(action == actionBusy)
     {
-        emit presenceStatusTypeChanged(QXmppPresence::Status::DND);
+        emit presenceStatusTypeChanged(QXmppPresence::DND);
         icon = "red";
     }
     else if(action == actionAway)
     {
-        emit presenceStatusTypeChanged(QXmppPresence::Status::Away);
+        emit presenceStatusTypeChanged(QXmppPresence::Away);
         icon = "orange";
     }
 #if 0
     else if(action == actionInvisible)
     {
-        emit presenceStatusTypeChanged(QXmppPresence::Status::Invisible);
+        emit presenceStatusTypeChanged(QXmppPresence::Invisible);
         icon = "gray";
     }
 #endif
@@ -99,25 +99,25 @@ void statusWidget::presenceMenuTriggered()
 }
 
 void statusWidget::setPresenceAndStatusType(QXmppPresence::Type presenceType,
-                                  QXmppPresence::Status::Type statusType)
+                                  QXmppPresence::AvailableStatusType statusType)
 {
     if(presenceType == QXmppPresence::Available)
     {
         QString icon = "green";
         switch(statusType)
         {
-        case QXmppPresence::Status::Online:
-        case QXmppPresence::Status::Chat:
+        case QXmppPresence::Online:
+        case QXmppPresence::Chat:
             icon = "green";
             break;
-        case QXmppPresence::Status::Away:
-        case QXmppPresence::Status::XA:
+        case QXmppPresence::Away:
+        case QXmppPresence::XA:
             icon = "orange";
             break;
-        case QXmppPresence::Status::DND:
+        case QXmppPresence::DND:
             icon = "red";
             break;
-        case QXmppPresence::Status::Invisible:
+        case QXmppPresence::Invisible:
             icon = "gray";
             break;
         }
diff --git a/examples/GuiClient/statusWidget.h b/examples/GuiClient/statusWidget.h
index d271e0d5..49abc159 100644
--- a/examples/GuiClient/statusWidget.h
+++ b/examples/GuiClient/statusWidget.h
@@ -41,7 +41,7 @@ public:
     void setDisplayName(const QString& name);
     void setStatusText(const QString& statusText);
     void setPresenceAndStatusType(QXmppPresence::Type presenceType,
-                                  QXmppPresence::Status::Type statusType);
+                                  QXmppPresence::AvailableStatusType statusType);
     void setAvatar(const QImage&);
 
 private slots:
@@ -51,7 +51,7 @@ private slots:
 signals:
     void statusTextChanged(const QString&);
     void presenceTypeChanged(QXmppPresence::Type);
-    void presenceStatusTypeChanged(QXmppPresence::Status::Type);
+    void presenceStatusTypeChanged(QXmppPresence::AvailableStatusType);
     void avatarChanged(const QImage&);
 };
 
diff --git a/examples/GuiClient/utils.cpp b/examples/GuiClient/utils.cpp
index efc209e4..a1a47563 100644
--- a/examples/GuiClient/utils.cpp
+++ b/examples/GuiClient/utils.cpp
@@ -26,19 +26,19 @@
 #include <QDir>
 #include <QDesktopServices>
 
-int comparisonWeightsPresenceStatusType(QXmppPresence::Status::Type statusType)
+int comparisonWeightsPresenceStatusType(QXmppPresence::AvailableStatusType statusType)
 {
     switch(statusType)
     {
-        case QXmppPresence::Status::Online:
-        case QXmppPresence::Status::Chat:
+        case QXmppPresence::Online:
+        case QXmppPresence::Chat:
             return 0;
-        case QXmppPresence::Status::DND:
+        case QXmppPresence::DND:
             return 1;
-        case QXmppPresence::Status::Away:
-        case QXmppPresence::Status::XA:
+        case QXmppPresence::Away:
+        case QXmppPresence::XA:
             return 2;
-        case QXmppPresence::Status::Invisible:
+        case QXmppPresence::Invisible:
             return 3;
         default:
             return 5;
@@ -74,18 +74,18 @@ QString presenceToStatusText(const QXmppPresence& presence)
         {
             switch(presence.status().type())
             {
-            case QXmppPresence::Status::Invisible:
+            case QXmppPresence::Invisible:
                 statusText = "Offline";
                 break;
-            case QXmppPresence::Status::Online:
-            case QXmppPresence::Status::Chat:
+            case QXmppPresence::Online:
+            case QXmppPresence::Chat:
                 statusText = "Available";
                 break;
-            case QXmppPresence::Status::Away:
-            case QXmppPresence::Status::XA:
+            case QXmppPresence::Away:
+            case QXmppPresence::XA:
                 statusText = "Idle";
                 break;
-            case QXmppPresence::Status::DND:
+            case QXmppPresence::DND:
                 statusText = "Busy";
                 break;
             }
diff --git a/examples/GuiClient/utils.h b/examples/GuiClient/utils.h
index 6126d1ed..6f6f3366 100644
--- a/examples/GuiClient/utils.h
+++ b/examples/GuiClient/utils.h
@@ -31,7 +31,7 @@
 #include <QBuffer>
 #include <QImageReader>
 
-int comparisonWeightsPresenceStatusType(QXmppPresence::Status::Type);
+int comparisonWeightsPresenceStatusType(QXmppPresence::AvailableStatusType);
 int comparisonWeightsPresenceType(QXmppPresence::Type);
 
 QString presenceToStatusText(const QXmppPresence& presence);