From a63e2cf4af44e3a39b66340a825c81d3be7fcc60 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 18 Aug 2022 10:12:29 +1000 Subject: [PATCH] [qt6] Fix narrowing warnings due to int->size_t type change --- src/server/qgis_mapserver.cpp | 6 +++--- src/server/qgsserverapicontext.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/server/qgis_mapserver.cpp b/src/server/qgis_mapserver.cpp index ef7ecf03c7f..0a75bc21925 100644 --- a/src/server/qgis_mapserver.cpp +++ b/src/server/qgis_mapserver.cpp @@ -198,7 +198,7 @@ class TcpServerWorker: public QObject try { // Parse protocol and URL GET /path HTTP/1.1 - const int firstLinePos { incomingData->indexOf( "\r\n" ) }; + const auto firstLinePos { incomingData->indexOf( "\r\n" ) }; if ( firstLinePos == -1 ) { throw HttpException( QStringLiteral( "HTTP error finding protocol header" ) ); @@ -251,7 +251,7 @@ class TcpServerWorker: public QObject // Headers QgsBufferServerRequest::Headers headers; - const int endHeadersPos { incomingData->indexOf( "\r\n\r\n" ) }; + const auto endHeadersPos { incomingData->indexOf( "\r\n\r\n" ) }; if ( endHeadersPos == -1 ) { @@ -262,7 +262,7 @@ class TcpServerWorker: public QObject for ( const auto &headerLine : httpHeaders ) { - const int headerColonPos { headerLine.indexOf( ':' ) }; + const auto headerColonPos { headerLine.indexOf( ':' ) }; if ( headerColonPos > 0 ) { headers.insert( headerLine.left( headerColonPos ), headerLine.mid( headerColonPos + 2 ) ); diff --git a/src/server/qgsserverapicontext.cpp b/src/server/qgsserverapicontext.cpp index 920a6fc6089..f16c32723a9 100644 --- a/src/server/qgsserverapicontext.cpp +++ b/src/server/qgsserverapicontext.cpp @@ -59,8 +59,8 @@ QgsServerInterface *QgsServerApiContext::serverInterface() const const QString QgsServerApiContext::matchedPath() const { - auto path { mRequest->url().path( )}; - const int idx { path.indexOf( mApiRootPath )}; + QString path { mRequest->url().path( )}; + const auto idx { path.indexOf( mApiRootPath )}; if ( idx != -1 ) { path.truncate( idx + mApiRootPath.length() );