move deprecated code to the end of file

2 files changed, 52 insertions, 51 deletions

diff --git a/source/QXmppStanza.cpp b/source/QXmppStanza.cpp
index afc47589..aa57cbf2 100644
--- a/source/QXmppStanza.cpp
+++ b/source/QXmppStanza.cpp
@@ -274,37 +274,16 @@ m_to(to), m_from(from)
 
 QXmppStanza::~QXmppStanza()
 {
-
 }
 
-QString QXmppStanza::getTo() const
+QString QXmppStanza::to() const
 {
     return m_to;
 }
 
-QString QXmppStanza::getFrom() const
-{
-    return m_from;
-}
-
-QString QXmppStanza::getId() const    
-{
-    return m_id;
-}
-
-QString QXmppStanza::getLang() const    
-{
-    return m_lang;
-}
-
-QXmppStanza::Error QXmppStanza::getError() const
-{
-    return m_error;
-}
-
-QString QXmppStanza::to() const
+void QXmppStanza::setTo(const QString& to)  
 {
-    return m_to;
+    m_to = to;
 }
 
 QString QXmppStanza::from() const
@@ -312,24 +291,14 @@ QString QXmppStanza::from() const
     return m_from;
 }
 
-QString QXmppStanza::id() const    
-{
-    return m_id;
-}
-
-QString QXmppStanza::lang() const    
-{
-    return m_lang;
-}
-
-void QXmppStanza::setTo(const QString& to)  
+void QXmppStanza::setFrom(const QString& from)
 {
-    m_to = to;
+    m_from = from;
 }
 
-void QXmppStanza::setFrom(const QString& from)
+QString QXmppStanza::id() const    
 {
-    m_from = from;
+    return m_id;
 }
 
 void QXmppStanza::setId(const QString& id)    
@@ -337,16 +306,14 @@ void QXmppStanza::setId(const QString& id)
     m_id = id;
 }
 
-void QXmppStanza::setLang(const QString& lang)    
+QString QXmppStanza::lang() const    
 {
-    m_lang = lang;
+    return m_lang;
 }
 
-void QXmppStanza::generateAndSetNextId()
+void QXmppStanza::setLang(const QString& lang)    
 {
-    // get back
-    ++s_uniqeIdNo;
-    m_id = "qxmpp" + QString::number(s_uniqeIdNo);
+    m_lang = lang;
 }
 
 QXmppStanza::Error QXmppStanza::error() const
@@ -369,6 +336,13 @@ void QXmppStanza::setExtensions(const QXmppElementList &extensions)
     m_extensions = extensions;
 }
 
+void QXmppStanza::generateAndSetNextId()
+{
+    // get back
+    ++s_uniqeIdNo;
+    m_id = "qxmpp" + QString::number(s_uniqeIdNo);
+}
+
 bool QXmppStanza::isErrorStanza()
 {
     return !(m_error.getTypeStr().isEmpty() && 
@@ -404,3 +378,30 @@ QXmppStanza::Error QXmppStanza::parseError(const QDomElement &errorElement)
     return error;
 }
 
+// deprecated
+
+QString QXmppStanza::getTo() const
+{
+    return m_to;
+}
+
+QString QXmppStanza::getFrom() const
+{
+    return m_from;
+}
+
+QString QXmppStanza::getId() const    
+{
+    return m_id;
+}
+
+QString QXmppStanza::getLang() const    
+{
+    return m_lang;
+}
+
+QXmppStanza::Error QXmppStanza::getError() const
+{
+    return m_error;
+}
+
diff --git a/source/QXmppStanza.h b/source/QXmppStanza.h
index 05f1fae9..fd1f2426 100644
--- a/source/QXmppStanza.h
+++ b/source/QXmppStanza.h
@@ -104,13 +104,6 @@ public:
     QXmppStanza(const QString& from = "", const QString& to = "");
     ~QXmppStanza();
     
-    // deprecated accessors, use the form without "get" instead
-    QString Q_DECL_DEPRECATED getTo() const;  
-    QString Q_DECL_DEPRECATED getFrom() const;
-    QString Q_DECL_DEPRECATED getId() const;    
-    QString Q_DECL_DEPRECATED getLang() const;    
-    QXmppStanza::Error Q_DECL_DEPRECATED getError() const;
-
     QString to() const;
     void setTo(const QString&);
 
@@ -135,6 +128,13 @@ public:
     // FIXME : make this method protected
     static QXmppStanza::Error parseError(const QDomElement&);
 
+    // deprecated accessors, use the form without "get" instead
+    QString Q_DECL_DEPRECATED getTo() const;  
+    QString Q_DECL_DEPRECATED getFrom() const;
+    QString Q_DECL_DEPRECATED getId() const;    
+    QString Q_DECL_DEPRECATED getLang() const;    
+    QXmppStanza::Error Q_DECL_DEPRECATED getError() const;
+
 protected:
     void generateAndSetNextId();