From fb15284483ba972e5d01e87df7ea19c8bd08a879 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 2 Mar 2024 15:24:09 +0200 Subject: [PATCH] Sonarcloud warnings. --- src/app/tape/tkmmainwindow.h | 4 ++-- src/app/tape/tmainwindow.h | 6 +++--- src/app/valentina/mainwindow.h | 4 ++-- src/libs/vpatterndb/vpassmark.cpp | 2 +- .../dialogs/support/dialogeditwrongformula.h | 2 +- .../vtools/dialogs/tools/dialogalongline.h | 2 +- src/libs/vtools/dialogs/tools/dialogarc.h | 2 +- .../dialogs/tools/dialogarcwithlength.h | 2 +- .../vtools/dialogs/tools/dialogbisector.h | 2 +- .../vtools/dialogs/tools/dialogcubicbezier.h | 7 ++++--- .../dialogs/tools/dialogcubicbezierpath.h | 4 ++-- .../dialogs/tools/dialogcurveintersectaxis.h | 2 +- src/libs/vtools/dialogs/tools/dialogcutarc.h | 2 +- .../vtools/dialogs/tools/dialogcutspline.h | 2 +- .../dialogs/tools/dialogcutsplinepath.h | 2 +- .../dialogs/tools/dialogellipticalarc.h | 4 ++-- src/libs/vtools/dialogs/tools/dialogendline.h | 4 ++-- .../dialogs/tools/dialogflippingbyaxis.h | 7 ++++--- .../dialogs/tools/dialogflippingbyline.h | 7 ++++--- src/libs/vtools/dialogs/tools/dialoggroup.h | 4 ++-- src/libs/vtools/dialogs/tools/dialogheight.h | 2 +- src/libs/vtools/dialogs/tools/dialogline.h | 4 ++-- .../dialogs/tools/dialoglineintersect.h | 4 ++-- .../dialogs/tools/dialoglineintersectaxis.h | 4 ++-- src/libs/vtools/dialogs/tools/dialogmove.h | 4 ++-- src/libs/vtools/dialogs/tools/dialognormal.h | 4 ++-- .../tools/dialogpointfromarcandtangent.h | 4 ++-- .../tools/dialogpointfromcircleandtangent.h | 7 ++++--- .../dialogs/tools/dialogpointofcontact.h | 4 ++-- .../dialogs/tools/dialogpointofintersection.h | 4 ++-- .../tools/dialogpointofintersectionarcs.h | 4 ++-- .../tools/dialogpointofintersectioncircles.h | 7 ++++--- .../tools/dialogpointofintersectioncurves.h | 4 ++-- .../vtools/dialogs/tools/dialogrotation.h | 4 ++-- .../dialogs/tools/dialogshoulderpoint.h | 4 ++-- .../vtools/dialogs/tools/dialogsinglepoint.h | 4 ++-- src/libs/vtools/dialogs/tools/dialogspline.h | 4 ++-- .../vtools/dialogs/tools/dialogsplinepath.h | 4 ++-- .../vtools/dialogs/tools/dialogtriangle.h | 4 ++-- .../vtools/dialogs/tools/dialogtruedarts.h | 4 ++-- .../dialogs/tools/piece/dialoginsertnode.h | 16 ++++++++-------- .../dialogs/tools/piece/dialogpiecepath.h | 6 +++--- .../vtools/dialogs/tools/piece/dialogpin.h | 19 ++++++++++--------- .../dialogs/tools/piece/dialogplacelabel.h | 4 ++-- .../dialogs/tools/piece/dialogseamallowance.h | 8 ++++---- src/libs/vtools/tools/drawTools/vdrawtool.h | 14 +++++--------- src/libs/vtools/tools/vtoolseamallowance.h | 6 +++--- 47 files changed, 115 insertions(+), 113 deletions(-) diff --git a/src/app/tape/tkmmainwindow.h b/src/app/tape/tkmmainwindow.h index 353c6338e..e9edc47c6 100644 --- a/src/app/tape/tkmmainwindow.h +++ b/src/app/tape/tkmmainwindow.h @@ -47,7 +47,7 @@ class VPatternImage; class QCompleter; class QxtCsvModel; -class TKMMainWindow : public VAbstractMainWindow +class TKMMainWindow final : public VAbstractMainWindow { Q_OBJECT // NOLINT @@ -68,7 +68,7 @@ protected: void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; auto eventFilter(QObject *object, QEvent *event) -> bool override; - void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) final; + void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) override; auto RecentFileList() const -> QStringList override; private slots: diff --git a/src/app/tape/tmainwindow.h b/src/app/tape/tmainwindow.h index 8fc717a04..bbff112fc 100644 --- a/src/app/tape/tmainwindow.h +++ b/src/app/tape/tmainwindow.h @@ -52,7 +52,7 @@ class QAbstractButton; class QUuid; class VKnownMeasurements; -class TMainWindow : public VAbstractMainWindow +class TMainWindow final : public VAbstractMainWindow { Q_OBJECT // NOLINT @@ -80,7 +80,7 @@ protected: void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; auto eventFilter(QObject *object, QEvent *event) -> bool override; - void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) final; + void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) override; auto RecentFileList() const -> QStringList override; private slots: @@ -295,7 +295,7 @@ private: void SetCurrentDimensionValues(); auto DimensionRestrictedValues(int index, const MeasurementDimension_p &dimension) -> QVector; - + auto OrderedMeasurements() const -> QMap>; void InitIcons(); diff --git a/src/app/valentina/mainwindow.h b/src/app/valentina/mainwindow.h index 8fe614f9f..974895bd5 100644 --- a/src/app/valentina/mainwindow.h +++ b/src/app/valentina/mainwindow.h @@ -64,7 +64,7 @@ class VWidgetBackgroundImages; /** * @brief The MainWindow class main windows. */ -class MainWindow : public MainWindowsNoGUI +class MainWindow final : public MainWindowsNoGUI { Q_OBJECT // NOLINT @@ -120,7 +120,7 @@ protected: void customEvent(QEvent *event) override; void CleanLayout() override; void PrepareSceneList(PreviewQuatilty quality) override; - void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) final; + void ExportToCSVData(const QString &fileName, bool withHeader, int mib, const QChar &separator) override; void ToolBarStyle(QToolBar *bar) const override; private slots: void ScaleChanged(qreal scale); diff --git a/src/libs/vpatterndb/vpassmark.cpp b/src/libs/vpatterndb/vpassmark.cpp index 78844320f..d0fda8ebe 100644 --- a/src/libs/vpatterndb/vpassmark.cpp +++ b/src/libs/vpatterndb/vpassmark.cpp @@ -152,7 +152,7 @@ auto PassmarkAngle(const VPiecePassmarkData &passmarkData, qreal angle) -> qreal //--------------------------------------------------------------------------------------------------------------------- auto PassmarkWidth(const VPiecePassmarkData &passmarkData, qreal width) -> qreal { - auto ValidateWidth = [passmarkData](qreal width) + auto ValidateWidth = [&passmarkData](qreal width) { if (qAbs(width) <= accuracyPointOnLine) { diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index fa5ce8efd..a06fad0b4 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -105,7 +105,7 @@ signals: void DialogApplied(); protected: - virtual auto IsValid() const -> bool final; + virtual auto IsValid() const -> bool; void closeEvent(QCloseEvent *event) override; void showEvent(QShowEvent *event) override; void resizeEvent(QResizeEvent *event) override; diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.h b/src/libs/vtools/dialogs/tools/dialogalongline.h index eb0747e6c..1598792e2 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.h +++ b/src/libs/vtools/dialogs/tools/dialogalongline.h @@ -96,7 +96,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogAlongLine) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 8ad3b52c0..1acf1b86f 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -103,7 +103,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ValidateAlias(); diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index 415154abe..576befe94 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -99,7 +99,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ValidateAlias(); diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.h b/src/libs/vtools/dialogs/tools/dialogbisector.h index 0fe63f48f..eebffb424 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.h +++ b/src/libs/vtools/dialogs/tools/dialogbisector.h @@ -98,7 +98,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogBisector) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h index c1226123d..75adc8a23 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.h @@ -44,12 +44,13 @@ namespace Ui class DialogCubicBezier; } -class DialogCubicBezier : public DialogTool +class DialogCubicBezier final : public DialogTool { Q_OBJECT // NOLINT public: - explicit DialogCubicBezier(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); + explicit DialogCubicBezier(const VContainer *data, VAbstractPattern *doc, quint32 toolId, + QWidget *parent = nullptr); ~DialogCubicBezier() override; auto GetSpline() const -> VCubicBezier; @@ -68,7 +69,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ValidateAlias(); diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h index fdfca4a9e..489b01332 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.h @@ -45,7 +45,7 @@ namespace Ui class DialogCubicBezierPath; } -class DialogCubicBezierPath : public DialogTool +class DialogCubicBezierPath final : public DialogTool { Q_OBJECT // NOLINT @@ -67,7 +67,7 @@ public slots: protected: void ShowVisualization() override; void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void PointChanged(int row); diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h index 34aa1033e..e317b60b8 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.h @@ -93,7 +93,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ValidateAlias(); diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.h b/src/libs/vtools/dialogs/tools/dialogcutarc.h index 0cbe1910e..ffbce2680 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.h +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.h @@ -92,7 +92,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ArcChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.h b/src/libs/vtools/dialogs/tools/dialogcutspline.h index 857dd87d2..19859e6db 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.h +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.h @@ -90,7 +90,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void SplineChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h index 5f707f62c..a96a3cc22 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.h @@ -90,7 +90,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void SplinePathChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h index ce5a10abf..fa9d2640f 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h @@ -42,7 +42,7 @@ namespace Ui class DialogEllipticalArc; } -class DialogEllipticalArc : public DialogTool +class DialogEllipticalArc final : public DialogTool { Q_OBJECT // NOLINT @@ -110,7 +110,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ValidateAlias(); diff --git a/src/libs/vtools/dialogs/tools/dialogendline.h b/src/libs/vtools/dialogs/tools/dialogendline.h index e90c78aeb..07f35b0ba 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.h +++ b/src/libs/vtools/dialogs/tools/dialogendline.h @@ -45,7 +45,7 @@ class DialogEndLine; /** * @brief The DialogEndLine class dialog for ToolEndLine. Help create point and edit option. */ -class DialogEndLine : public DialogTool +class DialogEndLine final : public DialogTool { Q_OBJECT // NOLINT @@ -97,7 +97,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogEndLine) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h index 4fca4b490..4f0f49de3 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h @@ -46,12 +46,13 @@ namespace Ui class DialogFlippingByAxis; } -class DialogFlippingByAxis : public DialogTool +class DialogFlippingByAxis final : public DialogTool { Q_OBJECT // NOLINT public: - explicit DialogFlippingByAxis(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); + explicit DialogFlippingByAxis(const VContainer *data, VAbstractPattern *doc, quint32 toolId, + QWidget *parent = nullptr); ~DialogFlippingByAxis() override; auto GetOriginPointId() const -> quint32; @@ -99,7 +100,7 @@ protected: /** @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h index 078c8f0e8..0330c809b 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h @@ -46,12 +46,13 @@ namespace Ui class DialogFlippingByLine; } -class DialogFlippingByLine : public DialogTool +class DialogFlippingByLine final : public DialogTool { Q_OBJECT // NOLINT public: - explicit DialogFlippingByLine(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); + explicit DialogFlippingByLine(const VContainer *data, VAbstractPattern *doc, quint32 toolId, + QWidget *parent = nullptr); ~DialogFlippingByLine() override; auto GetFirstLinePointId() const -> quint32; @@ -99,7 +100,7 @@ protected: /** @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.h b/src/libs/vtools/dialogs/tools/dialoggroup.h index 6b1f1e36e..7a0ca8ef6 100644 --- a/src/libs/vtools/dialogs/tools/dialoggroup.h +++ b/src/libs/vtools/dialogs/tools/dialoggroup.h @@ -42,7 +42,7 @@ namespace Ui class DialogGroup; } -class DialogGroup : public DialogTool +class DialogGroup final : public DialogTool { Q_OBJECT // NOLINT @@ -66,7 +66,7 @@ public slots: void SelectedObject(bool selected, quint32 object, quint32 tool) override; protected: - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void NameChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogheight.h b/src/libs/vtools/dialogs/tools/dialogheight.h index c6ee9d0dd..8bd4e4d5c 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.h +++ b/src/libs/vtools/dialogs/tools/dialogheight.h @@ -84,7 +84,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogHeight) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogline.h b/src/libs/vtools/dialogs/tools/dialogline.h index e8fd9685d..4f52062f0 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.h +++ b/src/libs/vtools/dialogs/tools/dialogline.h @@ -45,7 +45,7 @@ class DialogLine; /** * @brief The DialogLine class dialog for ToolLine. Help create line and edit option. */ -class DialogLine : public DialogTool +class DialogLine final : public DialogTool { Q_OBJECT // NOLINT @@ -78,7 +78,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogLine) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h index f6e7b5335..67a0ca260 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h @@ -45,7 +45,7 @@ class DialogLineIntersect; /** * @brief The DialogLineIntersect class dialog for ToolLineIntersect. Help create point and edit option. */ -class DialogLineIntersect : public DialogTool +class DialogLineIntersect final : public DialogTool { Q_OBJECT // NOLINT @@ -82,7 +82,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogLineIntersect) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h index 205f8d511..ba43cc0eb 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.h @@ -42,7 +42,7 @@ namespace Ui class DialogLineIntersectAxis; } -class DialogLineIntersectAxis : public DialogTool +class DialogLineIntersectAxis final : public DialogTool { Q_OBJECT // NOLINT @@ -91,7 +91,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogLineIntersectAxis) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogmove.h b/src/libs/vtools/dialogs/tools/dialogmove.h index 6e7b7c367..724f76dd5 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.h +++ b/src/libs/vtools/dialogs/tools/dialogmove.h @@ -45,7 +45,7 @@ namespace Ui class DialogMove; } -class DialogMove : public DialogTool +class DialogMove final : public DialogTool { Q_OBJECT // NOLINT @@ -115,7 +115,7 @@ protected: /** @brief SaveData Put dialog data in local variables */ void SaveData() override; void closeEvent(QCloseEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogMove) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialognormal.h b/src/libs/vtools/dialogs/tools/dialognormal.h index 353359fa4..d25abe1fb 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.h +++ b/src/libs/vtools/dialogs/tools/dialognormal.h @@ -45,7 +45,7 @@ class DialogNormal; /** * @brief The DialogNormal class dialog for ToolNormal. Help create point and edit option. */ -class DialogNormal : public DialogTool +class DialogNormal final : public DialogTool { Q_OBJECT // NOLINT @@ -97,7 +97,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogNormal) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h index 888ec7bc2..bebd0fe90 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.h @@ -43,7 +43,7 @@ namespace Ui class DialogPointFromArcAndTangent; } -class DialogPointFromArcAndTangent : public DialogTool +class DialogPointFromArcAndTangent final : public DialogTool { Q_OBJECT // NOLINT @@ -76,7 +76,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointFromArcAndTangent) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h index bb9491d8f..0ed6a10d9 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -43,12 +43,13 @@ namespace Ui class DialogPointFromCircleAndTangent; } -class DialogPointFromCircleAndTangent : public DialogTool +class DialogPointFromCircleAndTangent final : public DialogTool { Q_OBJECT // NOLINT public: - DialogPointFromCircleAndTangent(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); + DialogPointFromCircleAndTangent(const VContainer *data, VAbstractPattern *doc, quint32 toolId, + QWidget *parent = nullptr); ~DialogPointFromCircleAndTangent() override; auto GetPointName() const -> QString; @@ -87,7 +88,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointFromCircleAndTangent) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h index 7eff7ac4c..cb4d54df8 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.h @@ -45,7 +45,7 @@ class DialogPointOfContact; /** * @brief The DialogPointOfContact class dialog for ToolPointOfContact. Help create point and edit option. */ -class DialogPointOfContact : public DialogTool +class DialogPointOfContact final : public DialogTool { Q_OBJECT // NOLINT @@ -91,7 +91,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointOfContact) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h index 7c50dad94..e90b014ef 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.h @@ -45,7 +45,7 @@ class DialogPointOfIntersection; /** * @brief The DialogPointOfIntersection class dialog for ToolPointOfIntersection. Help create point and edit option. */ -class DialogPointOfIntersection : public DialogTool +class DialogPointOfIntersection final : public DialogTool { Q_OBJECT // NOLINT @@ -75,7 +75,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointOfIntersection) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h index f64f19bb6..1cfcc2dfb 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.h @@ -43,7 +43,7 @@ namespace Ui class DialogPointOfIntersectionArcs; } -class DialogPointOfIntersectionArcs : public DialogTool +class DialogPointOfIntersectionArcs final : public DialogTool { Q_OBJECT // NOLINT @@ -77,7 +77,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointOfIntersectionArcs) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h index f7e58b376..47c5eb7b6 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -43,12 +43,13 @@ namespace Ui class DialogPointOfIntersectionCircles; } -class DialogPointOfIntersectionCircles : public DialogTool +class DialogPointOfIntersectionCircles final : public DialogTool { Q_OBJECT // NOLINT public: - DialogPointOfIntersectionCircles(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); + DialogPointOfIntersectionCircles(const VContainer *data, VAbstractPattern *doc, quint32 toolId, + QWidget *parent = nullptr); ~DialogPointOfIntersectionCircles() override; auto GetPointName() const -> QString; @@ -95,7 +96,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPointOfIntersectionCircles) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h index 460f46e9a..f93c5f177 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h @@ -43,7 +43,7 @@ namespace Ui class DialogPointOfIntersectionCurves; } -class DialogPointOfIntersectionCurves : public DialogTool +class DialogPointOfIntersectionCurves final : public DialogTool { Q_OBJECT // NOLINT @@ -92,7 +92,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void CurveChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h index 174d03066..ad46414f7 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.h +++ b/src/libs/vtools/dialogs/tools/dialogrotation.h @@ -45,7 +45,7 @@ namespace Ui class DialogRotation; } -class DialogRotation : public DialogTool +class DialogRotation final : public DialogTool { Q_OBJECT // NOLINT @@ -104,7 +104,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void PointChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h index 8292c7c74..f59cb3761 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.h @@ -45,7 +45,7 @@ class DialogShoulderPoint; /** * @brief The DialogShoulderPoint class dialog for ToolShoulderPoint. Help create point and edit option. */ -class DialogShoulderPoint : public DialogTool +class DialogShoulderPoint final : public DialogTool { Q_OBJECT // NOLINT @@ -97,7 +97,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogShoulderPoint) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h index 1d333d7d4..d0c231a21 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.h +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.h @@ -45,7 +45,7 @@ class DialogSinglePoint; /** * @brief The DialogSinglePoint class dialog for ToolSinglePoint. Help create point and edit option. */ -class DialogSinglePoint : public DialogTool +class DialogSinglePoint final : public DialogTool { Q_OBJECT // NOLINT @@ -69,7 +69,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogSinglePoint) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index e74e34a41..550503c47 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -47,7 +47,7 @@ class DialogSpline; /** * @brief The DialogSpline class dialog for ToolSpline. Help create spline and edit option. */ -class DialogSpline : public DialogTool +class DialogSpline final : public DialogTool { Q_OBJECT // NOLINT @@ -74,7 +74,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void DeployAngle1TextEdit(); diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index 17f2472a5..52670faff 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -48,7 +48,7 @@ class DialogSplinePath; /** * @brief The DialogSplinePath class dialog for ToolSplinePath. Help create spline path and edit option. */ -class DialogSplinePath : public DialogTool +class DialogSplinePath final : public DialogTool { Q_OBJECT // NOLINT @@ -72,7 +72,7 @@ protected: void SaveData() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; void showEvent(QShowEvent *event) override; void resizeEvent(QResizeEvent *event) override; diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.h b/src/libs/vtools/dialogs/tools/dialogtriangle.h index 093fb6d18..e17d71fe1 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.h +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.h @@ -45,7 +45,7 @@ class DialogTriangle; /** * @brief The DialogTriangle class dialog for ToolTriangle. Help create point and edit option. */ -class DialogTriangle : public DialogTool +class DialogTriangle final : public DialogTool { Q_OBJECT // NOLINT @@ -81,7 +81,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogTriangle) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h index 7c8962484..a4cb3e352 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h @@ -42,7 +42,7 @@ namespace Ui class DialogTrueDarts; } -class DialogTrueDarts : public DialogTool +class DialogTrueDarts final : public DialogTool { Q_OBJECT // NOLINT @@ -86,7 +86,7 @@ protected: * @brief SaveData Put dialog data in local variables */ void SaveData() override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogTrueDarts) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h index ffc3ab8ec..a26e41507 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h +++ b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.h @@ -34,31 +34,31 @@ namespace Ui { - class DialogInsertNode; +class DialogInsertNode; } -class DialogInsertNode : public DialogTool +class DialogInsertNode final : public DialogTool { Q_OBJECT // NOLINT public: explicit DialogInsertNode(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); - virtual ~DialogInsertNode(); + ~DialogInsertNode() override; - virtual void SetPiecesList(const QVector &list) override; + void SetPiecesList(const QVector &list) override; auto GetPieceId() const -> quint32; - void SetPieceId(quint32 id); + void SetPieceId(quint32 id); auto GetNodes() const -> QVector; - virtual void ShowDialog(bool click) override; + void ShowDialog(bool click) override; public slots: - virtual void SelectedObject(bool selected, quint32 object, quint32 tool) override; + void SelectedObject(bool selected, quint32 object, quint32 tool) override; protected: - virtual auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ShowContextMenu(const QPoint &pos); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h index 4fe3c18dd..f26ecbc80 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.h @@ -36,7 +36,7 @@ namespace Ui class DialogPiecePath; } -class DialogPiecePath : public DialogTool +class DialogPiecePath final : public DialogTool { Q_OBJECT // NOLINT @@ -63,11 +63,11 @@ public slots: void ShowDialog(bool click) override; protected: - void CheckState() final; + void CheckState() override; void ShowVisualization() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void ShowContextMenu(const QPoint &pos); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpin.h b/src/libs/vtools/dialogs/tools/piece/dialogpin.h index 3b8f51713..4f78cf56e 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpin.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.h @@ -33,32 +33,33 @@ namespace Ui { - class DialogPin; +class DialogPin; } -class DialogPin : public DialogTool +class DialogPin final : public DialogTool { Q_OBJECT // NOLINT + public: explicit DialogPin(const VContainer *data, VAbstractPattern *doc, quint32 toolId, QWidget *parent = nullptr); - virtual ~DialogPin(); + ~DialogPin() override; void EnbleShowMode(bool disable); auto GetPieceId() const -> quint32; - void SetPieceId(quint32 id); + void SetPieceId(quint32 id); auto GetPointId() const -> quint32; - void SetPointId(quint32 id); + void SetPointId(quint32 id); - virtual void SetPiecesList(const QVector &list) override; + void SetPiecesList(const QVector &list) override; public slots: - virtual void ChosenObject(quint32 id, const SceneObject &type) override; + void ChosenObject(quint32 id, const SceneObject &type) override; protected: - virtual void ShowVisualization() override; - virtual auto IsValid() const -> bool final; + void ShowVisualization() override; + auto IsValid() const -> bool override; private: Q_DISABLE_COPY_MOVE(DialogPin) // NOLINT diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h index 56a861d91..17789dffc 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.h @@ -37,7 +37,7 @@ class DialogPlaceLabel; class VPlaceLabelItem; -class DialogPlaceLabel : public DialogTool +class DialogPlaceLabel final : public DialogTool { Q_OBJECT // NOLINT @@ -80,7 +80,7 @@ protected: void ShowVisualization() override; void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; + auto IsValid() const -> bool override; private slots: void DeployFormulaWidthEdit(); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h index dd8786347..cdde605fc 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h @@ -50,7 +50,7 @@ class VisPieceSpecialPoints; class FancyTabBar; class VUndoCommand; -class DialogSeamAllowance : public DialogTool +class DialogSeamAllowance final : public DialogTool { Q_OBJECT // NOLINT @@ -74,13 +74,13 @@ public slots: protected: /** @brief SaveData Put dialog data in local variables */ void SaveData() override; - void CheckState() final; + void CheckState() override; void closeEvent(QCloseEvent *event) override; void showEvent(QShowEvent *event) override; void resizeEvent(QResizeEvent *event) override; void changeEvent(QEvent *event) override; - auto IsValid() const -> bool final; - void SetPatternDoc(VAbstractPattern *doc) final; + auto IsValid() const -> bool override; + void SetPatternDoc(VAbstractPattern *doc) override; private slots: void NameDetailChanged(); diff --git a/src/libs/vtools/tools/drawTools/vdrawtool.h b/src/libs/vtools/tools/drawTools/vdrawtool.h index 052b81c48..2932dd0f4 100644 --- a/src/libs/vtools/tools/drawTools/vdrawtool.h +++ b/src/libs/vtools/tools/drawTools/vdrawtool.h @@ -55,13 +55,9 @@ struct VDrawToolInitData : VAbstractToolInitData { - VDrawToolInitData() - : VAbstractToolInitData(), - notes() - { - } + VDrawToolInitData() = default; - QString notes; + QString notes{}; }; /** @@ -73,7 +69,7 @@ class VDrawTool : public VInteractiveTool public: VDrawTool(VAbstractPattern *doc, VContainer *data, quint32 id, const QString ¬es, QObject *parent = nullptr); - virtual ~VDrawTool() = default; + ~VDrawTool() override = default; auto getLineType() const -> QString; virtual void SetLineType(const QString &value); @@ -122,10 +118,10 @@ protected: /** @brief SaveDialog save options into file after change in dialog. */ virtual void SaveDialog(QDomElement &domElement, QList &oldDependencies, QList &newDependencies) = 0; - virtual void SaveDialogChange(const QString &undoText = QString()) final; + void SaveDialogChange(const QString &undoText = QString()) final; virtual void ApplyToolOptions(const QList &oldDependencies, const QList &newDependencies, const QDomElement &oldDomElement, const QDomElement &newDomElement); - virtual void AddToFile() override; + void AddToFile() override; void SaveOption(QSharedPointer &obj); virtual void SaveOptions(QDomElement &tag, QSharedPointer &obj); virtual auto MakeToolTip() const -> QString; diff --git a/src/libs/vtools/tools/vtoolseamallowance.h b/src/libs/vtools/tools/vtoolseamallowance.h index 475ef22d6..38246846b 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.h +++ b/src/libs/vtools/tools/vtoolseamallowance.h @@ -50,7 +50,7 @@ struct VToolSeamAllowanceInitData : VAbstractToolInitData QString drawName{}; // NOLINT(misc-non-private-member-variables-in-classes) }; -class VToolSeamAllowance : public VInteractiveTool, public QGraphicsPathItem +class VToolSeamAllowance final : public VInteractiveTool, public QGraphicsPathItem { Q_OBJECT // NOLINT @@ -161,8 +161,8 @@ protected: void SetVisualization() override {} void DeleteToolWithConfirm(bool ask = true) override; void ToolCreation(const Source &typeCreation) override; - void SetDialog() final; - void SaveDialogChange(const QString &undoText = QString()) final; + void SetDialog() override; + void SaveDialogChange(const QString &undoText = QString()) override; private slots: void ToggleInLayout(bool checked);