From b317105242f5e77d6f9f8d6671ef6a7299bc0962 Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Wed, 30 Jan 2019 15:49:51 +0100 Subject: Fix -Wmismatched-tags warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The forward declaration and the definition was not matching. Some were forward declared as class and defined as struct. Change-Id: I8912e6373e24126befba52df0bef8795299e50f7 Reviewed-by: Mikhail Svetkin Reviewed-by: Mårten Nordheim --- src/httpserver/qhttpserverresponse_p.h | 3 ++- src/httpserver/qhttpserverrouter_p.h | 3 ++- src/httpserver/qhttpserverrouterrule_p.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/httpserver/qhttpserverresponse_p.h b/src/httpserver/qhttpserverresponse_p.h index 3bc404f..bcaa3cc 100644 --- a/src/httpserver/qhttpserverresponse_p.h +++ b/src/httpserver/qhttpserverresponse_p.h @@ -54,8 +54,9 @@ #include -struct QHttpServerResponsePrivate +class QHttpServerResponsePrivate { +public: QByteArray mimeType; QByteArray data; QHttpServerResponse::StatusCode statusCode; diff --git a/src/httpserver/qhttpserverrouter_p.h b/src/httpserver/qhttpserverrouter_p.h index 345a8c3..c03edd7 100644 --- a/src/httpserver/qhttpserverrouter_p.h +++ b/src/httpserver/qhttpserverrouter_p.h @@ -61,8 +61,9 @@ QT_BEGIN_NAMESPACE -struct QHttpServerRouterPrivate +class QHttpServerRouterPrivate { +public: QHttpServerRouterPrivate(); QMap converters; diff --git a/src/httpserver/qhttpserverrouterrule_p.h b/src/httpserver/qhttpserverrouterrule_p.h index 75d0185..ce61bb2 100644 --- a/src/httpserver/qhttpserverrouterrule_p.h +++ b/src/httpserver/qhttpserverrouterrule_p.h @@ -57,8 +57,9 @@ QT_BEGIN_NAMESPACE -struct Q_HTTPSERVER_EXPORT QHttpServerRouterRulePrivate +class Q_HTTPSERVER_EXPORT QHttpServerRouterRulePrivate { +public: QString pathPattern; QHttpServerRequest::Methods methods; QHttpServerRouterRule::RouterHandler routerHandler; -- cgit v1.2.3