diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index 64c7d16c3..b95b75cb6 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -260,17 +260,24 @@ struct VLabelTemplateLine struct VWatermarkData { - int opacity{20}; - bool showText{true}; - QString text{}; - int textRotation{0}; - QFont font{}; - bool showImage{true}; - QString path{}; - int imageRotation{0}; - bool grayscale{false}; - bool invalidFile{false}; - QColor textColor{Qt::black}; + int opacity{20}; // NOLINT(misc-non-private-member-variables-in-classes) + bool showText{true}; // NOLINT(misc-non-private-member-variables-in-classes) + QString text{}; // NOLINT(misc-non-private-member-variables-in-classes) + int textRotation{0}; // NOLINT(misc-non-private-member-variables-in-classes) + QFont font{}; // NOLINT(misc-non-private-member-variables-in-classes) + bool showImage{true}; // NOLINT(misc-non-private-member-variables-in-classes) + QString path{}; // NOLINT(misc-non-private-member-variables-in-classes) + int imageRotation{0}; // NOLINT(misc-non-private-member-variables-in-classes) + bool grayscale{false}; // NOLINT(misc-non-private-member-variables-in-classes) + bool invalidFile{false}; // NOLINT(misc-non-private-member-variables-in-classes) + QColor textColor{Qt::black}; // NOLINT(misc-non-private-member-variables-in-classes) + + VWatermarkData() = default; + VWatermarkData(VWatermarkData &&) noexcept = default; + auto operator=(VWatermarkData &&) noexcept -> VWatermarkData & = default; + VWatermarkData(const VWatermarkData &) = default; + auto operator=(const VWatermarkData &) -> VWatermarkData & = default; + ~VWatermarkData() = default; }; QT_WARNING_POP diff --git a/src/libs/ifc/xml/vabstractpattern.h b/src/libs/ifc/xml/vabstractpattern.h index 555ced511..02f12749d 100644 --- a/src/libs/ifc/xml/vabstractpattern.h +++ b/src/libs/ifc/xml/vabstractpattern.h @@ -93,9 +93,16 @@ QT_WARNING_DISABLE_GCC("-Weffc++") struct VFormulaField { - QString expression; - QDomElement element; - QString attribute; + QString expression; // NOLINT(misc-non-private-member-variables-in-classes) + QDomElement element; // NOLINT(misc-non-private-member-variables-in-classes) + QString attribute; // NOLINT(misc-non-private-member-variables-in-classes) + + VFormulaField() = default; + VFormulaField(VFormulaField &&) noexcept = default; + auto operator=(VFormulaField &&) noexcept -> VFormulaField & = default; + VFormulaField(const VFormulaField &) = default; + auto operator=(const VFormulaField &) -> VFormulaField & = default; + ~VFormulaField() = default; }; struct VFinalMeasurement diff --git a/src/libs/vlayout/vfoldline.h b/src/libs/vlayout/vfoldline.h index 0850db9c5..090db507e 100644 --- a/src/libs/vlayout/vfoldline.h +++ b/src/libs/vlayout/vfoldline.h @@ -63,10 +63,17 @@ struct ThreeDotsPosData struct FoldLabelPosData { - QFont font{}; - QPointF pos{}; - QString label{}; - qreal angle{0}; + QFont font{}; // NOLINT(misc-non-private-member-variables-in-classes) + QPointF pos{}; // NOLINT(misc-non-private-member-variables-in-classes) + QString label{}; // NOLINT(misc-non-private-member-variables-in-classes) + qreal angle{0}; // NOLINT(misc-non-private-member-variables-in-classes) + + FoldLabelPosData() = default; + FoldLabelPosData(FoldLabelPosData &&) noexcept = default; + auto operator=(FoldLabelPosData &&) noexcept -> FoldLabelPosData & = default; + FoldLabelPosData(const FoldLabelPosData &) = default; + auto operator=(const FoldLabelPosData &) -> FoldLabelPosData & = default; + ~FoldLabelPosData() = default; }; class VFoldLine @@ -76,6 +83,11 @@ class VFoldLine public: VFoldLine() = default; VFoldLine(const QLineF &line, FoldLineType type); + VFoldLine(VFoldLine &&) noexcept = default; + auto operator=(VFoldLine &&) noexcept -> VFoldLine & = default; + VFoldLine(const VFoldLine &) = default; + auto operator=(const VFoldLine &) -> VFoldLine & = default; + ~VFoldLine() = default; void SetHeight(qreal newHeight); void SetWidth(qreal newWidth); diff --git a/src/libs/vlayout/vlayoutdef.h b/src/libs/vlayout/vlayoutdef.h index 1df937635..98cff1808 100644 --- a/src/libs/vlayout/vlayoutdef.h +++ b/src/libs/vlayout/vlayoutdef.h @@ -102,8 +102,15 @@ struct VBestSquareResData struct VCachedPositions { - QRectF boundingRect{}; - QPainterPath layoutAllowancePath{}; + QRectF boundingRect{}; // NOLINT(misc-non-private-member-variables-in-classes) + QPainterPath layoutAllowancePath{}; // NOLINT(misc-non-private-member-variables-in-classes) + + VCachedPositions() = default; + VCachedPositions(VCachedPositions &&) noexcept = default; + auto operator=(VCachedPositions &&) noexcept -> VCachedPositions & = default; + VCachedPositions(const VCachedPositions &) = default; + auto operator=(const VCachedPositions &) -> VCachedPositions & = default; + ~VCachedPositions() = default; }; enum class Cases : qint8 diff --git a/src/libs/vlayout/vtextmanager.h b/src/libs/vlayout/vtextmanager.h index 6ab5fcb5d..a09681aa6 100644 --- a/src/libs/vlayout/vtextmanager.h +++ b/src/libs/vlayout/vtextmanager.h @@ -80,8 +80,8 @@ public: VTextManager(const VTextManager &text) = default; auto operator=(const VTextManager &text) -> VTextManager & = default; - VTextManager(VTextManager &&text) = default; - auto operator=(VTextManager &&text) -> VTextManager & = default; + VTextManager(VTextManager &&text) noexcept = default; + auto operator=(VTextManager &&text) noexcept -> VTextManager & = default; virtual auto GetSpacing() const -> int; diff --git a/src/libs/vmisc/qt_dispatch/qt_dispatch.h b/src/libs/vmisc/qt_dispatch/qt_dispatch.h index 9b7c84a96..fbd20046c 100644 --- a/src/libs/vmisc/qt_dispatch/qt_dispatch.h +++ b/src/libs/vmisc/qt_dispatch/qt_dispatch.h @@ -112,6 +112,4 @@ static inline void q_dispatch_async_main(const msgHandlerBlock &block, QtMsgType q_dispatch_async(mainThread, block, type, context, msg); } -#undef V_UNUSED - #endif // THREAD_DISPATCHER_H