From bca9b60db8a40cae4a81a20a3acbce77e2f3ed65 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Thu, 6 Apr 2017 00:43:03 +0300 Subject: [PATCH] Revert "Refactor: initialize class variable directly" This reverts commit b4bca7cfb71d60a77045ef95fc2b4be33ea9b362. --- src/webui/abstractwebapplication.cpp | 23 +++++++++++++++-------- src/webui/abstractwebapplication.h | 1 + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/webui/abstractwebapplication.cpp b/src/webui/abstractwebapplication.cpp index 8b07b89c7..79c23bc42 100644 --- a/src/webui/abstractwebapplication.cpp +++ b/src/webui/abstractwebapplication.cpp @@ -404,11 +404,18 @@ QString AbstractWebApplication::saveTmpFile(const QByteArray &data) return QString(); } -const QStringMap AbstractWebApplication::CONTENT_TYPE_BY_EXT = { - { "htm", Http::CONTENT_TYPE_HTML }, - { "html", Http::CONTENT_TYPE_HTML }, - { "css", Http::CONTENT_TYPE_CSS }, - { "gif", Http::CONTENT_TYPE_GIF }, - { "png", Http::CONTENT_TYPE_PNG }, - { "js", Http::CONTENT_TYPE_JS } -}; +QStringMap AbstractWebApplication::initializeContentTypeByExtMap() +{ + QStringMap map; + + map["htm"] = Http::CONTENT_TYPE_HTML; + map["html"] = Http::CONTENT_TYPE_HTML; + map["css"] = Http::CONTENT_TYPE_CSS; + map["gif"] = Http::CONTENT_TYPE_GIF; + map["png"] = Http::CONTENT_TYPE_PNG; + map["js"] = Http::CONTENT_TYPE_JS; + + return map; +} + +const QStringMap AbstractWebApplication::CONTENT_TYPE_BY_EXT = AbstractWebApplication::initializeContentTypeByExtMap(); diff --git a/src/webui/abstractwebapplication.h b/src/webui/abstractwebapplication.h index 8d1227fc9..e0e1ed279 100644 --- a/src/webui/abstractwebapplication.h +++ b/src/webui/abstractwebapplication.h @@ -103,6 +103,7 @@ private: static void translateDocument(QString &data); static const QStringMap CONTENT_TYPE_BY_EXT; + static QStringMap initializeContentTypeByExtMap(); }; #endif // ABSTRACTWEBAPPLICATION_H