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>
This commit is contained in:
parent
182bfb21b7
commit
b4567a7bf2
@ -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));
|
||||
}
|
||||
|
||||
/*!
|
||||
|
Loading…
x
Reference in New Issue
Block a user