API cleanup: accessors naming

2 files changed, 56 insertions, 14 deletions

diff --git a/source/QXmppRosterIq.cpp b/source/QXmppRosterIq.cpp
index ab298913..dc8419ef 100644
--- a/source/QXmppRosterIq.cpp
+++ b/source/QXmppRosterIq.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Manjeet Dahiya
+ * Copyright (C) 2008-2010 Manjeet Dahiya
  *
  * Author:
  *	Manjeet Dahiya
@@ -48,7 +48,7 @@ void QXmppRosterIq::addItem(const Item& item)
     m_items.append(item);
 }
 
-QList<QXmppRosterIq::Item> QXmppRosterIq::getItems() const
+QList<QXmppRosterIq::Item> QXmppRosterIq::items() const
 {
     return m_items;
 }
@@ -64,27 +64,27 @@ void QXmppRosterIq::toXmlElementFromChild(QXmlStreamWriter *writer) const
 }
 
 QXmppRosterIq::Item::SubscriptionType
-        QXmppRosterIq::Item::getSubscriptionType() const
+        QXmppRosterIq::Item::subscriptionType() const
 {
     return m_type;
 }
 
-QString QXmppRosterIq::Item::getName() const
+QString QXmppRosterIq::Item::name() const
 {
     return m_name;
 }
 
-QString QXmppRosterIq::Item::getSubscriptionStatus() const
+QString QXmppRosterIq::Item::subscriptionStatus() const
 {
     return m_subscriptionStatus;
 }
 
-QString QXmppRosterIq::Item::getBareJid() const
+QString QXmppRosterIq::Item::bareJid() const
 {
     return m_bareJid;
 }
 
-QSet<QString> QXmppRosterIq::Item::getGroups() const
+QSet<QString> QXmppRosterIq::Item::groups() const
 {
     return m_groups;
 }
@@ -172,3 +172,34 @@ void QXmppRosterIq::Item::toXml(QXmlStreamWriter *writer) const
     }
     writer->writeEndElement();
 }
+
+QList<QXmppRosterIq::Item> QXmppRosterIq::getItems() const
+{
+    return m_items;
+}
+
+QXmppRosterIq::Item::SubscriptionType
+        QXmppRosterIq::Item::getSubscriptionType() const
+{
+    return m_type;
+}
+
+QString QXmppRosterIq::Item::getName() const
+{
+    return m_name;
+}
+
+QString QXmppRosterIq::Item::getSubscriptionStatus() const
+{
+    return m_subscriptionStatus;
+}
+
+QString QXmppRosterIq::Item::getBareJid() const
+{
+    return m_bareJid;
+}
+
+QSet<QString> QXmppRosterIq::Item::getGroups() const
+{
+    return m_groups;
+}
diff --git a/source/QXmppRosterIq.h b/source/QXmppRosterIq.h
index 409f4d55..56fa8ae8 100644
--- a/source/QXmppRosterIq.h
+++ b/source/QXmppRosterIq.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Manjeet Dahiya
+ * Copyright (C) 2008-2010 Manjeet Dahiya
  *
  * Author:
  *	Manjeet Dahiya
@@ -46,11 +46,12 @@ public:
             Remove
         };
 
-        SubscriptionType getSubscriptionType() const;
-        QString getName() const;
-        QString getSubscriptionStatus() const;
-        QString getBareJid() const;
-        QSet<QString> getGroups() const;
+        SubscriptionType subscriptionType() const;
+        QString name() const;
+        QString subscriptionStatus() const;
+        QString bareJid() const;
+        QSet<QString> groups() const;
+
         void setName(const QString&);
         void setSubscriptionStatus(const QString&);
         void addGroup(const QString&);
@@ -60,6 +61,13 @@ public:
         void setSubscriptionTypeFromStr(const QString&);
         void toXml(QXmlStreamWriter *writer) const;
         
+// deprecated accessors, use the form without "get" instead
+        SubscriptionType Q_DECL_DEPRECATED getSubscriptionType() const;
+        QString Q_DECL_DEPRECATED getName() const;
+        QString Q_DECL_DEPRECATED getSubscriptionStatus() const;
+        QString Q_DECL_DEPRECATED getBareJid() const;
+        QSet<QString> Q_DECL_DEPRECATED getGroups() const;
+
     private:
         QString m_bareJid;
         SubscriptionType m_type;
@@ -74,9 +82,12 @@ public:
     ~QXmppRosterIq();
     
     void addItem(const Item&);
-    QList<Item> getItems() const;
+    QList<Item> items() const;
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;
 
+// deprecated accessors, use the form without "get" instead
+    QList<Item> Q_DECL_DEPRECATED getItems() const;
+
 private:
     QList<Item> m_items;
 };