Add QHttpServerLiterals

Currently we have a lot of duplication of most common HTTP headers and their
values.
This patch moves them to one place.

Change-Id: Idf9ddc5164e81649b4cc37ed92a516eb1eedab3a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@qbc.io>

1 files changed, 8 insertions, 11 deletions

diff --git a/src/httpserver/qhttpserverresponse.cpp b/src/httpserver/qhttpserverresponse.cpp
index e997e96..89d6b47 100644
--- a/src/httpserver/qhttpserverresponse.cpp
+++ b/src/httpserver/qhttpserverresponse.cpp
@@ -30,6 +30,7 @@
 #include <QtHttpServer/qhttpserverresponse.h>
 
 #include <private/qhttpserverresponse_p.h>
+#include <private/qhttpserverliterals_p.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qjsondocument.h>
@@ -38,20 +39,16 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace {
-
-const QByteArray mimeTextHtml("text/html");
-const QByteArray mimeApplicationJson("application/json");
-
-}
-
 QHttpServerResponse::QHttpServerResponse(QHttpServerResponse &&other)
     : d_ptr(other.d_ptr.take())
 {
 }
 
-QHttpServerResponse::QHttpServerResponse(const QHttpServerResponse::StatusCode statusCode)
-    : QHttpServerResponse(mimeTextHtml, QByteArray(), statusCode)
+QHttpServerResponse::QHttpServerResponse(
+        const QHttpServerResponse::StatusCode statusCode)
+    : QHttpServerResponse(QHttpServerLiterals::contentTypeTextHtml(),
+                          QByteArray(),
+                          statusCode)
 {
 }
 
@@ -78,13 +75,13 @@ QHttpServerResponse::QHttpServerResponse(QByteArray &&data)
 }
 
 QHttpServerResponse::QHttpServerResponse(const QJsonObject &data)
-    : QHttpServerResponse(mimeApplicationJson,
+    : QHttpServerResponse(QHttpServerLiterals::contentTypeJson(),
                           QJsonDocument(data).toJson(QJsonDocument::Compact))
 {
 }
 
 QHttpServerResponse::QHttpServerResponse(const QJsonArray &data)
-    : QHttpServerResponse(mimeApplicationJson,
+    : QHttpServerResponse(QHttpServerLiterals::contentTypeJson(),
                           QJsonDocument(data).toJson(QJsonDocument::Compact))
 {
 }