X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fpasswordchangedlg.cpp;h=c4538511870b1c16bb939a3bf5b98da0140b2d58;hp=7009adf63630e63eeb0a96d27b2102950dd37ec9;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=921321156c2f1ceed0e02d519a1835e63e8c8b48 diff --git a/src/qtui/passwordchangedlg.cpp b/src/qtui/passwordchangedlg.cpp index 7009adf6..c4538511 100644 --- a/src/qtui/passwordchangedlg.cpp +++ b/src/qtui/passwordchangedlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -25,26 +25,26 @@ #include "client.h" -PasswordChangeDlg::PasswordChangeDlg(QWidget *parent) : QDialog(parent) +PasswordChangeDlg::PasswordChangeDlg(QWidget* parent) + : QDialog(parent) { ui.setupUi(this); CoreAccount account = Client::currentCoreAccount(); ui.infoLabel->setText(tr("This changes the password for your username %1 " "on the Quassel Core running at %2.") - .arg(account.user(), account.hostName())); + .arg(account.user(), account.hostName())); - connect(ui.oldPasswordEdit, SIGNAL(textChanged(QString)), SLOT(inputChanged())); - connect(ui.newPasswordEdit, SIGNAL(textChanged(QString)), SLOT(inputChanged())); - connect(ui.confirmPasswordEdit, SIGNAL(textChanged(QString)), SLOT(inputChanged())); - connect(ui.buttonBox, SIGNAL(accepted()), SLOT(changePassword())); + connect(ui.oldPasswordEdit, &QLineEdit::textChanged, this, &PasswordChangeDlg::inputChanged); + connect(ui.newPasswordEdit, &QLineEdit::textChanged, this, &PasswordChangeDlg::inputChanged); + connect(ui.confirmPasswordEdit, &QLineEdit::textChanged, this, &PasswordChangeDlg::inputChanged); + connect(ui.buttonBox, &QDialogButtonBox::accepted, this, &PasswordChangeDlg::changePassword); - connect(Client::instance(), SIGNAL(passwordChanged(bool)), SLOT(passwordChanged(bool))); + connect(Client::instance(), &Client::passwordChanged, this, &PasswordChangeDlg::passwordChanged); ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); } - void PasswordChangeDlg::inputChanged() { bool ok = !ui.oldPasswordEdit->text().isEmpty() && !ui.newPasswordEdit->text().isEmpty() @@ -52,21 +52,18 @@ void PasswordChangeDlg::inputChanged() ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(ok); } - void PasswordChangeDlg::changePassword() { ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); Client::changePassword(ui.oldPasswordEdit->text(), ui.newPasswordEdit->text()); } - void PasswordChangeDlg::passwordChanged(bool success) { if (!success) { - QMessageBox box(QMessageBox::Warning, tr("Password Not Changed"), - tr("Password change failed"), - QMessageBox::Ok, this); - box.setInformativeText(tr("The core reported an error when trying to change your password. Make sure you entered your old password correctly!")); + QMessageBox box(QMessageBox::Warning, tr("Password Not Changed"), tr("Password change failed"), QMessageBox::Ok, this); + box.setInformativeText( + tr("The core reported an error when trying to change your password. Make sure you entered your old password correctly!")); box.exec(); } else {