Renamed question to query

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

@@ -61,8 +61,8 @@ namespace QDns
         void setReplyCode(quint8 replyCode);
 
 
-        quint16 getQuestionCount() const;
-        void setQuestionCount(quint16 questionCount);
+        quint16 getQueryCount() const;
+        void setQueryCount(quint16 questionCount);
 
         quint16 getAnswerCount() const;
         void setAnswerCount(quint16 answerCount);
@@ -77,7 +77,7 @@ namespace QDns
         bool m_isValid;
         quint16 m_id;
         quint16 m_flags;
-        quint16 m_questionCount;
+        quint16 m_queryCount;
         quint16 m_answerCount;
         quint16 m_authorityCount;
         quint16 m_additionalCount;

src/modules/dns/src/QDnsHeader.cpp

@@ -12,7 +12,7 @@ namespace QDns
             : m_isValid(true)
             , m_id(0)
             , m_flags(0)
-            , m_questionCount(0)
+            , m_queryCount(0)
             , m_answerCount(0)
             , m_authorityCount(0)
             , m_additionalCount(0)
@@ -38,7 +38,7 @@ namespace QDns
         {
             dataStream >> header.m_id;
             dataStream >> header.m_flags;
-            dataStream >> header.m_questionCount;
+            dataStream >> header.m_queryCount;
             dataStream >> header.m_answerCount;
             dataStream >> header.m_authorityCount;
             dataStream >> header.m_additionalCount;
@@ -59,7 +59,7 @@ namespace QDns
     {
         dataStream << m_id;
         dataStream << m_flags;
-        dataStream << m_questionCount;
+        dataStream << m_queryCount;
         dataStream << m_answerCount;
         dataStream << m_authorityCount;
         dataStream << m_additionalCount;
@@ -213,14 +213,14 @@ namespace QDns
         setFlagBits(15, (quint8) replyCode, 4);
     }
 
-    quint16 QDnsHeader::getQuestionCount() const
+    quint16 QDnsHeader::getQueryCount() const
     {
-        return m_questionCount;
+        return m_queryCount;
     }
 
-    void QDnsHeader::setQuestionCount(quint16 questionCount)
+    void QDnsHeader::setQueryCount(quint16 questionCount)
     {
-        m_questionCount = questionCount;
+        m_queryCount = questionCount;
     }
 
     quint16 QDnsHeader::getAnswerCount() const

tests/DnsHeader.cpp

@@ -26,7 +26,7 @@ struct DnsHeaderTestParams
     bool flagNonAuthenticatedAcceptable;
     quint8 flagReplyCode;
 
-    quint16 questionCount;
+    quint16 queryCount;
     quint16 answerCount;
     quint16 authorityCount;
     quint16 additionalCount;
@@ -58,7 +58,7 @@ TEST_P(DnsHeaderTest, parseAndGetters)
         ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
         ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
 
-        ASSERT_EQ(header.getQuestionCount(), params.questionCount);
+        ASSERT_EQ(header.getQueryCount(), params.queryCount);
         ASSERT_EQ(header.getAnswerCount(), params.answerCount);
         ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
         ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
@@ -81,7 +81,7 @@ TEST_P(DnsHeaderTest, settersAndGetters1)
 
     header.setId(params.id);
     header.setFlags(params.flags);
-    header.setQuestionCount(params.questionCount);
+    header.setQueryCount(params.queryCount);
     header.setAnswerCount(params.answerCount);
     header.setAuthorityCount(params.authorityCount);
     header.setAdditionalCount(params.additionalCount);
@@ -99,7 +99,7 @@ TEST_P(DnsHeaderTest, settersAndGetters1)
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
 
-    ASSERT_EQ(header.getQuestionCount(), params.questionCount);
+    ASSERT_EQ(header.getQueryCount(), params.queryCount);
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);
@@ -130,7 +130,7 @@ TEST_P(DnsHeaderTest, settersAndGetters2)
     header.setIsAnswerAuthenticated(params.flagAnswerAuthenticated);
     header.setNonAuthenticatedAcceptable(params.flagNonAuthenticatedAcceptable);
     header.setReplyCode(params.flagReplyCode);
-    header.setQuestionCount(params.questionCount);
+    header.setQueryCount(params.queryCount);
     header.setAnswerCount(params.answerCount);
     header.setAuthorityCount(params.authorityCount);
     header.setAdditionalCount(params.additionalCount);
@@ -148,7 +148,7 @@ TEST_P(DnsHeaderTest, settersAndGetters2)
     ASSERT_EQ(header.isNonAuthenticatedAcceptable(), params.flagNonAuthenticatedAcceptable);
     ASSERT_EQ(header.getReplyCode(), params.flagReplyCode);
 
-    ASSERT_EQ(header.getQuestionCount(), params.questionCount);
+    ASSERT_EQ(header.getQueryCount(), params.queryCount);
     ASSERT_EQ(header.getAnswerCount(), params.answerCount);
     ASSERT_EQ(header.getAuthorityCount(), params.authorityCount);
     ASSERT_EQ(header.getAdditionalCount(), params.additionalCount);