From e200f05bc75d8f19df624bc3849d9c5bbf096873 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Fri, 27 Sep 2013 14:13:26 +0200 Subject: 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 --- src/location/maps/qgeocameratiles.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/location/maps/qgeocameratiles.cpp') 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 +#include #include 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 -- cgit v1.2.1