summaryrefslogtreecommitdiffstats
path: root/src/tools/uic/cpp
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2012-11-01 23:30:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-13 16:53:14 +0200
commit549c3248ec9788c9657ecfc238e6a8f3e2f630a1 (patch)
tree76271f07e3da2ade683a521561a4ad3dcaa70a3a /src/tools/uic/cpp
parent8b0624182bd4998d32c23eded5dbe6dccfd26d5b (diff)
Remove qFill usages from uic
QtAlgorithms is getting deprecated, see http://www.mail-archive.com/development@qt-project.org/msg01603.html Change-Id: I58d0c78609381b20ffe8a68e36c8216689362ed5 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/tools/uic/cpp')
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 8bd7b13be8..9b1903b136 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -51,6 +51,8 @@
#include <qtextstream.h>
#include <qdebug.h>
+#include <algorithm>
+
#include <ctype.h>
QT_BEGIN_NAMESPACE
@@ -362,8 +364,8 @@ int SizePolicyHandle::compare(const SizePolicyHandle &rhs) const
WriteInitialization::LayoutDefaultHandler::LayoutDefaultHandler()
{
- qFill(m_state, m_state + NumProperties, 0u);
- qFill(m_defaultValues, m_defaultValues + NumProperties, 0);
+ std::fill_n(m_state, int(NumProperties), 0u);
+ std::fill_n(m_defaultValues, int(NumProperties), 0);
}