From 47fae269757af3e4b3feb9947ada92682b1d2727 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 10 Aug 2019 22:04:39 +0200 Subject: [PATCH] Construct QList for pages from initializer list --- plasmoid/lib/settingsdialog.cpp | 11 ++++++----- widgets/settings/settingsdialog.cpp | 15 +++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/plasmoid/lib/settingsdialog.cpp b/plasmoid/lib/settingsdialog.cpp index c7914d2..191dfcb 100644 --- a/plasmoid/lib/settingsdialog.cpp +++ b/plasmoid/lib/settingsdialog.cpp @@ -124,8 +124,8 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet) category = new OptionCategory; m_appearanceOptionPage = new AppearanceOptionPage(applet); category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Plasmoid")); - category->assignPages(QList() << new ConnectionOptionPage(applet.connection()) << new NotificationsOptionPage(GuiType::Plasmoid) - << m_appearanceOptionPage << new IconsOptionPage << new ShortcutOptionPage(applet)); + category->assignPages({ new ConnectionOptionPage(applet.connection()), new NotificationsOptionPage(GuiType::Plasmoid), m_appearanceOptionPage, + new IconsOptionPage, new ShortcutOptionPage(applet) }); category->setIcon(QIcon::fromTheme(QStringLiteral("plasma"))); categories << category; @@ -142,11 +142,12 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet) category = new OptionCategory; category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Extras")); - category->assignPages(QList() << webViewPage + category->assignPages({ webViewPage #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - << systemdPage + , + systemdPage #endif - ); + }); category->setIcon( QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/preferences-other.svg")))); categories << category; diff --git a/widgets/settings/settingsdialog.cpp b/widgets/settings/settingsdialog.cpp index a0ea6f6..7db0736 100644 --- a/widgets/settings/settingsdialog.cpp +++ b/widgets/settings/settingsdialog.cpp @@ -1278,27 +1278,26 @@ SettingsDialog::SettingsDialog(Data::SyncthingConnection *connection, QWidget *p category = new OptionCategory(this); category->setDisplayName(tr("Tray")); - category->assignPages(QList() << new ConnectionOptionPage(connection) << new NotificationsOptionPage << new AppearanceOptionPage - << new IconsOptionPage(IconsOptionPage::Context::UI) - << new IconsOptionPage(IconsOptionPage::Context::System)); + category->assignPages({ new ConnectionOptionPage(connection), new NotificationsOptionPage, new AppearanceOptionPage, + new IconsOptionPage(IconsOptionPage::Context::UI), new IconsOptionPage(IconsOptionPage::Context::System) }); category->setIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg"))); categories << category; category = new OptionCategory(this); category->setDisplayName(tr("Web view")); - category->assignPages(QList() << new WebViewOptionPage); + category->assignPages({ new WebViewOptionPage }); category->setIcon( QIcon::fromTheme(QStringLiteral("internet-web-browser"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/internet-web-browser.svg")))); categories << category; category = new OptionCategory(this); category->setDisplayName(tr("Startup")); - category->assignPages( - QList() << new AutostartOptionPage << new LauncherOptionPage << new LauncherOptionPage(QStringLiteral("Inotify")) + category->assignPages({ new AutostartOptionPage, new LauncherOptionPage, new LauncherOptionPage(QStringLiteral("Inotify")) #ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD - << new SystemdOptionPage + , + new SystemdOptionPage #endif - ); + }); category->setIcon(QIcon::fromTheme(QStringLiteral("system-run"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/system-run.svg")))); categories << category;