cleanup QXmppMessage accessors

2 files changed, 45 insertions, 12 deletions

diff --git a/source/QXmppMessage.cpp b/source/QXmppMessage.cpp
index 8a53c87f..cafadc87 100644
--- a/source/QXmppMessage.cpp
+++ b/source/QXmppMessage.cpp
@@ -48,14 +48,14 @@ QXmppMessage::~QXmppMessage()
 
 }
 
-QXmppMessage::Type QXmppMessage::getType() const
+QXmppMessage::Type QXmppMessage::type() const
 {
     return m_type;
 }
 
 QString QXmppMessage::getTypeStr() const
 {
-    switch(getType())
+    switch(m_type)
     {
     case QXmppMessage::Error:
         return "error";
@@ -68,7 +68,7 @@ QString QXmppMessage::getTypeStr() const
     case QXmppMessage::Headline:
         return "headline";
     default:
-        qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)getType());
+        qWarning("QXmppMessage::getTypeStr() invalid type %d", (int)m_type);
         return "";
     }
 }
@@ -119,7 +119,7 @@ void QXmppMessage::setTypeFromStr(const QString& str)
     }
 }
 
-QXmppMessage::State QXmppMessage::getState() const
+QXmppMessage::State QXmppMessage::state() const
 {
     return m_state;
 }
@@ -193,7 +193,7 @@ void QXmppMessage::toXml(QXmlStreamWriter *xmlWriter) const
     xmlWriter->writeEndElement();
 }
 
-QString QXmppMessage::getBody() const
+QString QXmppMessage::body() const
 {
     return m_body;
 }
@@ -203,7 +203,7 @@ void QXmppMessage::setBody(const QString& body)
     m_body = body;
 }
 
-QString QXmppMessage::getSubject() const
+QString QXmppMessage::subject() const
 {
     return m_subject;
 }
@@ -213,7 +213,7 @@ void QXmppMessage::setSubject(const QString& sub)
     m_subject = sub;
 }
 
-QString QXmppMessage::getThread() const
+QString QXmppMessage::thread() const
 {
     return m_thread;
 }
@@ -223,3 +223,29 @@ void QXmppMessage::setThread(const QString& thread)
     m_thread = thread;
 }
 
+// deprecated
+
+QXmppMessage::Type QXmppMessage::getType() const
+{
+    return m_type;
+}
+
+QXmppMessage::State QXmppMessage::getState() const
+{
+    return m_state;
+}
+
+QString QXmppMessage::getBody() const
+{
+    return m_body;
+}
+
+QString QXmppMessage::getSubject() const
+{
+    return m_subject;
+}
+
+QString QXmppMessage::getThread() const
+{
+    return m_thread;
+}
diff --git a/source/QXmppMessage.h b/source/QXmppMessage.h
index c4e2809d..92b55478 100644
--- a/source/QXmppMessage.h
+++ b/source/QXmppMessage.h
@@ -55,24 +55,31 @@ public:
                  const QString& body = "", const QString& thread = "");
     ~QXmppMessage();
     
-    QXmppMessage::Type getType() const;
+    QXmppMessage::Type type() const;
     void setType(QXmppMessage::Type);
 
-    QXmppMessage::State getState() const;
+    QXmppMessage::State state() const;
     void setState(QXmppMessage::State);
 
-    QString getBody() const;
+    QString body() const;
     void setBody(const QString&);
 
-    QString getSubject() const;
+    QString subject() const;
     void setSubject(const QString&);
 
-    QString getThread() const;
+    QString thread() const;
     void setThread(const QString&);
 
     void parse(QDomElement &element);
     void toXml(QXmlStreamWriter *writer) const;
 
+    // deprecated accessors, use the form without "get" instead
+    QXmppMessage::Type Q_DECL_DEPRECATED getType() const;
+    QXmppMessage::State Q_DECL_DEPRECATED getState() const;
+    QString Q_DECL_DEPRECATED getBody() const;
+    QString Q_DECL_DEPRECATED getSubject() const;
+    QString Q_DECL_DEPRECATED getThread() const;
+
 private:
     QString getTypeStr() const;
     void setTypeFromStr(const QString&);