aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Give static functions more verbose names to not confuse a compiler.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-07-15 14:34:24 +03:00
parent 254d32ff7f
commit 403c57ecc7
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vlayout/vlayoutpiece.cpp
View File

@ -1944,5 +1944,5 @@ auto VLayoutPiece::EdgeByPoint(const QVector<QPointF> &path, const QPointF &p1)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <class T> auto VLayoutPiece::Map(QVector<T> points) const -> QVector<T> template <class T> auto VLayoutPiece::Map(QVector<T> points) const -> QVector<T>
{ {
return Map(points, d->m_matrix, d->m_mirror); return MapVector(points, d->m_matrix, d->m_mirror);
} }

17
src/libs/vlayout/vlayoutpiece.h
View File

@ -221,13 +221,13 @@ public:
auto MapPlaceLabelShape(PlaceLabelImg shape) const -> PlaceLabelImg; auto MapPlaceLabelShape(PlaceLabelImg shape) const -> PlaceLabelImg;
template <class T> static auto Map(QVector<T> points, const QTransform &matrix, bool mirror) -> QVector<T>; template <class T> static auto MapVector(QVector<T> points, const QTransform &matrix, bool mirror) -> QVector<T>;
template <class T> template <class T>
static auto Map(T obj, const QTransform &matrix) -> typename std::enable_if<!IsLayoutPoint<T>::value, T>::type; static auto MapPoint(T obj, const QTransform &matrix) -> typename std::enable_if<!IsLayoutPoint<T>::value, T>::type;
template <class T> template <class T>
static auto Map(T obj, const QTransform &matrix) -> typename std::enable_if<IsLayoutPoint<T>::value, T>::type; static auto MapPoint(T obj, const QTransform &matrix) -> typename std::enable_if<IsLayoutPoint<T>::value, T>::type;
protected: protected:
void SetGrainline(const VPieceGrainline &grainline); void SetGrainline(const VPieceGrainline &grainline);
@ -261,10 +261,11 @@ QT_WARNING_POP
Q_DECLARE_TYPEINFO(VLayoutPiece, Q_MOVABLE_TYPE); // NOLINT Q_DECLARE_TYPEINFO(VLayoutPiece, Q_MOVABLE_TYPE); // NOLINT
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <class T> inline auto VLayoutPiece::Map(QVector<T> points, const QTransform &matrix, bool mirror) -> QVector<T> template <class T>
inline auto VLayoutPiece::MapVector(QVector<T> points, const QTransform &matrix, bool mirror) -> QVector<T>
{ {
std::transform(points.begin(), points.end(), points.begin(), 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) if (mirror)
{ {
std::reverse(points.begin(), points.end()); std::reverse(points.begin(), points.end());
@ -274,14 +275,16 @@ template <class T> inline auto VLayoutPiece::Map(QVector<T> points, const QTrans
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
auto VLayoutPiece::Map(T obj, const QTransform &matrix) -> typename std::enable_if<!IsLayoutPoint<T>::value, T>::type auto VLayoutPiece::MapPoint(T obj, const QTransform &matrix) ->
typename std::enable_if<!IsLayoutPoint<T>::value, T>::type
{ {
return matrix.map(obj); return matrix.map(obj);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
template <typename T> template <typename T>
auto VLayoutPiece::Map(T obj, const QTransform &matrix) -> typename std::enable_if<IsLayoutPoint<T>::value, T>::type auto VLayoutPiece::MapPoint(T obj, const QTransform &matrix) ->
typename std::enable_if<IsLayoutPoint<T>::value, T>::type
{ {
auto p = matrix.map(obj); auto p = matrix.map(obj);
obj.setX(p.x()); obj.setX(p.x());