From 503e31aee00227f8d8de77d99d05f6df01ff4af6 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 24 Jul 2019 16:45:22 +0300 Subject: [PATCH] Fix error: 'currentIndexChanged' is deprecated: Use currentTextChanged() instead. --HG-- branch : develop --- src/app/tape/tmainwindow.cpp | 4 ++-- src/app/valentina/mainwindow.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogalongline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogbisector.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp | 8 ++++---- .../vtools/dialogs/tools/dialogflippingbyaxis.cpp | 2 +- .../vtools/dialogs/tools/dialogflippingbyline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogheight.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialogline.cpp | 4 ++-- .../vtools/dialogs/tools/dialoglineintersect.cpp | 8 ++++---- .../vtools/dialogs/tools/dialoglineintersectaxis.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialognormal.cpp | 4 ++-- .../tools/dialogpointfromcircleandtangent.cpp | 2 +- .../vtools/dialogs/tools/dialogpointofcontact.cpp | 6 +++--- .../dialogs/tools/dialogpointofintersection.cpp | 4 ++-- .../dialogs/tools/dialogpointofintersectionarcs.cpp | 4 ++-- .../tools/dialogpointofintersectioncircles.cpp | 4 ++-- .../tools/dialogpointofintersectioncurves.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogrotation.cpp | 2 +- .../vtools/dialogs/tools/dialogshoulderpoint.cpp | 6 +++--- src/libs/vtools/dialogs/tools/dialogspline.cpp | 4 ++-- src/libs/vtools/dialogs/tools/dialogtriangle.cpp | 8 ++++---- src/libs/vtools/dialogs/tools/dialogtruedarts.cpp | 10 +++++----- .../dialogs/tools/piece/dialogseamallowance.cpp | 12 ++++++------ 24 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index f6094760b..10ac9c6f1 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -2039,13 +2039,13 @@ void TMainWindow::InitWindow() labelGradationHeights = new QLabel(tr("Height:")); gradationHeights = SetGradationList(labelGradationHeights, listHeights); SetDefaultHeight(static_cast(data->height())); - connect(gradationHeights, QOverload::of(&QComboBox::currentIndexChanged), + connect(gradationHeights, &QComboBox::currentTextChanged, this, &TMainWindow::ChangedHeight); labelGradationSizes = new QLabel(tr("Size:")); gradationSizes = SetGradationList(labelGradationSizes, listSizes); SetDefaultSize(static_cast(data->size())); - connect(gradationSizes, QOverload::of(&QComboBox::currentIndexChanged), + connect(gradationSizes, &QComboBox::currentTextChanged, this, &TMainWindow::ChangedSize); connect(ui->doubleSpinBoxBaseValue, QOverload::of(&QDoubleSpinBox::valueChanged), diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 237bdbe08..1e11e7a62 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1939,7 +1939,7 @@ void MainWindow::ToolBarOption() // set default height SetDefaultHeight(); - connect(gradationHeights.data(), QOverload::of(&QComboBox::currentIndexChanged), + connect(gradationHeights.data(), &QComboBox::currentTextChanged, this, &MainWindow::ChangedHeight); gradationSizesLabel = new QLabel(tr("Size:"), this); @@ -1948,7 +1948,7 @@ void MainWindow::ToolBarOption() // set default size SetDefaultSize(); - connect(gradationSizes.data(), QOverload::of(&QComboBox::currentIndexChanged), + connect(gradationSizes.data(), &QComboBox::currentTextChanged, this, &MainWindow::ChangedSize); ui->toolBarOption->addSeparator(); diff --git a/src/libs/vtools/dialogs/tools/dialogalongline.cpp b/src/libs/vtools/dialogs/tools/dialogalongline.cpp index 50149f6c2..bf1f0c57a 100644 --- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp @@ -104,9 +104,9 @@ DialogAlongLine::DialogAlongLine(const VContainer *data, quint32 toolId, QWidget timerFormula->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogAlongLine::DeployFormulaTextEdit); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogAlongLine::PointChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogAlongLine::PointChanged); vis = new VisToolAlongLine(data); diff --git a/src/libs/vtools/dialogs/tools/dialogbisector.cpp b/src/libs/vtools/dialogs/tools/dialogbisector.cpp index 90d696501..85f667c3f 100644 --- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp +++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp @@ -98,11 +98,11 @@ DialogBisector::DialogBisector(const VContainer *data, quint32 toolId, QWidget * timerFormula->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogBisector::DeployFormulaTextEdit); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogBisector::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogBisector::PointNameChanged); - connect(ui->comboBoxThirdPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxThirdPoint, &QComboBox::currentTextChanged, this, &DialogBisector::PointNameChanged); vis = new VisToolBisector(data); diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp index dcea78636..213fbcdcf 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp @@ -63,13 +63,13 @@ DialogCubicBezier::DialogCubicBezier(const VContainer *data, quint32 toolId, QWi ui->doubleSpinBoxApproximationScale->setMaximum(maxCurveApproximationScale); - connect(ui->comboBoxP1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1, &QComboBox::currentTextChanged, this, &DialogCubicBezier::PointNameChanged); - connect(ui->comboBoxP2, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP2, &QComboBox::currentTextChanged, this, &DialogCubicBezier::PointNameChanged); - connect(ui->comboBoxP3, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP3, &QComboBox::currentTextChanged, this, &DialogCubicBezier::PointNameChanged); - connect(ui->comboBoxP4, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP4, &QComboBox::currentTextChanged, this, &DialogCubicBezier::PointNameChanged); vis = new VisToolCubicBezier(data); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index 080b473f2..f24daa1a8 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -80,7 +80,7 @@ DialogFlippingByAxis::DialogFlippingByAxis(const VContainer *data, quint32 toolI ui->comboBoxOriginPoint->setCurrentIndex(-1); connect(ui->lineEditSuffix, &QLineEdit::textChanged, this, &DialogFlippingByAxis::SuffixChanged); - connect(ui->comboBoxOriginPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxOriginPoint, &QComboBox::currentTextChanged, this, &DialogFlippingByAxis::PointChanged); vis = new VisToolFlippingByAxis(data); diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index 7adce1b19..19aa5cfe5 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -78,9 +78,9 @@ DialogFlippingByLine::DialogFlippingByLine(const VContainer *data, quint32 toolI FillComboBoxPoints(ui->comboBoxSecondLinePoint); connect(ui->lineEditSuffix, &QLineEdit::textChanged, this, &DialogFlippingByLine::SuffixChanged); - connect(ui->comboBoxFirstLinePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstLinePoint, &QComboBox::currentTextChanged, this, &DialogFlippingByLine::PointChanged); - connect(ui->comboBoxSecondLinePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondLinePoint, &QComboBox::currentTextChanged, this, &DialogFlippingByLine::PointChanged); vis = new VisToolFlippingByLine(data); diff --git a/src/libs/vtools/dialogs/tools/dialogheight.cpp b/src/libs/vtools/dialogs/tools/dialogheight.cpp index c9d00a492..12534c597 100644 --- a/src/libs/vtools/dialogs/tools/dialogheight.cpp +++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp @@ -82,11 +82,11 @@ DialogHeight::DialogHeight(const VContainer *data, quint32 toolId, QWidget *pare CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxBasePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxBasePoint, &QComboBox::currentTextChanged, this, &DialogHeight::PointNameChanged); - connect(ui->comboBoxP1Line, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1Line, &QComboBox::currentTextChanged, this, &DialogHeight::PointNameChanged); - connect(ui->comboBoxP2Line, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP2Line, &QComboBox::currentTextChanged, this, &DialogHeight::PointNameChanged); vis = new VisToolHeight(data); diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 5c5e9b112..70561e791 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -66,9 +66,9 @@ DialogLine::DialogLine(const VContainer *data, quint32 toolId, QWidget *parent) number = 0; - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogLine::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogLine::PointNameChanged); vis = new VisToolLine(data); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 1caedcc8e..369d28f3c 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -82,13 +82,13 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, quint32 toolId, CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxP1Line1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1Line1, &QComboBox::currentTextChanged, this, &DialogLineIntersect::PointNameChanged); - connect(ui->comboBoxP2Line1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP2Line1, &QComboBox::currentTextChanged, this, &DialogLineIntersect::PointNameChanged); - connect(ui->comboBoxP1Line2, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1Line2, &QComboBox::currentTextChanged, this, &DialogLineIntersect::PointNameChanged); - connect(ui->comboBoxP2Line2, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP2Line2, &QComboBox::currentTextChanged, this, &DialogLineIntersect::PointNameChanged); vis = new VisToolLineIntersect(data); diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp index b00bfa76f..fc7ada377 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp @@ -101,11 +101,11 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, quint32 }); connect(ui->pushButtonGrowLengthAngle, &QPushButton::clicked, this, &DialogLineIntersectAxis::DeployAngleTextEdit); connect(timerFormula, &QTimer::timeout, this, &DialogLineIntersectAxis::EvalAngle); - connect(ui->comboBoxFirstLinePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstLinePoint, &QComboBox::currentTextChanged, this, &DialogLineIntersectAxis::PointNameChanged); - connect(ui->comboBoxSecondLinePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondLinePoint, &QComboBox::currentTextChanged, this, &DialogLineIntersectAxis::PointNameChanged); - connect(ui->comboBoxAxisPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxAxisPoint, &QComboBox::currentTextChanged, this, &DialogLineIntersectAxis::PointNameChanged); vis = new VisToolLineIntersectAxis(data); diff --git a/src/libs/vtools/dialogs/tools/dialognormal.cpp b/src/libs/vtools/dialogs/tools/dialognormal.cpp index 4fccea9a7..a6fd24402 100644 --- a/src/libs/vtools/dialogs/tools/dialognormal.cpp +++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp @@ -108,9 +108,9 @@ DialogNormal::DialogNormal(const VContainer *data, quint32 toolId, QWidget *pare timerFormula->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogNormal::DeployFormulaTextEdit); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogNormal::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogNormal::PointNameChanged); vis = new VisToolNormal(data); diff --git a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp index 916686bcd..f0f3e4fdf 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp @@ -88,7 +88,7 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxCircleCenter, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCircleCenter, &QComboBox::currentTextChanged, this, &DialogPointFromCircleAndTangent::PointChanged); connect(ui->toolButtonExprRadius, &QPushButton::clicked, this, diff --git a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp index 8a0eab1e2..32fc6f44f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp @@ -96,11 +96,11 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, quint32 toolI timerFormula->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogPointOfContact::DeployFormulaTextEdit); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogPointOfContact::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogPointOfContact::PointNameChanged); - connect(ui->comboBoxCenter, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCenter, &QComboBox::currentTextChanged, this, &DialogPointOfContact::PointNameChanged); vis = new VisToolPointOfContact(data); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp index 31ce0e6ef..2220f918f 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp @@ -71,9 +71,9 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, qui CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogPointOfIntersection::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogPointOfIntersection::PointNameChanged); vis = new VisToolPointOfIntersection(data); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp index 756d89b50..51cb452b0 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp @@ -65,9 +65,9 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxArc1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxArc1, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionArcs::ArcChanged); - connect(ui->comboBoxArc1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxArc1, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionArcs::ArcChanged); vis = new VisToolPointOfIntersectionArcs(data); diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp index 590c985ee..f185d45b2 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp @@ -97,9 +97,9 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxCircle1Center, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCircle1Center, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionCircles::PointChanged); - connect(ui->comboBoxCircle2Center, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCircle2Center, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionCircles::PointChanged); connect(ui->toolButtonExprCircle1Radius, &QPushButton::clicked, this, diff --git a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp index 33c94990f..f19985856 100644 --- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp +++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp @@ -68,9 +68,9 @@ DialogPointOfIntersectionCurves::DialogPointOfIntersectionCurves(const VContaine CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxCurve1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCurve1, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionCurves::CurveChanged); - connect(ui->comboBoxCurve2, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxCurve2, &QComboBox::currentTextChanged, this, &DialogPointOfIntersectionCurves::CurveChanged); vis = new VisToolPointOfIntersectionCurves(data); diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index c43d50f2a..c624537c7 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -99,7 +99,7 @@ DialogRotation::DialogRotation(const VContainer *data, quint32 toolId, QWidget * timerAngle->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogRotation::DeployAngleTextEdit); - connect(ui->comboBoxOriginPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxOriginPoint, &QComboBox::currentTextChanged, this, &DialogRotation::PointChanged); vis = new VisToolRotation(data); diff --git a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp index d424fa5cc..5a024eca0 100644 --- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp +++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp @@ -98,11 +98,11 @@ DialogShoulderPoint::DialogShoulderPoint(const VContainer *data, quint32 toolId, timerFormula->start(formulaTimerTimeout); }); connect(ui->pushButtonGrowLength, &QPushButton::clicked, this, &DialogShoulderPoint::DeployFormulaTextEdit); - connect(ui->comboBoxP1Line, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1Line, &QComboBox::currentTextChanged, this, &DialogShoulderPoint::PointNameChanged); - connect(ui->comboBoxP2Line, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP2Line, &QComboBox::currentTextChanged, this, &DialogShoulderPoint::PointNameChanged); - connect(ui->comboBoxP3, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP3, &QComboBox::currentTextChanged, this, &DialogShoulderPoint::PointNameChanged); vis = new VisToolShoulderPoint(data); diff --git a/src/libs/vtools/dialogs/tools/dialogspline.cpp b/src/libs/vtools/dialogs/tools/dialogspline.cpp index c5ad3bbfc..3bda245ad 100644 --- a/src/libs/vtools/dialogs/tools/dialogspline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp @@ -113,9 +113,9 @@ DialogSpline::DialogSpline(const VContainer *data, quint32 toolId, QWidget *pare ui->doubleSpinBoxApproximationScale->setMaximum(maxCurveApproximationScale); - connect(ui->comboBoxP1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP1, &QComboBox::currentTextChanged, this, &DialogSpline::PointNameChanged); - connect(ui->comboBoxP4, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxP4, &QComboBox::currentTextChanged, this, &DialogSpline::PointNameChanged); connect(ui->toolButtonExprAngle1, &QPushButton::clicked, this, &DialogSpline::FXAngle1); diff --git a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp index 1b5284570..a19ce9e00 100644 --- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp @@ -73,13 +73,13 @@ DialogTriangle::DialogTriangle(const VContainer *data, quint32 toolId, QWidget * CheckPointLabel(this, ui->lineEditNamePoint, ui->labelEditNamePoint, pointName, this->data, flagName); CheckState(); }); - connect(ui->comboBoxFirstPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstPoint, &QComboBox::currentTextChanged, this, &DialogTriangle::PointNameChanged); - connect(ui->comboBoxSecondPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondPoint, &QComboBox::currentTextChanged, this, &DialogTriangle::PointNameChanged); - connect(ui->comboBoxAxisP1, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxAxisP1, &QComboBox::currentTextChanged, this, &DialogTriangle::PointNameChanged); - connect(ui->comboBoxAxisP2, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxAxisP2, &QComboBox::currentTextChanged, this, &DialogTriangle::PointNameChanged); vis = new VisToolTriangle(data); diff --git a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp index cbd7b2e09..c6dd0899d 100644 --- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp +++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp @@ -77,15 +77,15 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, quint32 toolId, QWidget connect(ui->lineEditFirstNewDartPoint, &QLineEdit::textChanged, this, &DialogTrueDarts::NameDartPoint1Changed); connect(ui->lineEditSecondNewDartPoint, &QLineEdit::textChanged, this, &DialogTrueDarts::NameDartPoint2Changed); - connect(ui->comboBoxFirstBasePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstBasePoint, &QComboBox::currentTextChanged, this, &DialogTrueDarts::PointNameChanged); - connect(ui->comboBoxSecondBasePoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondBasePoint, &QComboBox::currentTextChanged, this, &DialogTrueDarts::PointNameChanged); - connect(ui->comboBoxFirstDartPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxFirstDartPoint, &QComboBox::currentTextChanged, this, &DialogTrueDarts::PointNameChanged); - connect(ui->comboBoxSecondDartPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxSecondDartPoint, &QComboBox::currentTextChanged, this, &DialogTrueDarts::PointNameChanged); - connect(ui->comboBoxThirdDartPoint, QOverload::of(&QComboBox::currentIndexChanged), + connect(ui->comboBoxThirdDartPoint, &QComboBox::currentTextChanged, this, &DialogTrueDarts::PointNameChanged); vis = new VisToolTrueDarts(data); diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index 9ff39f038..215c6d51f 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -3067,9 +3067,9 @@ void DialogSeamAllowance::InitLabelsTab() InitPinPoint(uiTabLabels->comboBoxDLTopLeftPin); InitPinPoint(uiTabLabels->comboBoxDLBottomRightPin); - connect(uiTabLabels->comboBoxDLTopLeftPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabLabels->comboBoxDLTopLeftPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::DetailPinPointChanged); - connect(uiTabLabels->comboBoxDLBottomRightPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabLabels->comboBoxDLBottomRightPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::DetailPinPointChanged); connect(uiTabLabels->pushButtonDLWidth, &QPushButton::clicked, this, &DialogSeamAllowance::EditDLFormula); @@ -3098,9 +3098,9 @@ void DialogSeamAllowance::InitLabelsTab() InitPinPoint(uiTabLabels->comboBoxPLTopLeftPin); InitPinPoint(uiTabLabels->comboBoxPLBottomRightPin); - connect(uiTabLabels->comboBoxPLTopLeftPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabLabels->comboBoxPLTopLeftPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::PatternPinPointChanged); - connect(uiTabLabels->comboBoxPLBottomRightPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabLabels->comboBoxPLBottomRightPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::PatternPinPointChanged); connect(uiTabLabels->pushButtonPLWidth, &QPushButton::clicked, this, &DialogSeamAllowance::EditPLFormula); @@ -3150,9 +3150,9 @@ void DialogSeamAllowance::InitGrainlineTab() InitPinPoint(uiTabGrainline->comboBoxGrainlineTopPin); InitPinPoint(uiTabGrainline->comboBoxGrainlineBottomPin); - connect(uiTabGrainline->comboBoxGrainlineTopPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabGrainline->comboBoxGrainlineTopPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::GrainlinePinPointChanged); - connect(uiTabGrainline->comboBoxGrainlineBottomPin, QOverload::of(&QComboBox::currentIndexChanged), + connect(uiTabGrainline->comboBoxGrainlineBottomPin, &QComboBox::currentTextChanged, this, &DialogSeamAllowance::GrainlinePinPointChanged); }