From 2f377a5782ff332815a3a21dd57a3f4e0489ca0d Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 25 Sep 2022 10:36:08 +0200 Subject: [PATCH] Gui: fix regression of 9414a6572 --- src/Gui/DlgRunExternal.cpp | 13 +++++++------ src/Gui/Widgets.cpp | 27 ++++++++++----------------- 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/src/Gui/DlgRunExternal.cpp b/src/Gui/DlgRunExternal.cpp index f48721447d..374fabb35f 100644 --- a/src/Gui/DlgRunExternal.cpp +++ b/src/Gui/DlgRunExternal.cpp @@ -46,12 +46,13 @@ DlgRunExternal::DlgRunExternal( QWidget* parent, Qt::WindowFlags fl ) { ui = new Ui_DlgRunExternal(); ui->setupUi(this); - connect(&process,SIGNAL(finished(int, QProcess::ExitStatus)), - this,SLOT(finished(int, QProcess::ExitStatus))); - connect(ui->buttonAccept,SIGNAL(clicked()),this,SLOT(accept())); - connect(ui->buttonDiscard,SIGNAL(clicked()),this,SLOT(reject())); - connect(ui->buttonAbort,SIGNAL(clicked()),this,SLOT(abort())); - connect(ui->buttonAdvanced,SIGNAL(clicked()),this,SLOT(advanced())); + connect(ui->chooseProgram, &QPushButton::clicked, this, &DlgRunExternal::onChooseProgramClicked); + connect(&process, qOverload(&QProcess::finished), + this, qOverload(&DlgRunExternal::finished)); + connect(ui->buttonAccept, &QPushButton::clicked, this, &DlgRunExternal::accept); + connect(ui->buttonDiscard, &QPushButton::clicked, this, &DlgRunExternal::reject); + connect(ui->buttonAbort, &QPushButton::clicked, this, &DlgRunExternal::abort); + connect(ui->buttonAdvanced, &QPushButton::clicked, this, &DlgRunExternal::advanced); ui->gridLayout->setSizeConstraint(QLayout::SetFixedSize); ui->extensionWidget->hide(); diff --git a/src/Gui/Widgets.cpp b/src/Gui/Widgets.cpp index c1ffa091b3..23aa09f01e 100644 --- a/src/Gui/Widgets.cpp +++ b/src/Gui/Widgets.cpp @@ -192,22 +192,16 @@ ActionSelector::ActionSelector(QWidget* parent) upButton->setText(QString()); downButton->setText(QString()); - connect(addButton, SIGNAL(clicked()), - this, SLOT(on_addButton_clicked()) ); - connect(removeButton, SIGNAL(clicked()), - this, SLOT(on_removeButton_clicked()) ); - connect(upButton, SIGNAL(clicked()), - this, SLOT(on_upButton_clicked()) ); - connect(downButton, SIGNAL(clicked()), - this, SLOT(on_downButton_clicked()) ); - connect(availableWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), - this, SLOT(onItemDoubleClicked(QTreeWidgetItem*,int)) ); - connect(selectedWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), - this, SLOT(onItemDoubleClicked(QTreeWidgetItem*,int)) ); - connect(availableWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem *)), - this, SLOT(onCurrentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)) ); - connect(selectedWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem *)), - this, SLOT(onCurrentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)) ); + connect(addButton, &QPushButton::clicked, this, &ActionSelector::onAddButtonClicked); + connect(removeButton, &QPushButton::clicked, this, &ActionSelector::onRemoveButtonClicked); + connect(upButton, &QPushButton::clicked, this, &ActionSelector::onUpButtonClicked); + connect(downButton, &QPushButton::clicked, this, &ActionSelector::onDownButtonClicked); + + connect(availableWidget, &QTreeWidget::itemDoubleClicked, this, &ActionSelector::onItemDoubleClicked); + connect(availableWidget, &QTreeWidget::currentItemChanged, this, &ActionSelector::onCurrentItemChanged); + connect(selectedWidget, &QTreeWidget::itemDoubleClicked, this, &ActionSelector::onItemDoubleClicked); + connect(selectedWidget, &QTreeWidget::currentItemChanged, this, &ActionSelector::onCurrentItemChanged); + retranslateUi(); setButtonsEnabled(); } @@ -236,7 +230,6 @@ QString ActionSelector::availableLabel() const return labelAvailable->text(); } - void ActionSelector::retranslateUi() { labelAvailable->setText(QApplication::translate("Gui::ActionSelector", "Available:"));