From 1b28e7838d2876deb2e201d73bcc2ee38843a3a1 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 3 Sep 2013 22:16:49 +0200 Subject: Remove qFill from the Windows platform plugin QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I777fc28857cc104fcd2b6c313a2840b697361be9 Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/qwindowsglcontext.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsglcontext.cpp') diff --git a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp index f6dda04c13..d1ede39549 100644 --- a/src/plugins/platforms/windows/qwindowsglcontext.cpp +++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp @@ -49,6 +49,8 @@ #include #include +#include + #include #include @@ -377,7 +379,7 @@ static int choosePixelFormat(HDC hdc, return 0; int iAttributes[attribSize]; - qFill(iAttributes, iAttributes + attribSize, int(0)); + std::fill(iAttributes, iAttributes + attribSize, int(0)); int i = 0; iAttributes[i++] = WGL_ACCELERATION_ARB; iAttributes[i++] = testFlag(additional.formatFlags, QWindowsGLDirectRendering) ? @@ -505,8 +507,8 @@ static QSurfaceFormat return result; int iAttributes[attribSize]; int iValues[attribSize]; - qFill(iAttributes, iAttributes + attribSize, int(0)); - qFill(iValues, iValues + attribSize, int(0)); + std::fill(iAttributes, iAttributes + attribSize, int(0)); + std::fill(iValues, iValues + attribSize, int(0)); int i = 0; const bool hasSampleBuffers = testFlag(staticContext.extensions, QOpenGLStaticContext::SampleBuffers); @@ -567,7 +569,7 @@ static HGLRC createContext(const QOpenGLStaticContext &staticContext, return 0; int attributes[attribSize]; int attribIndex = 0; - qFill(attributes, attributes + attribSize, int(0)); + std::fill(attributes, attributes + attribSize, int(0)); // We limit the requested version by the version of the static context as // wglCreateContextAttribsARB fails and returns NULL if the requested context -- cgit v1.2.3