API cleanup: accessors naming

2 files changed, 39 insertions, 9 deletions

diff --git a/source/QXmppVCard.cpp b/source/QXmppVCard.cpp
index 5035c0f4..05967abb 100644
--- a/source/QXmppVCard.cpp
+++ b/source/QXmppVCard.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Manjeet Dahiya
+ * Copyright (C) 2008-2010 Manjeet Dahiya
  *
  * Author:
  *	Manjeet Dahiya
@@ -36,7 +36,7 @@ QXmppVCard::QXmppVCard(const QString& jid) : QXmppIq(QXmppIq::Get)
     setTo(jid);
 }
 
-QString QXmppVCard::getFullName() const
+QString QXmppVCard::fullName() const
 {
     return m_fullName;
 }
@@ -46,7 +46,7 @@ void QXmppVCard::setFullName(const QString& str)
     m_fullName = str;
 }
 
-QString QXmppVCard::getNickName() const
+QString QXmppVCard::nickName() const
 {
     return m_nickName;
 }
@@ -56,7 +56,7 @@ void QXmppVCard::setNickName(const QString& str)
     m_nickName = str;
 }
 
-const QByteArray& QXmppVCard::getPhoto() const
+const QByteArray& QXmppVCard::photo() const
 {
     return m_photo;
 }
@@ -111,7 +111,28 @@ void QXmppVCard::toXmlElementFromChild(QXmlStreamWriter *writer) const
     writer->writeEndElement();
 }
 
+QImage QXmppVCard::photoAsImage() const
+{
+    return getImageFromByteArray(getPhoto());
+}
+
+QString QXmppVCard::getFullName() const
+{
+    return m_fullName;
+}
+
+QString QXmppVCard::getNickName() const
+{
+    return m_nickName;
+}
+
+const QByteArray& QXmppVCard::getPhoto() const
+{
+    return m_photo;
+}
+
 QImage QXmppVCard::getPhotoAsImage() const
 {
     return getImageFromByteArray(getPhoto());
 }
+
diff --git a/source/QXmppVCard.h b/source/QXmppVCard.h
index 3ca0369a..03e617ed 100644
--- a/source/QXmppVCard.h
+++ b/source/QXmppVCard.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008-2009 Manjeet Dahiya
+ * Copyright (C) 2008-2010 Manjeet Dahiya
  *
  * Author:
  *	Manjeet Dahiya
@@ -36,19 +36,28 @@ class QXmppVCard : public QXmppIq
 public:
     QXmppVCard(const QString& bareJid = "");
 
-    QString getFullName() const;
     void setFullName(const QString&);
 
-    QString getNickName() const;
     void setNickName(const QString&);
 
-    QImage getPhotoAsImage() const;
-    const QByteArray& getPhoto() const;
     void setPhoto(const QByteArray&);
     void setPhoto(const QImage&);
 
     void parse(const QDomElement&);
 
+    QString fullName() const;
+    QString nickName() const;
+    QImage photoAsImage() const;
+    const QByteArray& photo() const;
+
+// deprecated accessors, use the form without "get" instead
+// obsolete start
+    QString Q_DECL_DEPRECATED getFullName() const;
+    QString Q_DECL_DEPRECATED getNickName() const;
+    QImage Q_DECL_DEPRECATED getPhotoAsImage() const;
+    const QByteArray& Q_DECL_DEPRECATED getPhoto() const;
+// obsolete end
+
 private:
     void toXmlElementFromChild(QXmlStreamWriter *writer) const;