modified serialized() method to use QDataStream

src/modules/dns/includes/dns/QDnsHeader.h

@@ -17,7 +17,9 @@ namespace QDNS
         QDnsHeader();
 
         static QDnsHeader parse(const QByteArray& data);
+        static QDnsHeader parse(QDataStream& dataStream);
         QByteArray serialize() const;
+        void serialize(QDataStream& dataStream) const;
 
         bool isValid() const;
 

src/modules/dns/src/QDnsHeader.cpp

@@ -21,27 +21,50 @@ namespace QDNS
     }
 
     QDnsHeader QDnsHeader::parse(const QByteArray& data)
+    {
+        QDataStream dataStream(data);
+        return QDnsHeader::parse(dataStream);
+    }
+
+    QDnsHeader QDnsHeader::parse(QDataStream& dataStream)
     {
         QDnsHeader header;
 
-        if (data.size() < 12)
+        if (dataStream.device()->bytesAvailable() < 12)
         {
             header.m_isValid = false;
         }
         else
         {
-            QDataStream ds(data);
-            ds >> header.m_id;
-            ds >> header.m_flags;
-            ds >> header.m_questionCount;
-            ds >> header.m_answerCount;
-            ds >> header.m_authorityCount;
-            ds >> header.m_additionalCount;
+            dataStream >> header.m_id;
+            dataStream >> header.m_flags;
+            dataStream >> header.m_questionCount;
+            dataStream >> header.m_answerCount;
+            dataStream >> header.m_authorityCount;
+            dataStream >> header.m_additionalCount;
         }
 
         return header;
     }
 
+    QByteArray QDnsHeader::serialize() const
+    {
+        QByteArray byteArray;
+        QDataStream dataStream(&byteArray, QIODevice::WriteOnly);
+        serialize(dataStream);
+        return byteArray;
+    }
+
+    void QDnsHeader::serialize(QDataStream& dataStream) const
+    {
+        dataStream << m_id;
+        dataStream << m_flags;
+        dataStream << m_questionCount;
+        dataStream << m_answerCount;
+        dataStream << m_authorityCount;
+        dataStream << m_additionalCount;
+    }
+
     bool QDnsHeader::isValid() const
     {
         return m_isValid;
@@ -230,21 +253,4 @@ namespace QDNS
         m_additionalCount = additionalCount;
     }
 
-    QByteArray QDnsHeader::serialize() const
-    {
-        if (isValid())
-        {
-            QByteArray data;
-            QDataStream ds(&data, QIODevice::WriteOnly);
-            ds << m_id;
-            ds << m_flags;
-            ds << m_questionCount;
-            ds << m_answerCount;
-            ds << m_authorityCount;
-            ds << m_additionalCount;
-            return data;
-        }
-        return QByteArray();
-    }
-
 }

tests/main.cpp

@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 #include <QByteArray>
 #include <QString>
+#include <QtCore/QDataStream>
 
 #include "dns/QDnsHeader.h"
 
@@ -61,10 +62,6 @@ TEST_P(DNSHeaderTest, parseAndGetters)
 
         ASSERT_EQ(header.serialize().toHex(), QString(params.hexData).remove(" "));
     }
-    else
-    {
-        ASSERT_EQ(header.serialize().size(), 0);
-    }
 }
 
 TEST_P(DNSHeaderTest, settersAndGetters1)