From e7efa77bb3e730c123411f3ed679036df812f57f Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sun, 5 Apr 2020 14:54:04 +0200 Subject: [PATCH] Compile fixes for clang10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix some warnings that are flagged as errors on clang10. Change-Id: I906634c8b2bd94db42d74a7f3d10efb086e373cc Reviewed-by: Mårten Nordheim (cherry picked from commit bc726ed5d96161b70a22b9a11e0943acca219cfc) --- .../qconcatenatetablesproxymodel.cpp | 2 +- src/corelib/itemmodels/qidentityproxymodel.cpp | 2 +- .../itemmodels/qtransposeproxymodel.cpp | 2 +- src/corelib/text/qlocale.cpp | 2 +- src/gui/painting/qdrawhelper.cpp | 18 +++++++++--------- src/gui/painting/qregion.cpp | 2 +- src/gui/text/qfontengine.cpp | 8 ++++---- src/gui/util/qvalidator.cpp | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp index a2597faa93..0e29714677 100644 --- a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp @@ -642,7 +642,7 @@ void QConcatenateTablesProxyModelPrivate::_q_slotSourceLayoutAboutToBeChanged(co layoutChangePersistentIndexes.reserve(persistentIndexList.size()); layoutChangeProxyIndexes.reserve(persistentIndexList.size()); - for (const QPersistentModelIndex &proxyPersistentIndex : persistentIndexList) { + for (const QModelIndex &proxyPersistentIndex : persistentIndexList) { layoutChangeProxyIndexes.append(proxyPersistentIndex); Q_ASSERT(proxyPersistentIndex.isValid()); const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp index f5684c6eda..8210e27f8a 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -532,7 +532,7 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QListlayoutAboutToBeChanged(parents, hint); const auto proxyPersistentIndexes = q->persistentIndexList(); - for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) { + for (const QModelIndex &proxyPersistentIndex : proxyPersistentIndexes) { proxyIndexes << proxyPersistentIndex; Q_ASSERT(proxyPersistentIndex.isValid()); const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp index 4853f90632..207faa6151 100644 --- a/src/corelib/itemmodels/qtransposeproxymodel.cpp +++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp @@ -92,7 +92,7 @@ void QTransposeProxyModelPrivate::onLayoutAboutToBeChanged(const QListmapToSource(proxyPersistentIndex); diff --git a/src/corelib/text/qlocale.cpp b/src/corelib/text/qlocale.cpp index e74b825774..fac62c94a4 100644 --- a/src/corelib/text/qlocale.cpp +++ b/src/corelib/text/qlocale.cpp @@ -4509,7 +4509,7 @@ QStringList QLocale::uiLanguages() const if (!res.isNull()) { uiLanguages = res.toStringList(); // ... but we need to include likely-adjusted forms of each of those, too: - for (const auto entry : qAsConst(uiLanguages)) + for (const auto &entry : qAsConst(uiLanguages)) locales.append(QLocale(entry)); } if (locales.isEmpty()) diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index f153557077..169b6b8869 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -2842,15 +2842,15 @@ static void QT_FASTCALL fetchTransformedBilinearARGB32PM_fast_rotate_helper(uint fy += fdy; ++b; } - uint *boundedEnd = end; \ - if (fdx > 0) \ - boundedEnd = qMin(boundedEnd, b + (max_fx - fx) / fdx); \ - else if (fdx < 0) \ - boundedEnd = qMin(boundedEnd, b + (min_fx - fx) / fdx); \ - if (fdy > 0) \ - boundedEnd = qMin(boundedEnd, b + (max_fy - fy) / fdy); \ - else if (fdy < 0) \ - boundedEnd = qMin(boundedEnd, b + (min_fy - fy) / fdy); \ + uint *boundedEnd = end; + if (fdx > 0) + boundedEnd = qMin(boundedEnd, b + (max_fx - fx) / fdx); + else if (fdx < 0) + boundedEnd = qMin(boundedEnd, b + (min_fx - fx) / fdx); + if (fdy > 0) + boundedEnd = qMin(boundedEnd, b + (max_fy - fy) / fdy); + else if (fdy < 0) + boundedEnd = qMin(boundedEnd, b + (min_fy - fy) / fdy); // until boundedEnd we can now have a fast middle part without boundary checks #if defined(__SSE2__) diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index bac042c784..739a4d04e6 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -2845,7 +2845,7 @@ static bool RectInRegion(QRegionPrivate *region, int rx, int ry, uint rwidth, ui break; } } - return partIn ? ((ry <= prect->bottom()) ? RectanglePart : RectangleIn) : RectangleOut; + return partIn; } // END OF Region.c extract // START OF poly.h extract diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index b6046b0fc5..5005f120dd 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -757,10 +757,10 @@ Q_GUI_EXPORT void qt_addBitmapToPath(qreal x0, qreal y0, const uchar *image_data // set up edges for (int y = 0; y <= h; ++y) { for (int x = 0; x <= w; ++x) { - bool topLeft = (x == 0)|(y == 0) ? false : SET(x - 1, y - 1); - bool topRight = (x == w)|(y == 0) ? false : SET(x, y - 1); - bool bottomLeft = (x == 0)|(y == h) ? false : SET(x - 1, y); - bool bottomRight = (x == w)|(y == h) ? false : SET(x, y); + bool topLeft = (x == 0 || y == 0) ? false : SET(x - 1, y - 1); + bool topRight = (x == w || y == 0) ? false : SET(x, y - 1); + bool bottomLeft = (x == 0 || y == h) ? false : SET(x - 1, y); + bool bottomRight = (x == w || y == h) ? false : SET(x, y); GRID(x, y) = 0; if ((!topRight) & bottomRight) diff --git a/src/gui/util/qvalidator.cpp b/src/gui/util/qvalidator.cpp index 6e87faf534..a2faa21172 100644 --- a/src/gui/util/qvalidator.cpp +++ b/src/gui/util/qvalidator.cpp @@ -704,7 +704,7 @@ QValidator::State QDoubleValidatorPrivate::validateWithLocale(QString &input, QL if (notation == QDoubleValidator::StandardNotation) { double max = qMax(qAbs(q->b), qAbs(q->t)); - if (max < LLONG_MAX) { + if (max < double(LLONG_MAX)) { qlonglong n = pow10(numDigits(qlonglong(max))); // In order to get the highest possible number in the intermediate // range we need to get 10 to the power of the number of digits