X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsettingsdlg.cpp;h=56c3cdc38d275810187bce24b3720cdc4853beb3;hp=13100afb2c5a2a34dae9e0bcbd238279e007c2ad;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hpb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f diff --git a/src/qtui/settingsdlg.cpp b/src/qtui/settingsdlg.cpp index 13100afb..56c3cdc3 100644 --- a/src/qtui/settingsdlg.cpp +++ b/src/qtui/settingsdlg.cpp @@ -27,8 +27,7 @@ #include "icon.h" SettingsDlg::SettingsDlg(QWidget *parent) - : QDialog(parent), - _currentPage(nullptr) + : QDialog(parent) { ui.setupUi(this); setModal(true); @@ -39,10 +38,10 @@ SettingsDlg::SettingsDlg(QWidget *parent) ui.settingsTree->setRootIsDecorated(false); - connect(ui.settingsTree, SIGNAL(itemSelectionChanged()), this, SLOT(itemSelected())); - connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *))); + connect(ui.settingsTree, &QTreeWidget::itemSelectionChanged, this, &SettingsDlg::itemSelected); + connect(ui.buttonBox, &QDialogButtonBox::clicked, this, &SettingsDlg::buttonClicked); - connect(Client::instance(), SIGNAL(coreConnectionStateChanged(bool)), SLOT(coreConnectionStateChanged())); + connect(Client::instance(), &Client::coreConnectionStateChanged, this, &SettingsDlg::coreConnectionStateChanged); setButtonStates(); } @@ -63,7 +62,7 @@ void SettingsDlg::coreConnectionStateChanged() void SettingsDlg::setItemState(QTreeWidgetItem *item) { - SettingsPage *sp = qobject_cast(item->data(0, SettingsPageRole).value()); + auto *sp = qobject_cast(item->data(0, SettingsPageRole).value()); Q_ASSERT(sp); bool disabledDueToConnection = !Client::isConnected() && sp->needsCoreConnection(); bool disabledDueToOwnChoice = !sp->isSelectable(); @@ -76,7 +75,7 @@ void SettingsDlg::registerSettingsPage(SettingsPage *sp) sp->setParent(ui.settingsStack); ui.settingsStack->addWidget(sp); - connect(sp, SIGNAL(changed(bool)), this, SLOT(setButtonStates())); + connect(sp, &SettingsPage::changed, this, &SettingsDlg::setButtonStates); QTreeWidgetItem *cat; QList cats = ui.settingsTree->findItems(sp->category(), Qt::MatchExactly);