1 files changed, 25 insertions, 20 deletions

diff --git a/source/QXmppRosterIq.cpp b/source/QXmppRosterIq.cpp
index db1994e0..1c5a4997 100644
--- a/source/QXmppRosterIq.cpp
+++ b/source/QXmppRosterIq.cpp
@@ -63,30 +63,29 @@ void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeEndElement();
 }
 
-QXmppRosterIq::Item::SubscriptionType
-        QXmppRosterIq::Item::subscriptionType() const
+QString QXmppRosterIq::Item::bareJid() const
 {
-    return m_type;
+    return m_bareJid;
 }
 
-QString QXmppRosterIq::Item::name() const
+void QXmppRosterIq::Item::setBareJid(const QString& str)
 {
-    return m_name;
+    m_bareJid = str;
 }
 
-QString QXmppRosterIq::Item::subscriptionStatus() const
+QSet<QString> QXmppRosterIq::Item::groups() const
 {
-    return m_subscriptionStatus;
+    return m_groups;
 }
 
-QString QXmppRosterIq::Item::bareJid() const
+void QXmppRosterIq::Item::setGroups(const QSet<QString>& groups)
 {
-    return m_bareJid;
+    m_groups = groups;
 }
 
-QSet<QString> QXmppRosterIq::Item::groups() const
+QString QXmppRosterIq::Item::name() const
 {
-    return m_groups;
+    return m_name;
 }
 
 void QXmppRosterIq::Item::setName(const QString& str)
@@ -94,19 +93,30 @@ void QXmppRosterIq::Item::setName(const QString& str)
     m_name = str;
 }
 
+QString QXmppRosterIq::Item::subscriptionStatus() const
+{
+    return m_subscriptionStatus;
+}
+
 void QXmppRosterIq::Item::setSubscriptionStatus(const QString& str)
 {
     m_subscriptionStatus = str;
 }
 
-void QXmppRosterIq::Item::addGroup(const QString& str)
+QXmppRosterIq::Item::SubscriptionType
+        QXmppRosterIq::Item::subscriptionType() const
 {
-    m_groups << str;
+    return m_type;
 }
 
-void QXmppRosterIq::Item::setBareJid(const QString& str)
+void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type)
 {
-    m_bareJid = str;
+    m_type = type;
+}
+
+void QXmppRosterIq::Item::addGroup(const QString& str)
+{
+    m_groups << str;
 }
 
 QString QXmppRosterIq::Item::getSubscriptionTypeStr() const
@@ -133,11 +143,6 @@ QString QXmppRosterIq::Item::getSubscriptionTypeStr() const
     }
 }
 
-void QXmppRosterIq::Item::setSubscriptionType(SubscriptionType type)
-{
-    m_type = type;
-}
-
 void QXmppRosterIq::Item::setSubscriptionTypeFromStr(const QString& type)
 {
     if(type == "")