diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 22:16:49 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
| commit | 1b28e7838d2876deb2e201d73bcc2ee38843a3a1 (patch) | |
| tree | 05d8908df5e2e246dfb631a0a5ec1dbfdbcb1308 /src/plugins/platforms/windows/qwindowstheme.cpp | |
| parent | aa3f358d433ec7fbe0237141c22297f3d8d4120d (diff) | |
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 <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/plugins/platforms/windows/qwindowstheme.cpp')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowstheme.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp index 724ea00340..1710fd419a 100644 --- a/src/plugins/platforms/windows/qwindowstheme.cpp +++ b/src/plugins/platforms/windows/qwindowstheme.cpp @@ -63,6 +63,8 @@ #include <qpa/qwindowsysteminterface.h> #include <private/qsystemlibrary_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE static inline QTextStream& operator<<(QTextStream &str, const QColor &c) @@ -284,8 +286,8 @@ QWindowsTheme *QWindowsTheme::m_instance = 0; QWindowsTheme::QWindowsTheme() { m_instance = this; - qFill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0)); - qFill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0)); + std::fill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0)); + std::fill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0)); refresh(); } @@ -368,7 +370,7 @@ QVariant QWindowsTheme::themeHint(ThemeHint hint) const void QWindowsTheme::clearPalettes() { qDeleteAll(m_palettes, m_palettes + NPalettes); - qFill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0)); + std::fill(m_palettes, m_palettes + NPalettes, static_cast<QPalette *>(0)); } void QWindowsTheme::refreshPalettes() @@ -389,7 +391,7 @@ void QWindowsTheme::refreshPalettes() void QWindowsTheme::clearFonts() { qDeleteAll(m_fonts, m_fonts + NFonts); - qFill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0)); + std::fill(m_fonts, m_fonts + NFonts, static_cast<QFont *>(0)); } void QWindowsTheme::refreshFonts() |