Replace all uses of qMin and qMax with std::min and std::max

Change-Id: Ia8900b9ff007e4e619772a427d31b3e2c92147df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 26c461bd6..949572f2f 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -116,7 +116,7 @@ FileTime Executor::recursiveFileTime(const QString &filePath) const
         m_logger.qbsWarning() << Tr::tr("File '%1' not found.").arg(nativeFilePath);
         return newest;
     }
-    newest = qMax(fileInfo.lastModified(), fileInfo.lastStatusChange());
+    newest = std::max(fileInfo.lastModified(), fileInfo.lastStatusChange());
     if (!fileInfo.isDir())
         return newest;
     const QStringList dirContents = QDir(filePath)
diff --git a/src/lib/corelib/language/qualifiedid.cpp b/src/lib/corelib/language/qualifiedid.cpp
index 49d887458..e49b82b3c 100644
--- a/src/lib/corelib/language/qualifiedid.cpp
+++ b/src/lib/corelib/language/qualifiedid.cpp
@@ -39,6 +39,8 @@
 
 #include "qualifiedid.h"
 
+#include <algorithm>
+
 namespace qbs {
 namespace Internal {
 
@@ -68,7 +70,7 @@ QString QualifiedId::toString() const
 
 bool operator<(const QualifiedId &a, const QualifiedId &b)
 {
-    const int c = qMin(a.count(), b.count());
+    const int c = std::min(a.count(), b.count());
     for (int i = 0; i < c; ++i) {
         int n = a.at(i).compare(b.at(i));
         if (n < 0)
diff --git a/src/lib/corelib/parser/qmlerror.cpp b/src/lib/corelib/parser/qmlerror.cpp
index 2d3475027..db156e288 100644
--- a/src/lib/corelib/parser/qmlerror.cpp
+++ b/src/lib/corelib/parser/qmlerror.cpp
@@ -43,6 +43,8 @@
 #include <QtCore/qfile.h>
 #include <QtCore/qstringlist.h>
 
+#include <algorithm>
+
 namespace QbsQmlJS {
 
 /*!
@@ -268,8 +270,8 @@ QDebug operator<<(QDebug debug, const QmlError &error)
                 debug << "\n    " << qPrintable(line);
 
                 if (error.column() > 0) {
-                    int column = qMax(0, error.column() - 1);
-                    column = qMin(column, line.length());
+                    int column = std::max(0, error.column() - 1);
+                    column = std::min(column, line.length());
 
                     QByteArray ind;
                     ind.reserve(column);