API cleanup: accessors naming

2 files changed, 43 insertions, 10 deletions

diff --git a/source/QXmppRoster.cpp b/source/QXmppRoster.cpp
index a5ccf3f1..3581b15a 100644
--- a/source/QXmppRoster.cpp
+++ b/source/QXmppRoster.cpp
@@ -135,7 +135,7 @@ void QXmppRoster::rosterRequestIqReceived(const QXmppRosterIq& rosterIq)
 /// \return bareJid as a QString
 ///
 
-QString QXmppRoster::QXmppRosterEntry::getBareJid() const
+QString QXmppRoster::QXmppRosterEntry::bareJid() const
 {
     return m_bareJid;
 }
@@ -145,7 +145,7 @@ QString QXmppRoster::QXmppRosterEntry::getBareJid() const
 /// \return name as a QString
 ///
 
-QString QXmppRoster::QXmppRosterEntry::getName() const
+QString QXmppRoster::QXmppRosterEntry::name() const
 {
     return m_name;
 }
@@ -156,7 +156,7 @@ QString QXmppRoster::QXmppRosterEntry::getName() const
 ///
 
 QXmppRoster::QXmppRosterEntry::SubscriptionType
-        QXmppRoster::QXmppRosterEntry::getSubscriptionType() const
+        QXmppRoster::QXmppRosterEntry::subscriptionType() const
 {
     return m_type;
 }
@@ -169,7 +169,7 @@ QXmppRoster::QXmppRosterEntry::SubscriptionType
 ///
 ///
 
-QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const
+QString QXmppRoster::QXmppRosterEntry::subscriptionStatus() const
 {
     return m_subscriptionStatus;
 }
@@ -179,7 +179,7 @@ QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const
 /// \return QSet<QString> list of all the groups
 ///
 
-QSet<QString> QXmppRoster::QXmppRosterEntry::getGroups() const
+QSet<QString> QXmppRoster::QXmppRosterEntry::groups() const
 {
     return m_groups;
 }
@@ -368,3 +368,29 @@ bool QXmppRoster::isRosterReceived()
 {
     return m_isRosterReceived;
 }
+
+QString QXmppRoster::QXmppRosterEntry::getBareJid() const
+{
+    return m_bareJid;
+}
+
+QString QXmppRoster::QXmppRosterEntry::getName() const
+{
+    return m_name;
+}
+
+QXmppRoster::QXmppRosterEntry::SubscriptionType
+        QXmppRoster::QXmppRosterEntry::getSubscriptionType() const
+{
+    return m_type;
+}
+
+QString QXmppRoster::QXmppRosterEntry::getSubscriptionStatus() const
+{
+    return m_subscriptionStatus;
+}
+
+QSet<QString> QXmppRoster::QXmppRosterEntry::getGroups() const
+{
+    return m_groups;
+}
diff --git a/source/QXmppRoster.h b/source/QXmppRoster.h
index 25e8b8df..b5ef6c6e 100644
--- a/source/QXmppRoster.h
+++ b/source/QXmppRoster.h
@@ -82,11 +82,11 @@ public:
             Remove  ///< to delete a roster item
         };
 
-        QString getBareJid() const;
-        QString getName() const;
-        QXmppRosterEntry::SubscriptionType getSubscriptionType() const;
-        QString getSubscriptionStatus() const;
-        QSet<QString> getGroups() const;
+        QString bareJid() const;
+        QString name() const;
+        QXmppRosterEntry::SubscriptionType subscriptionType() const;
+        QString subscriptionStatus() const;
+        QSet<QString> groups() const;
 
         void setBareJid(const QString&);
         void setName(const QString&);
@@ -95,6 +95,13 @@ public:
         void setGroups(const QSet<QString>&);
         void addGroupEntry(const QString&);
 
+// deprecated accessors, use the form without "get" instead
+        QString Q_DECL_DEPRECATED getBareJid() const;
+        QString Q_DECL_DEPRECATED getName() const;
+        QXmppRosterEntry::SubscriptionType Q_DECL_DEPRECATED getSubscriptionType() const;
+        QString Q_DECL_DEPRECATED getSubscriptionStatus() const;
+        QSet<QString> Q_DECL_DEPRECATED getGroups() const;
+
     private:
         QString m_bareJid;
         SubscriptionType m_type;