From 110859475c80df0db73afff01360152f35b962e4 Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Tue, 22 May 2018 16:19:34 +0200 Subject: Convert port string to ushort MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removes clazy warning. Change-Id: Ib019497a8b3f8812ddf51ae59373a7a9501c9b21 Reviewed-by: Mårten Nordheim --- src/plugins/platforms/webgl/qwebglmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/webgl/qwebglmain.cpp b/src/plugins/platforms/webgl/qwebglmain.cpp index 9f34cb3..b42ee18 100644 --- a/src/plugins/platforms/webgl/qwebglmain.cpp +++ b/src/plugins/platforms/webgl/qwebglmain.cpp @@ -56,7 +56,7 @@ QPlatformIntegration* QWebGLIntegrationPlugin::create(const QString& system, return nullptr; } bool ok; - port = parts.last().toUInt(&ok); + port = parts.last().toUShort(&ok); if (!ok) { qCCritical(lcWebGL, "QWebGLIntegrationPlugin::create: Invalid port number"); return nullptr; -- cgit v1.2.3 From 2aaf05b352019f863c6308d8c749ece5ecbba96b Mon Sep 17 00:00:00 2001 From: Jesus Fernandez Date: Tue, 22 May 2018 16:16:21 +0200 Subject: Fix detection of invalid parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It fixes the invalid port check. The condition was dead code due to a previous check. Change-Id: I22bb7497f9577aeed0140542337c0a13200e37a8 Reviewed-by: Mårten Nordheim --- src/plugins/platforms/webgl/qwebglmain.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/webgl/qwebglmain.cpp b/src/plugins/platforms/webgl/qwebglmain.cpp index b42ee18..dd14bec 100644 --- a/src/plugins/platforms/webgl/qwebglmain.cpp +++ b/src/plugins/platforms/webgl/qwebglmain.cpp @@ -50,7 +50,7 @@ QPlatformIntegration* QWebGLIntegrationPlugin::create(const QString& system, if (!paramList.isEmpty()) { for (const QString ¶meter : qAsConst(paramList)) { const QStringList parts = parameter.split('='); - if (parts.first() == QStringLiteral("port") && parts.size() == 2) { + if (parts.first() == QStringLiteral("port")) { if (parts.size() != 2) { qCCritical(lcWebGL, "QWebGLIntegrationPlugin::create: No port specified"); return nullptr; -- cgit v1.2.3