diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-14 13:33:49 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-03-20 15:31:19 +0000 |
| commit | 51bffeb0b8b1bd5a79f8cc28e3608079269c6ec9 (patch) | |
| tree | b57e0540972d71eae0a29a1d3d35bab195f2f526 /src/lib/corelib/parser | |
| parent | 16aead876c46b934acb4c3832a930cac539b36bd (diff) | |
Replace all uses of qMin and qMax with std::min and std::max
Change-Id: Ia8900b9ff007e4e619772a427d31b3e2c92147df
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/parser')
| -rw-r--r-- | src/lib/corelib/parser/qmlerror.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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); |