#include <QInputDialog>
#include <QMessageBox>
+#include <utility>
#include "client.h"
#include "icon.h"
#include "signalproxy.h"
IdentitiesSettingsPage::IdentitiesSettingsPage(QWidget *parent)
- : SettingsPage(tr("IRC"), tr("Identities"), parent),
- _editSsl(false)
+ : SettingsPage(tr("IRC"), tr("Identities"), parent)
{
ui.setupUi(this);
ui.renameIdentity->setIcon(icon::get("edit-rename"));
ui.deleteIdentity->setIcon(icon::get("list-remove-user"));
coreConnectionStateChanged(Client::isConnected()); // need a core connection!
- connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), this, SLOT(coreConnectionStateChanged(bool)));
+ connect(Client::instance(), &Client::coreConnectionStateChanged, this, &IdentitiesSettingsPage::coreConnectionStateChanged);
- connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientIdentityCreated(IdentityId)));
- connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientIdentityRemoved(IdentityId)));
+ connect(Client::instance(), &Client::identityCreated, this, &IdentitiesSettingsPage::clientIdentityCreated);
+ connect(Client::instance(), &Client::identityRemoved, this, &IdentitiesSettingsPage::clientIdentityRemoved);
- connect(ui.identityEditor, SIGNAL(widgetHasChanged()), this, SLOT(widgetHasChanged()));
+ connect(ui.identityEditor, &IdentityEditWidget::widgetHasChanged, this, &IdentitiesSettingsPage::widgetHasChanged);
#ifdef HAVE_SSL
- connect(ui.identityEditor, SIGNAL(requestEditSsl()), this, SLOT(continueUnsecured()));
+ connect(ui.identityEditor, &IdentityEditWidget::requestEditSsl, this, &IdentitiesSettingsPage::continueUnsecured);
#endif
currentId = 0;
void IdentitiesSettingsPage::clientIdentityCreated(IdentityId id)
{
- CertIdentity *identity = new CertIdentity(*Client::identity(id), this);
+ auto *identity = new CertIdentity(*Client::identity(id), this);
#ifdef HAVE_SSL
identity->enableEditSsl(_editSsl);
#endif
insertIdentity(identity);
#ifdef HAVE_SSL
- connect(identity, SIGNAL(sslSettingsUpdated()), this, SLOT(clientIdentityUpdated()));
+ connect(identity, &CertIdentity::sslSettingsUpdated, this, &IdentitiesSettingsPage::clientIdentityUpdated);
#endif
- connect(Client::identity(id), SIGNAL(updatedRemotely()), this, SLOT(clientIdentityUpdated()));
+ connect(Client::identity(id), &SyncableObject::updatedRemotely, this, &IdentitiesSettingsPage::clientIdentityUpdated);
}
if (!identities.keys().contains(-id.toInt())) break;
}
id = -id.toInt();
- CertIdentity *newId = new CertIdentity(id, this);
+ auto *newId = new CertIdentity(id, this);
#ifdef HAVE_SSL
newId->enableEditSsl(_editSsl);
#endif
ui.progressBar->setMaximum(numevents);
ui.progressBar->setValue(0);
- connect(Client::instance(), SIGNAL(identityCreated(IdentityId)), this, SLOT(clientEvent()));
- connect(Client::instance(), SIGNAL(identityRemoved(IdentityId)), this, SLOT(clientEvent()));
+ connect(Client::instance(), &Client::identityCreated, this, &SaveIdentitiesDlg::clientEvent);
+ connect(Client::instance(), &Client::identityRemoved, this, &SaveIdentitiesDlg::clientEvent);
foreach(CertIdentity *id, toCreate) {
Client::createIdentity(*id);
numevents--;
continue;
}
- connect(cid, SIGNAL(updatedRemotely()), this, SLOT(clientEvent()));
+ connect(cid, &SyncableObject::updatedRemotely, this, &SaveIdentitiesDlg::clientEvent);
Client::updateIdentity(id->id(), id->toVariantMap());
#ifdef HAVE_SSL
id->requestUpdateSslSettings();
/*************************************************************************************************/
-NickEditDlg::NickEditDlg(const QString &old, const QStringList &exist, QWidget *parent)
- : QDialog(parent), oldNick(old), existing(exist)
+NickEditDlg::NickEditDlg(const QString &old, QStringList exist, QWidget *parent)
+ : QDialog(parent), oldNick(old), existing(std::move(exist))
{
ui.setupUi(this);
// define a regexp for valid nicknames
// TODO: add max nicklength according to ISUPPORT
QString letter = "A-Za-z";
- QString special = "\x5b-\x60\x7b-\x7d";
+ QString special = R"([-`{-})";
QRegExp rx(QString("[%1%2][%1%2\\d-]*").arg(letter, special));
ui.nickEdit->setValidator(new QRegExpValidator(rx, ui.nickEdit));
if (old.isEmpty()) {