kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Part: move to new style connect()

Browse Source
This commit is contained in:
wmayer
2023-01-13 17:14:07 +01:00
parent c252e611f2
commit 0680121bd1
10 changed files with 103 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Part/Gui/DlgBooleanOperation.cpp
View File

@@ -86,10 +86,10 @@ DlgBooleanOperation::DlgBooleanOperation(QWidget* parent)
: QWidget(parent), ui(new Ui_DlgBooleanOperation)
{
ui->setupUi(this);
connect(ui->firstShape, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(ui->secondShape, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(ui->firstShape, &QTreeWidget::currentItemChanged,
this, &DlgBooleanOperation::currentItemChanged);
connect(ui->secondShape, &QTreeWidget::currentItemChanged,
this, &DlgBooleanOperation::currentItemChanged);
this->connectNewObject = App::GetApplication().signalNewObject.connect(boost::bind
(&DlgBooleanOperation::slotCreatedObject, this, bp::_1));
this->connectModObject = App::GetApplication().signalChangedObject.connect(boost::bind

14
src/Mod/Part/Gui/DlgFilletEdges.cpp
View File

@@ -247,16 +247,16 @@ DlgFilletEdges::DlgFilletEdges(FilletType type, Part::FilletBase* fillet, QWidge
d->connectApplicationDeletedDocument = App::GetApplication().signalDeleteDocument
.connect(boost::bind(&DlgFilletEdges::onDeleteDocument, this, bp::_1));
// set tree view with three columns
QStandardItemModel* model = new FilletRadiusModel(this);
connect(model, SIGNAL(toggleCheckState(const QModelIndex&)),
this, SLOT(toggleCheckState(const QModelIndex&)));
FilletRadiusModel* model = new FilletRadiusModel(this);
connect(model, &FilletRadiusModel::toggleCheckState,
this, &DlgFilletEdges::toggleCheckState);
model->insertColumns(0,3);
// timer for highlighting
d->highlighttimer = new QTimer(this);
d->highlighttimer->setSingleShot(true);
connect(d->highlighttimer,SIGNAL(timeout()),
this, SLOT(onHighlightEdges()));
connect(d->highlighttimer, &QTimer::timeout,
this, &DlgFilletEdges::onHighlightEdges);
d->filletType = type;
if (d->filletType == DlgFilletEdges::CHAMFER) {
@@ -977,8 +977,8 @@ FilletEdgesDialog::FilletEdgesDialog(DlgFilletEdges::FilletType type, Part::Fill
QDialogButtonBox* buttonBox = new QDialogButtonBox(this);
buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
QObject::connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
QObject::connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
QObject::connect(buttonBox, &QDialogButtonBox::accepted, this, &FilletEdgesDialog::accept);
QObject::connect(buttonBox, &QDialogButtonBox::rejected, this, &FilletEdgesDialog::reject);
hboxLayout->addWidget(widget);
hboxLayout->addWidget(buttonBox);

2
src/Mod/Part/Gui/DlgRevolution.cpp
View File

@@ -125,7 +125,7 @@ DlgRevolution::DlgRevolution(QWidget* parent, Qt::WindowFlags fl)
sel.applyFrom(Gui::Selection().getObjectsOfType(App::Link::getClassTypeId()));
sel.applyFrom(Gui::Selection().getObjectsOfType(App::Part::getClassTypeId()));
connect(ui->txtAxisLink, SIGNAL(textChanged(QString)), this, SLOT(on_txtAxisLink_textChanged(QString)));
connect(ui->txtAxisLink, &QLineEdit::textChanged, this, &DlgRevolution::on_txtAxisLink_textChanged);
autoSolid();
}

2
src/Mod/Part/Gui/PropertyEnumAttacherItem.cpp
View File

@@ -48,7 +48,7 @@ QWidget* PropertyEnumAttacherItem::createEditor(QWidget* parent, const QObject*
{
Gui::LabelButton* modeEditor = new Gui::LabelButton(parent);
QObject::connect(modeEditor, SIGNAL(valueChanged(const QVariant &)), receiver, method);
QObject::connect(modeEditor, SIGNAL(buttonClicked()), this, SLOT(openTask()));
QObject::connect(modeEditor, &Gui::LabelButton::buttonClicked, this, &PropertyEnumAttacherItem::openTask);
modeEditor->setDisabled(isReadOnly());
return modeEditor;
}

58
src/Mod/Part/Gui/TaskAttacher.cpp
View File

@@ -123,32 +123,38 @@ TaskAttacher::TaskAttacher(Gui::ViewProviderDocumentObject *ViewProvider, QWidge
ui->setupUi(proxy);
QMetaObject::connectSlotsByName(this);
connect(ui->attachmentOffsetX, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetXChanged(double)));
connect(ui->attachmentOffsetY, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetYChanged(double)));
connect(ui->attachmentOffsetZ, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetZChanged(double)));
connect(ui->attachmentOffsetYaw, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetYawChanged(double)));
connect(ui->attachmentOffsetPitch, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetPitchChanged(double)));
connect(ui->attachmentOffsetRoll, SIGNAL(valueChanged(double)), this, SLOT(onAttachmentOffsetRollChanged(double)));
connect(ui->checkBoxFlip, SIGNAL(toggled(bool)),
this, SLOT(onCheckFlip(bool)));
connect(ui->buttonRef1, SIGNAL(clicked(bool)),
this, SLOT(onButtonRef1(bool)));
connect(ui->lineRef1, SIGNAL(textEdited(QString)),
this, SLOT(onRefName1(QString)));
connect(ui->buttonRef2, SIGNAL(clicked(bool)),
this, SLOT(onButtonRef2(bool)));
connect(ui->lineRef2, SIGNAL(textEdited(QString)),
this, SLOT(onRefName2(QString)));
connect(ui->buttonRef3, SIGNAL(clicked(bool)),
this, SLOT(onButtonRef3(bool)));
connect(ui->lineRef3, SIGNAL(textEdited(QString)),
this, SLOT(onRefName3(QString)));
connect(ui->buttonRef4, SIGNAL(clicked(bool)),
this, SLOT(onButtonRef4(bool)));
connect(ui->lineRef4, SIGNAL(textEdited(QString)),
this, SLOT(onRefName4(QString)));
connect(ui->listOfModes,SIGNAL(itemSelectionChanged()),
this, SLOT(onModeSelect()));
connect(ui->attachmentOffsetX, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetXChanged);
connect(ui->attachmentOffsetY, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetYChanged);
connect(ui->attachmentOffsetZ, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetZChanged);
connect(ui->attachmentOffsetYaw, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetYawChanged);
connect(ui->attachmentOffsetPitch, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetPitchChanged);
connect(ui->attachmentOffsetRoll, qOverload<double>(&Gui::QuantitySpinBox::valueChanged),
this, &TaskAttacher::onAttachmentOffsetRollChanged);
connect(ui->checkBoxFlip, &QCheckBox::toggled,
this, &TaskAttacher::onCheckFlip);
connect(ui->buttonRef1, &QPushButton::clicked,
this, &TaskAttacher::onButtonRef1);
connect(ui->lineRef1, &QLineEdit::textEdited,
this, &TaskAttacher::onRefName1);
connect(ui->buttonRef2, &QPushButton::clicked,
this, &TaskAttacher::onButtonRef2);
connect(ui->lineRef2, &QLineEdit::textEdited,
this, &TaskAttacher::onRefName2);
connect(ui->buttonRef3, &QPushButton::clicked,
this, &TaskAttacher::onButtonRef3);
connect(ui->lineRef3, &QLineEdit::textEdited,
this, &TaskAttacher::onRefName3);
connect(ui->buttonRef4, &QPushButton::clicked,
this, &TaskAttacher::onButtonRef4);
connect(ui->lineRef4, &QLineEdit::textEdited,
this, &TaskAttacher::onRefName4);
connect(ui->listOfModes, &QListWidget::itemSelectionChanged,
this, &TaskAttacher::onModeSelect);
this->groupLayout()->addWidget(proxy);

66
src/Mod/Part/Gui/TaskCheckGeometry.cpp
View File

@@ -397,8 +397,8 @@ void TaskCheckGeometryResults::setupInterface()
treeView->setModel(model);
treeView->setSelectionMode(QAbstractItemView::SingleSelection);
treeView->setSelectionBehavior(QAbstractItemView::SelectRows);
connect(treeView->selectionModel(), SIGNAL(currentRowChanged(QModelIndex,QModelIndex)),
this, SLOT(currentRowChanged(QModelIndex,QModelIndex)));
connect(treeView->selectionModel(), &QItemSelectionModel::currentRowChanged,
this, &TaskCheckGeometryResults::currentRowChanged);
QVBoxLayout *layout = new QVBoxLayout();
layout->addWidget(message);
@@ -1012,8 +1012,8 @@ TaskCheckGeometryDialog::TaskCheckGeometryDialog()
Skip this settings page and run the geometry check automatically.\n\
Default: false"));
autoRunCheckBox->setChecked(group->GetBool("AutoRun", false));
connect(autoRunCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_autoRunCheckBox_toggled(bool)));
connect(autoRunCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_autoRunCheckBox_toggled);
settingsBox->groupLayout()->addWidget(autoRunCheckBox);
runBOPCheckBox = new QCheckBox();
@@ -1023,8 +1023,8 @@ Extra boolean operations check that can sometimes find errors that\n\
the standard BRep geometry check misses. These errors do not always \n\
mean the checked object is unusable. Default: false"));
runBOPCheckBox->setChecked(group->GetBool("RunBOPCheck", false));
connect(runBOPCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_runBOPCheckBox_toggled(bool)));
connect(runBOPCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_runBOPCheckBox_toggled);
settingsBox->groupLayout()->addWidget(runBOPCheckBox);
runSingleThreadedCheckBox = new QCheckBox();
@@ -1033,16 +1033,16 @@ mean the checked object is unusable. Default: false"));
Run the geometry check in a single thread. This is slower,\n\
but more stable. Default: false"));
runSingleThreadedCheckBox->setChecked(group->GetBool("RunSingleThreaded", false));
connect(runSingleThreadedCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_runSingleThreadedCheckBox_toggled(bool)));
connect(runSingleThreadedCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_runSingleThreadedCheckBox_toggled);
settingsBox->groupLayout()->addWidget(runSingleThreadedCheckBox);
logErrorsCheckBox = new QCheckBox();
logErrorsCheckBox->setText(tr("Log errors"));
logErrorsCheckBox->setToolTip(tr("Log errors to report view. Default: true"));
logErrorsCheckBox->setChecked(group->GetBool("LogErrors", true));
connect(logErrorsCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_logErrorsCheckBox_toggled(bool)));
connect(logErrorsCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_logErrorsCheckBox_toggled);
settingsBox->groupLayout()->addWidget(logErrorsCheckBox);
expandShapeContentCheckBox = new QCheckBox();
@@ -1051,8 +1051,8 @@ but more stable. Default: false"));
Expand shape content. Changes will take effect next time you use \n\
the check geometry tool. Default: false"));
expandShapeContentCheckBox->setChecked(group->GetBool("ExpandShapeContent", false));
connect(expandShapeContentCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_expandShapeContentCheckBox_toggled(bool)));
connect(expandShapeContentCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_expandShapeContentCheckBox_toggled);
settingsBox->groupLayout()->addWidget(expandShapeContentCheckBox);
advancedShapeContentCheckBox = new QCheckBox();
@@ -1061,8 +1061,8 @@ the check geometry tool. Default: false"));
Show advanced shape content. Changes will take effect next time you use \n\
the check geometry tool. Default: false"));
advancedShapeContentCheckBox->setChecked(group->GetBool("AdvancedShapeContent", true));
connect(advancedShapeContentCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_advancedShapeContentCheckBox_toggled(bool)));
connect(advancedShapeContentCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_advancedShapeContentCheckBox_toggled);
settingsBox->groupLayout()->addWidget(advancedShapeContentCheckBox);
settingsBox->groupLayout()->addWidget(new QLabel(tr("\nIndividual BOP Checks:")));
@@ -1071,72 +1071,72 @@ the check geometry tool. Default: false"));
argumentTypeModeCheckBox->setText(tr(" Bad type"));
argumentTypeModeCheckBox->setToolTip(tr("Check for bad argument types. Default: true"));
argumentTypeModeCheckBox->setChecked(group->GetBool("ArgumentTypeMode", true));
connect(argumentTypeModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_argumentTypeModeCheckBox_toggled(bool)));
connect(argumentTypeModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_argumentTypeModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(argumentTypeModeCheckBox);
selfInterModeCheckBox = new QCheckBox();
selfInterModeCheckBox->setText(tr(" Self-intersect"));
selfInterModeCheckBox->setToolTip(tr("Check for self-intersections. Default: true"));
selfInterModeCheckBox->setChecked(group->GetBool("SelfInterMode", true));
connect(selfInterModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_selfInterModeCheckBox_toggled(bool)));
connect(selfInterModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_selfInterModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(selfInterModeCheckBox);
smallEdgeModeCheckBox = new QCheckBox();
smallEdgeModeCheckBox->setText(tr(" Too small edge"));
smallEdgeModeCheckBox->setToolTip(tr("Check for edges that are too small. Default: true"));
smallEdgeModeCheckBox->setChecked(group->GetBool("SmallEdgeMode", true));
connect(smallEdgeModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_smallEdgeModeCheckBox_toggled(bool)));
connect(smallEdgeModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_smallEdgeModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(smallEdgeModeCheckBox);
rebuildFaceModeCheckBox = new QCheckBox();
rebuildFaceModeCheckBox->setText(tr(" Nonrecoverable face"));
rebuildFaceModeCheckBox->setToolTip(tr("Check for nonrecoverable faces. Default: true"));
rebuildFaceModeCheckBox->setChecked(group->GetBool("RebuildFaceMode", true));
connect(rebuildFaceModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_rebuildFaceModeCheckBox_toggled(bool)));
connect(rebuildFaceModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_rebuildFaceModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(rebuildFaceModeCheckBox);
continuityModeCheckBox = new QCheckBox();
continuityModeCheckBox->setText(tr(" Continuity"));
continuityModeCheckBox->setToolTip(tr("Check for continuity. Default: true"));
continuityModeCheckBox->setChecked(group->GetBool("ContinuityMode", true));
connect(continuityModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_continuityModeCheckBox_toggled(bool)));
connect(continuityModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_continuityModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(continuityModeCheckBox);
tangentModeCheckBox = new QCheckBox();
tangentModeCheckBox->setText(tr(" Incompatibility of face"));
tangentModeCheckBox->setToolTip(tr("Check for incompatible faces. Default: true"));
tangentModeCheckBox->setChecked(group->GetBool("TangentMode", true));
connect(tangentModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_tangentModeCheckBox_toggled(bool)));
connect(tangentModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_tangentModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(tangentModeCheckBox);
mergeVertexModeCheckBox = new QCheckBox();
mergeVertexModeCheckBox->setText(tr(" Incompatibility of vertex"));
mergeVertexModeCheckBox->setToolTip(tr("Check for incompatible vertices. Default: true"));
mergeVertexModeCheckBox->setChecked(group->GetBool("MergeVertexMode", true));
connect(mergeVertexModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_mergeVertexModeCheckBox_toggled(bool)));
connect(mergeVertexModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_mergeVertexModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(mergeVertexModeCheckBox);
mergeEdgeModeCheckBox = new QCheckBox();
mergeEdgeModeCheckBox->setText(tr(" Incompatibility of edge"));
mergeEdgeModeCheckBox->setToolTip(tr("Check for incompatible edges. Default: true"));
mergeEdgeModeCheckBox->setChecked(group->GetBool("MergeEdgeMode", true));
connect(mergeEdgeModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_mergeEdgeModeCheckBox_toggled(bool)));
connect(mergeEdgeModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_mergeEdgeModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(mergeEdgeModeCheckBox);
curveOnSurfaceModeCheckBox = new QCheckBox();
curveOnSurfaceModeCheckBox->setText(tr(" Invalid curve on surface"));
curveOnSurfaceModeCheckBox->setToolTip(tr("Check for invalid curves on surfaces. Default: true"));
curveOnSurfaceModeCheckBox->setChecked(group->GetBool("CurveOnSurfaceMode", true));
connect(curveOnSurfaceModeCheckBox, SIGNAL(toggled(bool)),
this, SLOT(on_curveOnSurfaceModeCheckBox_toggled(bool)));
connect(curveOnSurfaceModeCheckBox, &QCheckBox::toggled,
this, &TaskCheckGeometryDialog::on_curveOnSurfaceModeCheckBox_toggled);
settingsBox->groupLayout()->addWidget(curveOnSurfaceModeCheckBox);
if (group->GetBool("AutoRun",false)){
settingsBox->hide();
@@ -1204,7 +1204,7 @@ void TaskCheckGeometryDialog::modifyStandardButtons(QDialogButtonBox* box)
settingsBtn->setEnabled(false);
resultsBtn = box->addButton(tr("Results"),QDialogButtonBox::ActionRole);
resultsBtn->setEnabled(false);
connect(box, SIGNAL(clicked(QAbstractButton*)), this, SLOT(on_clicked(QAbstractButton*)));
connect(box, &QDialogButtonBox::clicked, this, &TaskCheckGeometryDialog::on_clicked);
}
void TaskCheckGeometryDialog::on_autoRunCheckBox_toggled(bool isOn)

20
src/Mod/Part/Gui/TaskDimension.cpp
View File

@@ -666,7 +666,7 @@ void PartGui::TaskMeasureLinear::setUpGui()
DimensionControl *control = new DimensionControl(controlTaskBox);
controlLayout->addWidget(control);
controlTaskBox->groupLayout()->addLayout(controlLayout);
QObject::connect(control->resetButton, SIGNAL(clicked(bool)), this, SLOT(resetDialogSlot(bool)));
QObject::connect(control->resetButton, &QPushButton::clicked, this, &TaskMeasureLinear::resetDialogSlot);
this->setButtonPosition(TaskDialog::North);
Content.push_back(selectionTaskBox);
@@ -674,8 +674,8 @@ void PartGui::TaskMeasureLinear::setUpGui()
stepped->getButton(0)->setChecked(true);//before wired up.
stepped->getButton(0)->setEnabled(true);
QObject::connect(stepped->getButton(0), SIGNAL(toggled(bool)), this, SLOT(selection1Slot(bool)));
QObject::connect(stepped->getButton(1), SIGNAL(toggled(bool)), this, SLOT(selection2Slot(bool)));
QObject::connect(stepped->getButton(0), &QPushButton::toggled, this, &TaskMeasureLinear::selection1Slot);
QObject::connect(stepped->getButton(1), &QPushButton::toggled, this, &TaskMeasureLinear::selection2Slot);
}
void PartGui::TaskMeasureLinear::selection1Slot(bool checked)
@@ -1425,7 +1425,7 @@ PartGui::SteppedSelection::SteppedSelection(const uint& buttonCountIn, QWidget*
button->setCheckable(true);
button->setEnabled(false);
buttonGroup->addButton(button);
connect(button, SIGNAL(toggled(bool)), this, SLOT(selectionSlot(bool)));
connect(button, &QPushButton::toggled, this, &SteppedSelection::selectionSlot);
QLabel *label = new QLabel;
@@ -1506,17 +1506,17 @@ PartGui::DimensionControl::DimensionControl(QWidget* parent): QWidget(parent)
QPushButton *toggle3dButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_3D"),
QObject::tr("Toggle direct dimensions"), this);
QObject::connect(toggle3dButton, SIGNAL(clicked(bool)), this, SLOT(toggle3dSlot(bool)));
QObject::connect(toggle3dButton, &QPushButton::clicked, this, &DimensionControl::toggle3dSlot);
commandLayout->addWidget(toggle3dButton);
QPushButton *toggleDeltaButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Toggle_Delta"),
QObject::tr("Toggle orthogonal dimensions"), this);
QObject::connect(toggleDeltaButton, SIGNAL(clicked(bool)), this, SLOT(toggleDeltaSlot(bool)));
QObject::connect(toggleDeltaButton, &QPushButton::clicked, this, &DimensionControl::toggleDeltaSlot);
commandLayout->addWidget(toggleDeltaButton);
QPushButton *clearAllButton = new QPushButton(Gui::BitmapFactory().pixmap("Part_Measure_Clear_All"),
QObject::tr("Clear all dimensions"), this);
QObject::connect(clearAllButton, SIGNAL(clicked(bool)), this, SLOT(clearAllSlot(bool)));
QObject::connect(clearAllButton, &QPushButton::clicked, this, &DimensionControl::clearAllSlot);
commandLayout->addWidget(clearAllButton);
}
@@ -1802,7 +1802,7 @@ void PartGui::TaskMeasureAngular::setUpGui()
DimensionControl *control = new DimensionControl(controlTaskBox);
controlLayout->addWidget(control);
controlTaskBox->groupLayout()->addLayout(controlLayout);
QObject::connect(control->resetButton, SIGNAL(clicked(bool)), this, SLOT(resetDialogSlot(bool)));
QObject::connect(control->resetButton, &QPushButton::clicked, this, &TaskMeasureAngular::resetDialogSlot);
this->setButtonPosition(TaskDialog::South);
Content.push_back(selectionTaskBox);
@@ -1810,8 +1810,8 @@ void PartGui::TaskMeasureAngular::setUpGui()
stepped->getButton(0)->setChecked(true);//before wired up.
stepped->getButton(0)->setEnabled(true);
QObject::connect(stepped->getButton(0), SIGNAL(toggled(bool)), this, SLOT(selection1Slot(bool)));
QObject::connect(stepped->getButton(1), SIGNAL(toggled(bool)), this, SLOT(selection2Slot(bool)));
QObject::connect(stepped->getButton(0), &QPushButton::toggled, this, &TaskMeasureAngular::selection1Slot);
QObject::connect(stepped->getButton(1), &QPushButton::toggled, this, &TaskMeasureAngular::selection2Slot);
}
void PartGui::TaskMeasureAngular::selection1Slot(bool checked)

8
src/Mod/Part/Gui/TaskLoft.cpp
View File

@@ -77,10 +77,10 @@ LoftWidget::LoftWidget(QWidget* parent)
d->ui.selector->setAvailableLabel(tr("Available profiles"));
d->ui.selector->setSelectedLabel(tr("Selected profiles"));
connect(d->ui.selector->availableTreeWidget(), SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(d->ui.selector->selectedTreeWidget(), SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(d->ui.selector->availableTreeWidget(), &QTreeWidget::currentItemChanged,
this, &LoftWidget::onCurrentItemChanged);
connect(d->ui.selector->selectedTreeWidget(), &QTreeWidget::currentItemChanged,
this, &LoftWidget::onCurrentItemChanged);
findShapes();
}

9
src/Mod/Part/Gui/TaskShapeBuilder.cpp
View File

@@ -119,8 +119,13 @@ ShapeBuilderWidget::ShapeBuilderWidget(QWidget* parent)
d->bg.addButton(d->ui.radioButtonSolidFromShell, 5);
d->bg.setExclusive(true);
connect(&d->bg, SIGNAL(buttonClicked(int)),
this, SLOT(switchMode(int)));
#if QT_VERSION < QT_VERSION_CHECK(5,15,0)
connect(&d->bg, qOverload<int>(&QButtonGroup::buttonClicked),
this, &ShapeBuilderWidget::switchMode);
#else
connect(&d->bg, &QButtonGroup::idClicked,
this, &ShapeBuilderWidget::switchMode);
#endif
d->gate = new ShapeSelection();
Gui::Selection().addSelectionGate(d->gate);

8
src/Mod/Part/Gui/TaskSweep.cpp
View File

@@ -136,10 +136,10 @@ SweepWidget::SweepWidget(QWidget* parent)
d->ui.selector->setSelectedLabel(tr("Selected profiles"));
d->ui.labelPath->clear();
connect(d->ui.selector->availableTreeWidget(), SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(d->ui.selector->selectedTreeWidget(), SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)),
this, SLOT(onCurrentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
connect(d->ui.selector->availableTreeWidget(), &QTreeWidget::currentItemChanged,
this, &SweepWidget::onCurrentItemChanged);
connect(d->ui.selector->selectedTreeWidget(), &QTreeWidget::currentItemChanged,
this, &SweepWidget::onCurrentItemChanged);
findShapes();
}