From 403c57ecc79c46679032c6c1c2772856917801dc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 15 Jul 2023 14:34:24 +0300 Subject: [PATCH] Give static functions more verbose names to not confuse a compiler. --- src/libs/vlayout/vlayoutpiece.cpp | 2 +- src/libs/vlayout/vlayoutpiece.h | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index c5d9bcdf8..cb96b69b9 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -1944,5 +1944,5 @@ auto VLayoutPiece::EdgeByPoint(const QVector &path, const QPointF &p1) //--------------------------------------------------------------------------------------------------------------------- template auto VLayoutPiece::Map(QVector points) const -> QVector { - return Map(points, d->m_matrix, d->m_mirror); + return MapVector(points, d->m_matrix, d->m_mirror); } diff --git a/src/libs/vlayout/vlayoutpiece.h b/src/libs/vlayout/vlayoutpiece.h index 144761561..44f9747a4 100644 --- a/src/libs/vlayout/vlayoutpiece.h +++ b/src/libs/vlayout/vlayoutpiece.h @@ -221,13 +221,13 @@ public: auto MapPlaceLabelShape(PlaceLabelImg shape) const -> PlaceLabelImg; - template static auto Map(QVector points, const QTransform &matrix, bool mirror) -> QVector; + template static auto MapVector(QVector points, const QTransform &matrix, bool mirror) -> QVector; template - static auto Map(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type; + static auto MapPoint(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type; template - static auto Map(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type; + static auto MapPoint(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type; protected: void SetGrainline(const VPieceGrainline &grainline); @@ -261,10 +261,11 @@ QT_WARNING_POP Q_DECLARE_TYPEINFO(VLayoutPiece, Q_MOVABLE_TYPE); // NOLINT //--------------------------------------------------------------------------------------------------------------------- -template inline auto VLayoutPiece::Map(QVector points, const QTransform &matrix, bool mirror) -> QVector +template +inline auto VLayoutPiece::MapVector(QVector points, const QTransform &matrix, bool mirror) -> QVector { std::transform(points.begin(), points.end(), points.begin(), - [matrix](const T &point) { return VLayoutPiece::Map(point, matrix); }); + [matrix](const T &point) { return MapPoint(point, matrix); }); if (mirror) { std::reverse(points.begin(), points.end()); @@ -274,14 +275,16 @@ template inline auto VLayoutPiece::Map(QVector points, const QTrans //--------------------------------------------------------------------------------------------------------------------- template -auto VLayoutPiece::Map(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type +auto VLayoutPiece::MapPoint(T obj, const QTransform &matrix) -> + typename std::enable_if::value, T>::type { return matrix.map(obj); } //--------------------------------------------------------------------------------------------------------------------- template -auto VLayoutPiece::Map(T obj, const QTransform &matrix) -> typename std::enable_if::value, T>::type +auto VLayoutPiece::MapPoint(T obj, const QTransform &matrix) -> + typename std::enable_if::value, T>::type { auto p = matrix.map(obj); obj.setX(p.x());