diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2012-11-01 15:30:36 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 16:21:10 +0200 |
| commit | 0ec406695e9c141691d1fa6f458e9d85b7023140 (patch) | |
| tree | 08246fa671979d1a1aa13f2285eb02de811927af /src/corelib/io/qsettings.cpp | |
| parent | f30f58edc31fec0b992cb291e5c959563341176a (diff) | |
Remove qSort usage from QSettings
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I5aabfd2dd4fa48a4d94407ca444591e9df7b981d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 22eda87c36..ebcaf062e3 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -72,6 +72,7 @@ # include <ioLib.h> #endif +#include <algorithm> #include <stdlib.h> #ifdef Q_OS_WIN // for homedirpath reading from registry @@ -1905,7 +1906,7 @@ bool QConfFileSettingsPrivate::writeIniFile(QIODevice &device, const ParsedSetti sections.reserve(sectionCount); for (i = iniMap.constBegin(); i != iniMap.constEnd(); ++i) sections.append(QSettingsIniKey(i.key(), i.value().position)); - qSort(sections); + std::sort(sections.begin(), sections.end()); bool writeError = false; for (int j = 0; !writeError && j < sectionCount; ++j) { |