diff --git a/src/accountmanagedlg.cpp b/src/accountmanagedlg.cpp index 17e0e53fe..0149e4554 100644 --- a/src/accountmanagedlg.cpp +++ b/src/accountmanagedlg.cpp @@ -64,7 +64,7 @@ public slots: private slots: void remove(); - void bg_clicked(int); + void bg_clicked(QAbstractButton *btn); void client_handshaken(); void client_error(); @@ -112,9 +112,9 @@ AccountRemoveDlg::AccountRemoveDlg(const UserAccount &acc, QWidget *parent) : QD d->bg = new QButtonGroup(this); d->bg->addButton(rb_remove, 0); d->bg->addButton(rb_removeAndUnreg, 1); - connect(d->bg, SIGNAL(buttonClicked(int)), SLOT(bg_clicked(int))); + connect(d->bg, &QButtonGroup::buttonClicked, this, &AccountRemoveDlg::bg_clicked); rb_remove->setChecked(true); - bg_clicked(0); + bg_clicked(rb_remove); client = new MiniClient(this); connect(client, SIGNAL(handshaken()), SLOT(client_handshaken())); @@ -146,8 +146,9 @@ void AccountRemoveDlg::done(int r) QDialog::done(r); } -void AccountRemoveDlg::bg_clicked(int x) +void AccountRemoveDlg::bg_clicked(QAbstractButton *btn) { + auto x = d->bg->id(btn); if (x == 0) { lb_pass->setEnabled(false); le_pass->setEnabled(false); diff --git a/src/activitydlg.cpp b/src/activitydlg.cpp index cefeffecd..d81c448df 100644 --- a/src/activitydlg.cpp +++ b/src/activitydlg.cpp @@ -36,10 +36,9 @@ ActivityDlg::ActivityDlg(QList list) : QDialog(nullptr), pa_(list) setWindowIcon(IconsetFactory::icon("activities/other").icon()); setModal(false); - connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString &)), - SLOT(loadSpecificActivities(const QString &))); - connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close())); - connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity())); + connect(ui_.cb_general_type, &QComboBox::currentTextChanged, this, &ActivityDlg::loadSpecificActivities); + connect(ui_.pb_cancel, &QPushButton::clicked, this, &ActivityDlg::close); + connect(ui_.pb_ok, &QPushButton::clicked, this, &ActivityDlg::setActivity); ui_.cb_general_type->addItem(tr("")); PsiAccount *pa = pa_.first(); diff --git a/version b/version index 690ec2298..d6128ca61 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.5.1700 (2024-03-18, 33c6541f) +1.5.1702 (2024-03-19, a33fdd7a)