1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove qFill usages from the generic unix theme

Browse Source 
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>
This commit is contained in:
Giuseppe D'Angelo 2013-09-03 00:49:08 +02:00 committed by The Qt Project
parent 182bfb21b7
commit b4567a7bf2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
View File

@ -58,20 +58,22 @@
#include <qpa/qplatformintegration.h> #include <qpa/qplatformintegration.h>
#include <qpa/qplatformservices.h> #include <qpa/qplatformservices.h>
#include <algorithm>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
ResourceHelper::ResourceHelper() ResourceHelper::ResourceHelper()
{ {
qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0));
qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0));
} }
void ResourceHelper::clear() void ResourceHelper::clear()
{ {
qDeleteAll(palettes, palettes + QPlatformTheme::NPalettes); qDeleteAll(palettes, palettes + QPlatformTheme::NPalettes);
qDeleteAll(fonts, fonts + QPlatformTheme::NFonts); qDeleteAll(fonts, fonts + QPlatformTheme::NFonts);
qFill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0)); std::fill(palettes, palettes + QPlatformTheme::NPalettes, static_cast<QPalette *>(0));
qFill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0)); std::fill(fonts, fonts + QPlatformTheme::NFonts, static_cast<QFont *>(0));
} }
/*! /*!