From 8b4a02ed35651ad2aadc8a8916baafb6e5bb6cde Mon Sep 17 00:00:00 2001 From: Manjeet Dahiya Date: Thu, 4 Mar 2010 20:19:23 +0000 Subject: API cleanup: accessors naming --- source/QXmppRosterIq.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'source/QXmppRosterIq.h') 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 getGroups() const; + SubscriptionType subscriptionType() const; + QString name() const; + QString subscriptionStatus() const; + QString bareJid() const; + QSet 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 Q_DECL_DEPRECATED getGroups() const; + private: QString m_bareJid; SubscriptionType m_type; @@ -74,9 +82,12 @@ public: ~QXmppRosterIq(); void addItem(const Item&); - QList getItems() const; + QList items() const; void toXmlElementFromChild(QXmlStreamWriter *writer) const; +// deprecated accessors, use the form without "get" instead + QList Q_DECL_DEPRECATED getItems() const; + private: QList m_items; }; -- cgit v1.2.3