diff --git a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h index 82c595c88..93e76cb7f 100644 --- a/src/libs/vtools/dialogs/support/dialogeditwrongformula.h +++ b/src/libs/vtools/dialogs/support/dialogeditwrongformula.h @@ -88,7 +88,7 @@ public slots: void Increments(); void Functions(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; private slots: diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index 28d68f0d4..ce0d71868 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -81,7 +81,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId, InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/libs/vtools/dialogs/tools/dialogarc.h b/src/libs/vtools/dialogs/tools/dialogarc.h index 33b2efd4d..dbab66e2b 100644 --- a/src/libs/vtools/dialogs/tools/dialogarc.h +++ b/src/libs/vtools/dialogs/tools/dialogarc.h @@ -83,7 +83,7 @@ public slots: void FXF1(); void FXF2(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables diff --git a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h index 2ee0870a5..ed5947c3d 100644 --- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.h +++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.h @@ -84,7 +84,7 @@ public slots: void FXLength(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index f81ac2d47..8c74c2dc4 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -73,7 +73,7 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index f484264c2..8463a661b 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -58,7 +58,7 @@ DialogCubicBezier::DialogCubicBezier(const VContainer *data, const quint32 &tool FillComboBoxPoints(ui->comboBoxP4); FillComboBoxLineColors(ui->comboBoxColor); - CheckState(); + DialogTool::CheckState(); connect(ui->comboBoxP1, static_cast(&QComboBox::currentIndexChanged), this, &DialogCubicBezier::PointNameChanged); diff --git a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp index c52d44a38..ec7f52124 100644 --- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp @@ -76,7 +76,7 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxAxisPoint); FillComboBoxCurves(ui->comboBoxCurve); diff --git a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp index 9a61192dc..85f003d28 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp @@ -68,7 +68,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxArcs(ui->comboBoxArc); diff --git a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp index 794f27456..34ee9e732 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp @@ -68,7 +68,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId, InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxSplines(ui->comboBoxSpline); diff --git a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp index 31c44eaa9..a493c0bf8 100644 --- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp @@ -68,7 +68,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 & InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxSplinesPath(ui->comboBoxSplinePath); diff --git a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h index 760d27afe..c2b5a2917 100644 --- a/src/libs/vtools/dialogs/tools/dialogellipticalarc.h +++ b/src/libs/vtools/dialogs/tools/dialogellipticalarc.h @@ -95,7 +95,7 @@ public slots: void FXRotationAngle(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables diff --git a/src/libs/vtools/dialogs/tools/dialogendline.cpp b/src/libs/vtools/dialogs/tools/dialogendline.cpp index e59ac6041..6e21c23da 100644 --- a/src/libs/vtools/dialogs/tools/dialogendline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp @@ -87,7 +87,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxBasePoint); FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics()); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h index a8f58c9c3..0718fd075 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h @@ -75,7 +75,7 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h index 489278f89..00fe28723 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.h +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.h @@ -75,7 +75,7 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/dialogs/tools/dialoggroup.cpp b/src/libs/vtools/dialogs/tools/dialoggroup.cpp index 9dcf45b42..29e1553d1 100644 --- a/src/libs/vtools/dialogs/tools/dialoggroup.cpp +++ b/src/libs/vtools/dialogs/tools/dialoggroup.cpp @@ -40,7 +40,7 @@ DialogGroup::DialogGroup(const VContainer *data, const quint32 &toolId, QWidget { ui->setupUi(this); InitOkCancel(ui); - CheckState(); + DialogTool::CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogGroup::NameChanged); } diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index b32cfbb58..23316fa33 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -70,7 +70,7 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxBasePoint); FillComboBoxPoints(ui->comboBoxP1Line); diff --git a/src/libs/vtools/dialogs/tools/dialoginsertnode.h b/src/libs/vtools/dialogs/tools/dialoginsertnode.h index 6171e7c7c..5ece098b9 100644 --- a/src/libs/vtools/dialogs/tools/dialoginsertnode.h +++ b/src/libs/vtools/dialogs/tools/dialoginsertnode.h @@ -57,7 +57,7 @@ public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; private: Q_DISABLE_COPY(DialogInsertNode) diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.h b/src/libs/vtools/dialogs/tools/dialoglineintersect.h index fc2b37876..61b9797c9 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.h +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.h @@ -85,7 +85,7 @@ private: /** @brief flagPoint keep state of point */ bool flagPoint; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; bool CheckIntersecion(); }; diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index 7e4ac7123..4b870a558 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -80,7 +80,7 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxAxisPoint); FillComboBoxPoints(ui->comboBoxFirstLinePoint); diff --git a/src/libs/vtools/dialogs/tools/dialogmove.h b/src/libs/vtools/dialogs/tools/dialogmove.h index 2af9762fb..a7c5b45b1 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.h +++ b/src/libs/vtools/dialogs/tools/dialogmove.h @@ -84,7 +84,7 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 4daae302b..678065326 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -73,7 +73,7 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/libs/vtools/dialogs/tools/dialogpiecepath.h b/src/libs/vtools/dialogs/tools/dialogpiecepath.h index 2bb252704..0ac29a37c 100644 --- a/src/libs/vtools/dialogs/tools/dialogpiecepath.h +++ b/src/libs/vtools/dialogs/tools/dialogpiecepath.h @@ -61,7 +61,7 @@ public slots: virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; diff --git a/src/libs/vtools/dialogs/tools/dialogpin.h b/src/libs/vtools/dialogs/tools/dialogpin.h index ed13b2eb6..4000e7c2d 100644 --- a/src/libs/vtools/dialogs/tools/dialogpin.h +++ b/src/libs/vtools/dialogs/tools/dialogpin.h @@ -57,7 +57,7 @@ public slots: virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; private: diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp index 0fb883c0b..ce75f7747 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp @@ -53,7 +53,7 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxTangentPoint); FillComboBoxArcs(ui->comboBoxArc); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h index aaef6d26b..481512950 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h @@ -82,7 +82,7 @@ protected: */ virtual void SaveData() Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; private: Q_DISABLE_COPY(DialogPointFromCircleAndTangent) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index 8d401e742..c74aa7909 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -72,7 +72,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32 InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 4913f92b6..3a0210cca 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -61,7 +61,7 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxSecondPoint); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 12532e9a5..bf842bd2a 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -55,7 +55,7 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); - CheckState(); + DialogTool::CheckState(); FillComboBoxArcs(ui->comboBoxArc1); FillComboBoxArcs(ui->comboBoxArc2); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h index 729f5c9f0..28eafc152 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h @@ -92,7 +92,7 @@ protected: */ virtual void SaveData() Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; private: Q_DISABLE_COPY(DialogPointOfIntersectionCircles) diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h index e18f03dd0..cfc369235 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h @@ -75,7 +75,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; private slots: void CurveChanged(); diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.h b/src/libs/vtools/dialogs/tools/dialogrotation.h index ac6a14066..3816aa1ae 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.h +++ b/src/libs/vtools/dialogs/tools/dialogrotation.h @@ -77,7 +77,7 @@ private slots: void SuffixChanged(); protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** @brief SaveData Put dialog data in local variables */ diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index c20c04977..678e58011 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -74,7 +74,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 & InitOkCancelApply(ui); flagFormula = false; - CheckState(); + DialogTool::CheckState(); FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics()); FillComboBoxPoints(ui->comboBoxP1Line); diff --git a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp index 12502d7bf..02ba49955 100644 --- a/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp @@ -57,7 +57,7 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool InitOkCancel(ui); flagName = true; - CheckState(); + DialogTool::CheckState(); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged); } diff --git a/src/libs/vtools/dialogs/tools/dialogspline.h b/src/libs/vtools/dialogs/tools/dialogspline.h index c59960994..b69c71019 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.h +++ b/src/libs/vtools/dialogs/tools/dialogspline.h @@ -67,7 +67,7 @@ public slots: virtual void PointNameChanged() Q_DECL_OVERRIDE; virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; protected: - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void ShowVisualization() Q_DECL_OVERRIDE; /** * @brief SaveData Put dialog data in local variables diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.h b/src/libs/vtools/dialogs/tools/dialogsplinepath.h index cbc463917..7d80190a7 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h @@ -68,7 +68,7 @@ public slots: protected: virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; private slots: void PointChanged(int row); diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 1a2b65bbc..0147a4bba 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -61,7 +61,7 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW labelEditNamePoint = ui->labelEditNamePoint; InitOkCancelApply(ui); - CheckState(); + DialogTool::CheckState(); FillComboBoxPoints(ui->comboBoxAxisP1); FillComboBoxPoints(ui->comboBoxAxisP2); diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.h b/src/libs/vtools/dialogs/tools/dialogtruedarts.h index b63d218f1..1bdc181b4 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.h +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.h @@ -82,7 +82,7 @@ protected: * @brief SaveData Put dialog data in local variables */ virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; private: Q_DISABLE_COPY(DialogTrueDarts) diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h index 76472f446..6e514a51f 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h @@ -70,7 +70,7 @@ public slots: protected: /** @brief SaveData Put dialog data in local variables */ virtual void SaveData() Q_DECL_OVERRIDE; - virtual void CheckState() Q_DECL_OVERRIDE; + virtual void CheckState() Q_DECL_FINAL; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;