diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:04:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 23:20:09 +0200 |
| commit | aa3f358d433ec7fbe0237141c22297f3d8d4120d (patch) | |
| tree | 924e0f4387f601cf1183d0dbfa5433f641dc7a96 /src/gui/kernel/qplatformdialoghelper.cpp | |
| parent | 50a8a5e7959ca315e812413661a76576b7c3bbb8 (diff) | |
Remove deprecated QtAlgorithms calls from QtGui
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I324ddf6129fe8884ecea97ef47abb7c071dfb34c
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/gui/kernel/qplatformdialoghelper.cpp')
| -rw-r--r-- | src/gui/kernel/qplatformdialoghelper.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformdialoghelper.cpp b/src/gui/kernel/qplatformdialoghelper.cpp index 404700292c..f297236655 100644 --- a/src/gui/kernel/qplatformdialoghelper.cpp +++ b/src/gui/kernel/qplatformdialoghelper.cpp @@ -48,6 +48,8 @@ #include <QtCore/QUrl> #include <QtGui/QColor> +#include <algorithm> + QT_BEGIN_NAMESPACE /*! @@ -183,7 +185,7 @@ QColorDialogStaticData::QColorDialogStaticData() : customSet(false) for (int r = 0; r < 4; ++r) for (int b = 0; b < 3; ++b) standardRgb[i++] = qRgb(r * 255 / 3, g * 255 / 3, b * 255 / 2); - qFill(customRgb, customRgb + CustomColorCount, 0xffffffff); + std::fill(customRgb, customRgb + CustomColorCount, 0xffffffff); readSettings(); } |