From be52aeb68e528dab9bc3f56889e1c4e81d96f0bd Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 29 Jan 2022 16:56:21 +0200 Subject: [PATCH] Fix build with Qt 5.6. --- .../vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp | 2 +- .../vtools/tools/backgroundimage/vbackgroundpixmapitem.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp b/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp index 71052ff4a..c7f340c97 100644 --- a/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp +++ b/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.cpp @@ -114,7 +114,7 @@ auto VBackgroundPixmapItem::opaqueArea() const -> QPainterPath } //--------------------------------------------------------------------------------------------------------------------- -auto VBackgroundPixmapItem::ShapeMode() const -> enum ShapeMode +auto VBackgroundPixmapItem::GetShapeMode() const -> enum ShapeMode { return m_shapeMode; } diff --git a/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.h b/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.h index fa52beaf6..66d634414 100644 --- a/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.h +++ b/src/libs/vtools/tools/backgroundimage/vbackgroundpixmapitem.h @@ -41,7 +41,7 @@ enum class ShapeMode HeuristicMaskShape }; -class VBackgroundPixmapItem : public VBackgroundImageItem +class VBackgroundPixmapItem : public VBackgroundImageItem // clazy:exclude=ctor-missing-parent-argument,missing-qobject-macro { public: VBackgroundPixmapItem(const VBackgroundPatternImage &image, VAbstractPattern *doc, QGraphicsItem *parent = nullptr); @@ -59,7 +59,7 @@ public: auto isObscuredBy(const QGraphicsItem *item) const -> bool override; auto opaqueArea() const -> QPainterPath override; - auto ShapeMode() const -> ShapeMode; + auto GetShapeMode() const -> ShapeMode; void SetShapeMode(enum ShapeMode mode); protected: @@ -70,7 +70,7 @@ protected: void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; private: - Q_DISABLE_COPY_MOVE(VBackgroundPixmapItem) + Q_DISABLE_COPY_MOVE(VBackgroundPixmapItem) // NOLINT mutable QPixmap m_pixmap{}; Qt::TransformationMode m_transformationMode{Qt::SmoothTransformation};