diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:49:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 00:49:24 +0200 |
| commit | b4567a7bf203896ba2d4deb8b6336ed4e7e42710 (patch) | |
| tree | 89fb3f5b057007bf49e9bb32a4322f8110d106d4 /src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | |
| parent | 182bfb21b799daf578b9a5fede8431824a016da7 (diff) | |
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 <jpnurmi@digia.com>
Diffstat (limited to 'src/platformsupport/themes/genericunix/qgenericunixthemes.cpp')
| -rw-r--r-- | src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 <qpa/qplatformintegration.h> #include <qpa/qplatformservices.h> +#include <algorithm> + QT_BEGIN_NAMESPACE ResourceHelper::ResourceHelper() { - qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); - qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); + std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); + std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); } void ResourceHelper::clear() { qDeleteAll(palettes, palettes + QPlatformTheme::NPalettes); qDeleteAll(fonts, fonts + QPlatformTheme::NFonts); - qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); - qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); + std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); + std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); } /*! |