X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fqtui%2Fsettingspagedlg.cpp;h=48a660b86fe8aa71faddf053adc0cbb81af501bc;hb=f9efdde7f3a6004af8f834c409cfa6ae1d877692;hp=2acccb996712b067f55ebd0de9f504017e3fe549;hpb=1cb02004ee5973b89368bd84f234d4652794690d;p=quassel.git diff --git a/src/qtui/settingspagedlg.cpp b/src/qtui/settingspagedlg.cpp index 2acccb99..48a660b8 100644 --- a/src/qtui/settingspagedlg.cpp +++ b/src/qtui/settingspagedlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,11 +18,12 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include +#include "settingspagedlg.h" + #include #include -#include "settingspagedlg.h" +#include "icon.h" SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent) : QDialog(parent) @@ -36,7 +37,7 @@ SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent) ui.pageTitle->setText(page->title()); setWindowTitle(tr("Configure %1").arg(page->title())); - setWindowIcon(QIcon::fromTheme("configure")); + setWindowIcon(icon::get("configure")); // make the scrollarea behave sanely ui.settingsFrame->setWidgetResizable(true); @@ -44,8 +45,8 @@ SettingsPageDlg::SettingsPageDlg(SettingsPage *page, QWidget *parent) updateGeometry(); - connect(page, SIGNAL(changed(bool)), this, SLOT(setButtonStates())); - connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonClicked(QAbstractButton *))); + connect(page, &SettingsPage::changed, this, &SettingsPageDlg::setButtonStates); + connect(ui.buttonBox, &QDialogButtonBox::clicked, this, &SettingsPageDlg::buttonClicked); page->load(); setButtonStates(); }