diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-09-27 14:13:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 10:18:15 +0200 |
| commit | e200f05bc75d8f19df624bc3849d9c5bbf096873 (patch) | |
| tree | f35be5b7c249ce3274c74430707c0e7f3e429d32 /src/location/maps/qgeocameratiles.cpp | |
| parent | 32cb5bcec7a63c9c9f858cca950693b789ddba8c (diff) | |
| download | qtlocation-e200f05bc75d8f19df624bc3849d9c5bbf096873.tar.gz | |
QtAlgorithms have been deprecated (1 of 2)
Convert to std algorithms to avoid warnings. One qSort case is still
left since it seems to require a more elaborate fix.
Task-number: QTBUG-11022
Change-Id: Ieccc5050b127a58ff1f0aa7c488909f2acfa2972
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/location/maps/qgeocameratiles.cpp')
| -rw-r--r-- | src/location/maps/qgeocameratiles.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/location/maps/qgeocameratiles.cpp b/src/location/maps/qgeocameratiles.cpp index e921cf9c..a82e4394 100644 --- a/src/location/maps/qgeocameratiles.cpp +++ b/src/location/maps/qgeocameratiles.cpp @@ -55,6 +55,7 @@ #include <QDebug> +#include <algorithm> #include <cmath> QT_BEGIN_NAMESPACE @@ -459,7 +460,7 @@ Polygon QGeoCameraTilesPrivate::frustumFootprint(const Frustum &frustum) const for (i = points.begin(); i != points.end(); ++i) { sorter.base = *i; if (i + 1 != points.end()) - qSort(i + 1, points.end(), sorter); + std::sort(i + 1, points.end(), sorter) ; } // - determine if what we have is right handed |