From b4567a7bf203896ba2d4deb8b6336ed4e7e42710 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 3 Sep 2013 00:49:08 +0200 Subject: Remove qFill usages from the generic unix theme QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I23719468e22e256caad977fce6c908059d4073ca Reviewed-by: J-P Nurmi --- src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/platformsupport') diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp index fb50230382..ee295afe6c 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp @@ -58,20 +58,22 @@ #include #include +#include + QT_BEGIN_NAMESPACE ResourceHelper::ResourceHelper() { - qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast(0)); - qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast(0)); + std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast(0)); + std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast(0)); } void ResourceHelper::clear() { qDeleteAll(palettes, palettes + QPlatformTheme::NPalettes); qDeleteAll(fonts, fonts + QPlatformTheme::NFonts); - qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast(0)); - qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast(0)); + std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast(0)); + std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast(0)); } /*! -- cgit v1.2.3