X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingspages%2Faliasessettingspage.cpp;h=80e5c0fe0eb800d60650cc60b3c362fb1fba1be8;hp=c817b45d2b73b4b165c4a94f46dbeefe54db1015;hb=673ded0d543cbdc2cf6e746b6bee7c1d21af8f90;hpb=b7447afe8e836376776dac26704e227a678d2913 diff --git a/src/qtui/settingspages/aliasessettingspage.cpp b/src/qtui/settingspages/aliasessettingspage.cpp index c817b45d..80e5c0fe 100644 --- a/src/qtui/settingspages/aliasessettingspage.cpp +++ b/src/qtui/settingspages/aliasessettingspage.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -25,7 +25,7 @@ #include "icon.h" -AliasesSettingsPage::AliasesSettingsPage(QWidget *parent) +AliasesSettingsPage::AliasesSettingsPage(QWidget* parent) : SettingsPage(tr("IRC"), tr("Aliases"), parent) { ui.setupUi(this); @@ -41,35 +41,31 @@ AliasesSettingsPage::AliasesSettingsPage(QWidget *parent) ui.aliasesView->verticalHeader()->hide(); ui.aliasesView->horizontalHeader()->setStretchLastSection(true); - connect(ui.newAliasButton, SIGNAL(clicked()), &_aliasesModel, SLOT(newAlias())); - connect(ui.deleteAliasButton, SIGNAL(clicked()), this, SLOT(deleteSelectedAlias())); - connect(&_aliasesModel, SIGNAL(configChanged(bool)), this, SLOT(setChangedState(bool))); - connect(&_aliasesModel, SIGNAL(modelReady(bool)), this, SLOT(enableDialog(bool))); + connect(ui.newAliasButton, &QAbstractButton::clicked, &_aliasesModel, &AliasesModel::newAlias); + connect(ui.deleteAliasButton, &QAbstractButton::clicked, this, &AliasesSettingsPage::deleteSelectedAlias); + connect(&_aliasesModel, &AliasesModel::configChanged, this, &AliasesSettingsPage::setChangedState); + connect(&_aliasesModel, &AliasesModel::modelReady, this, &AliasesSettingsPage::enableDialog); enableDialog(_aliasesModel.isReady()); } - void AliasesSettingsPage::load() { - if (_aliasesModel.configChanged()) + if (_aliasesModel.hasConfigChanged()) _aliasesModel.revert(); } - void AliasesSettingsPage::defaults() { _aliasesModel.loadDefaults(); } - void AliasesSettingsPage::save() { - if (_aliasesModel.configChanged()) + if (_aliasesModel.hasConfigChanged()) _aliasesModel.commit(); } - void AliasesSettingsPage::enableDialog(bool enabled) { ui.newAliasButton->setEnabled(enabled); @@ -77,7 +73,6 @@ void AliasesSettingsPage::enableDialog(bool enabled) setEnabled(enabled); } - void AliasesSettingsPage::deleteSelectedAlias() { if (!ui.aliasesView->selectionModel()->hasSelection())