aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring. "Remove" call to the overridable "CheckState" method.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2017-03-31 11:54:05 +03:00
parent 3d9feaf3c5
commit b506b1d177
38 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/vtools/dialogs/support/dialogeditwrongformula.h
View File

@ -88,7 +88,7 @@ public slots:
void Increments(); void Increments();
void Functions(); void Functions();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
private slots: private slots:

2
src/libs/vtools/dialogs/tools/dialogalongline.cpp
View File

@ -81,7 +81,7 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, const quint32 &toolId,
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint); FillComboBoxPoints(ui->comboBoxSecondPoint);

2
src/libs/vtools/dialogs/tools/dialogarc.h
View File

@ -83,7 +83,7 @@ public slots:
void FXF1(); void FXF1();
void FXF2(); void FXF2();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** /**
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables

2
src/libs/vtools/dialogs/tools/dialogarcwithlength.h
View File

@ -84,7 +84,7 @@ public slots:
void FXLength(); void FXLength();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** /**
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables

2
src/libs/vtools/dialogs/tools/dialogbisector.cpp
View File

@ -73,7 +73,7 @@ DialogBisector::DialogBisector(const VContainer *data, const quint32 &toolId, QW
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint); FillComboBoxPoints(ui->comboBoxSecondPoint);

2
src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
View File

@ -58,7 +58,7 @@ DialogCubicBezier::DialogCubicBezier(const VContainer *data, const quint32 &tool
FillComboBoxPoints(ui->comboBoxP4); FillComboBoxPoints(ui->comboBoxP4);
FillComboBoxLineColors(ui->comboBoxColor); FillComboBoxLineColors(ui->comboBoxColor);
CheckState(); DialogTool::CheckState();
connect(ui->comboBoxP1, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged), connect(ui->comboBoxP1, static_cast<void (QComboBox::*)(const QString &)>(&QComboBox::currentIndexChanged),
this, &DialogCubicBezier::PointNameChanged); this, &DialogCubicBezier::PointNameChanged);

2
src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
View File

@ -76,7 +76,7 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxAxisPoint); FillComboBoxPoints(ui->comboBoxAxisPoint);
FillComboBoxCurves(ui->comboBoxCurve); FillComboBoxCurves(ui->comboBoxCurve);

2
src/libs/vtools/dialogs/tools/dialogcutarc.cpp
View File

@ -68,7 +68,7 @@ DialogCutArc::DialogCutArc(const VContainer *data, const quint32 &toolId, QWidge
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxArcs(ui->comboBoxArc); FillComboBoxArcs(ui->comboBoxArc);

2
src/libs/vtools/dialogs/tools/dialogcutspline.cpp
View File

@ -68,7 +68,7 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxSplines(ui->comboBoxSpline); FillComboBoxSplines(ui->comboBoxSpline);

2
src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
View File

@ -68,7 +68,7 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxSplinesPath(ui->comboBoxSplinePath); FillComboBoxSplinesPath(ui->comboBoxSplinePath);

2
src/libs/vtools/dialogs/tools/dialogellipticalarc.h
View File

@ -95,7 +95,7 @@ public slots:
void FXRotationAngle(); void FXRotationAngle();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** /**
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables

2
src/libs/vtools/dialogs/tools/dialogendline.cpp
View File

@ -87,7 +87,7 @@ DialogEndLine::DialogEndLine(const VContainer *data, const quint32 &toolId, QWid
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxBasePoint); FillComboBoxPoints(ui->comboBoxBasePoint);
FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics()); FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics());

2
src/libs/vtools/dialogs/tools/dialogflippingbyaxis.h
View File

@ -75,7 +75,7 @@ private slots:
void SuffixChanged(); void SuffixChanged();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** @brief SaveData Put dialog data in local variables */ /** @brief SaveData Put dialog data in local variables */

2
src/libs/vtools/dialogs/tools/dialogflippingbyline.h
View File

@ -75,7 +75,7 @@ private slots:
void SuffixChanged(); void SuffixChanged();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** @brief SaveData Put dialog data in local variables */ /** @brief SaveData Put dialog data in local variables */

2
src/libs/vtools/dialogs/tools/dialoggroup.cpp
View File

@ -40,7 +40,7 @@ DialogGroup::DialogGroup(const VContainer *data, const quint32 &toolId, QWidget
{ {
ui->setupUi(this); ui->setupUi(this);
InitOkCancel(ui); InitOkCancel(ui);
CheckState(); DialogTool::CheckState();
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogGroup::NameChanged); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogGroup::NameChanged);
} }

2
src/libs/vtools/dialogs/tools/dialogheight.cpp
View File

@ -70,7 +70,7 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge
ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel)); ui->lineEditNamePoint->setText(qApp->getCurrentDocument()->GenerateLabel(LabelType::NewLabel));
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxBasePoint); FillComboBoxPoints(ui->comboBoxBasePoint);
FillComboBoxPoints(ui->comboBoxP1Line); FillComboBoxPoints(ui->comboBoxP1Line);

2
src/libs/vtools/dialogs/tools/dialoginsertnode.h
View File

@ -57,7 +57,7 @@ public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
private: private:
Q_DISABLE_COPY(DialogInsertNode) Q_DISABLE_COPY(DialogInsertNode)

2
src/libs/vtools/dialogs/tools/dialoglineintersect.h
View File

@ -85,7 +85,7 @@ private:
/** @brief flagPoint keep state of point */ /** @brief flagPoint keep state of point */
bool flagPoint; bool flagPoint;
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
bool CheckIntersecion(); bool CheckIntersecion();
}; };

2
src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
View File

@ -80,7 +80,7 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxAxisPoint); FillComboBoxPoints(ui->comboBoxAxisPoint);
FillComboBoxPoints(ui->comboBoxFirstLinePoint); FillComboBoxPoints(ui->comboBoxFirstLinePoint);

2
src/libs/vtools/dialogs/tools/dialogmove.h
View File

@ -84,7 +84,7 @@ private slots:
void SuffixChanged(); void SuffixChanged();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** @brief SaveData Put dialog data in local variables */ /** @brief SaveData Put dialog data in local variables */

2
src/libs/vtools/dialogs/tools/dialognormal.cpp
View File

@ -73,7 +73,7 @@ DialogNormal::DialogNormal(const VContainer *data, const quint32 &toolId, QWidge
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint); FillComboBoxPoints(ui->comboBoxSecondPoint);

2
src/libs/vtools/dialogs/tools/dialogpiecepath.h
View File

@ -61,7 +61,7 @@ public slots:
virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; virtual void ShowDialog(bool click) Q_DECL_OVERRIDE;
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;

2
src/libs/vtools/dialogs/tools/dialogpin.h
View File

@ -57,7 +57,7 @@ public slots:
virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE; virtual void ChosenObject(quint32 id, const SceneObject &type) Q_DECL_OVERRIDE;
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
private: private:

2
src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
View File

@ -53,7 +53,7 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxTangentPoint); FillComboBoxPoints(ui->comboBoxTangentPoint);
FillComboBoxArcs(ui->comboBoxArc); FillComboBoxArcs(ui->comboBoxArc);

2
src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.h
View File

@ -82,7 +82,7 @@ protected:
*/ */
virtual void SaveData() Q_DECL_OVERRIDE; virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
private: private:
Q_DISABLE_COPY(DialogPointFromCircleAndTangent) Q_DISABLE_COPY(DialogPointFromCircleAndTangent)

2
src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
View File

@ -72,7 +72,7 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint); FillComboBoxPoints(ui->comboBoxSecondPoint);

2
src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
View File

@ -61,7 +61,7 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxFirstPoint); FillComboBoxPoints(ui->comboBoxFirstPoint);
FillComboBoxPoints(ui->comboBoxSecondPoint); FillComboBoxPoints(ui->comboBoxSecondPoint);

2
src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
View File

@ -55,7 +55,7 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);
CheckState(); DialogTool::CheckState();
FillComboBoxArcs(ui->comboBoxArc1); FillComboBoxArcs(ui->comboBoxArc1);
FillComboBoxArcs(ui->comboBoxArc2); FillComboBoxArcs(ui->comboBoxArc2);

2
src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h
View File

@ -92,7 +92,7 @@ protected:
*/ */
virtual void SaveData() Q_DECL_OVERRIDE; virtual void SaveData() Q_DECL_OVERRIDE;
virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
private: private:
Q_DISABLE_COPY(DialogPointOfIntersectionCircles) Q_DISABLE_COPY(DialogPointOfIntersectionCircles)

2
src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.h
View File

@ -75,7 +75,7 @@ protected:
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables
*/ */
virtual void SaveData() Q_DECL_OVERRIDE; virtual void SaveData() Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
private slots: private slots:
void CurveChanged(); void CurveChanged();

2
src/libs/vtools/dialogs/tools/dialogrotation.h
View File

@ -77,7 +77,7 @@ private slots:
void SuffixChanged(); void SuffixChanged();
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** @brief SaveData Put dialog data in local variables */ /** @brief SaveData Put dialog data in local variables */

2
src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
View File

@ -74,7 +74,7 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, const quint32 &
InitOkCancelApply(ui); InitOkCancelApply(ui);
flagFormula = false; flagFormula = false;
CheckState(); DialogTool::CheckState();
FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics()); FillComboBoxTypeLine(ui->comboBoxLineType, VAbstractTool::LineStylesPics());
FillComboBoxPoints(ui->comboBoxP1Line); FillComboBoxPoints(ui->comboBoxP1Line);

2
src/libs/vtools/dialogs/tools/dialogsinglepoint.cpp
View File

@ -57,7 +57,7 @@ DialogSinglePoint::DialogSinglePoint(const VContainer *data, const quint32 &tool
InitOkCancel(ui); InitOkCancel(ui);
flagName = true; flagName = true;
CheckState(); DialogTool::CheckState();
connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged); connect(ui->lineEditName, &QLineEdit::textChanged, this, &DialogTool::NamePointChanged);
} }

2
src/libs/vtools/dialogs/tools/dialogspline.h
View File

@ -67,7 +67,7 @@ public slots:
virtual void PointNameChanged() Q_DECL_OVERRIDE; virtual void PointNameChanged() Q_DECL_OVERRIDE;
virtual void ShowDialog(bool click) Q_DECL_OVERRIDE; virtual void ShowDialog(bool click) Q_DECL_OVERRIDE;
protected: protected:
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
/** /**
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables

2
src/libs/vtools/dialogs/tools/dialogsplinepath.h
View File

@ -68,7 +68,7 @@ public slots:
protected: protected:
virtual void ShowVisualization() Q_DECL_OVERRIDE; virtual void ShowVisualization() Q_DECL_OVERRIDE;
virtual void SaveData() 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; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
private slots: private slots:
void PointChanged(int row); void PointChanged(int row);

2
src/libs/vtools/dialogs/tools/dialogtriangle.cpp
View File

@ -61,7 +61,7 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW
labelEditNamePoint = ui->labelEditNamePoint; labelEditNamePoint = ui->labelEditNamePoint;
InitOkCancelApply(ui); InitOkCancelApply(ui);
CheckState(); DialogTool::CheckState();
FillComboBoxPoints(ui->comboBoxAxisP1); FillComboBoxPoints(ui->comboBoxAxisP1);
FillComboBoxPoints(ui->comboBoxAxisP2); FillComboBoxPoints(ui->comboBoxAxisP2);

2
src/libs/vtools/dialogs/tools/dialogtruedarts.h
View File

@ -82,7 +82,7 @@ protected:
* @brief SaveData Put dialog data in local variables * @brief SaveData Put dialog data in local variables
*/ */
virtual void SaveData() Q_DECL_OVERRIDE; virtual void SaveData() Q_DECL_OVERRIDE;
virtual void CheckState() Q_DECL_OVERRIDE; virtual void CheckState() Q_DECL_FINAL;
private: private:
Q_DISABLE_COPY(DialogTrueDarts) Q_DISABLE_COPY(DialogTrueDarts)

2
src/libs/vtools/dialogs/tools/piece/dialogseamallowance.h
View File

@ -70,7 +70,7 @@ public slots:
protected: protected:
/** @brief SaveData Put dialog data in local variables */ /** @brief SaveData Put dialog data in local variables */
virtual void SaveData() 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; virtual void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE;
virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE; virtual void showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;