diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp
index 6a9f61a98..c6d79c4da 100644
--- a/src/libs/vlayout/vlayoutpiece.cpp
+++ b/src/libs/vlayout/vlayoutpiece.cpp
@@ -508,20 +508,11 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, vidtype id, const VContai
 template <class T>
 QVector<T> VLayoutPiece::Map(QVector<T> points) const
 {
-    for (int i = 0; i < points.size(); ++i)
-    {
-        points[i] = d->matrix.map(points.at(i));
-    }
-
+    std::transform(points.begin(), points.end(), points.begin(),
+                   [this](const auto &point) { return d->matrix.map(point); });
     if (d->mirror)
     {
-        QList<T> list = ConvertToList(points);
-
-        for (int k=0, s=list.size(), max=(s/2); k<max; k++)
-        {
-            SwapItemsAt(list, k, s-(1+k));
-        }
-        points = ConvertToVector(list);
+        std::reverse(points.begin(), points.end());
     }
     return points;
 }
diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h
index d8184e3f7..92cad1947 100644
--- a/src/libs/vmisc/compatibility.h
+++ b/src/libs/vmisc/compatibility.h
@@ -148,15 +148,16 @@ inline QVector<T> ConvertToVector(const QSet<T> &container)
 }
 
 //---------------------------------------------------------------------------------------------------------------------
-template <typename T>
-inline void SwapItemsAt(T &container, int i, int j)
-{
-#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
-    container.swapItemsAt(i, j);
-#else
-    container.swap(i, j);
-#endif
-}
+// NOTE: Delete if not necessary anymore
+//template <typename T>
+//inline void SwapItemsAt(T &container, int i, int j)
+//{
+//#if QT_VERSION >= QT_VERSION_CHECK(5, 13, 0)
+//    container.swapItemsAt(i, j);
+//#else
+//    container.swap(i, j);
+//#endif
+//}
 
 //---------------------------------------------------------------------------------------------------------------------
 template <typename T>