Commit 7e6ff7d7 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Modernize code

parent d1fee71d
Pipeline #39287 passed with stage
in 13 minutes and 54 seconds
......@@ -24,7 +24,7 @@ KCMAkregatorAdvancedConfig::KCMAkregatorAdvancedConfig(QWidget *parent, const QV
: KCModule(parent, args)
, m_widget(new SettingsAdvanced(this))
{
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->addWidget(m_widget);
KAboutData *about = new KAboutData(QStringLiteral("kcmakradvancedconfig"),
i18n("Advanced Feed Reader Settings"),
......
......@@ -25,7 +25,7 @@ KCMAkregatorAppearanceConfig::KCMAkregatorAppearanceConfig(QWidget *parent, cons
{
m_ui.setupUi(m_widget);
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->addWidget(m_widget);
connect(m_ui.kcfg_UseCustomColors, &QAbstractButton::toggled, m_ui.kcfg_ColorUnreadArticles, &QWidget::setEnabled);
......
......@@ -25,7 +25,7 @@ KCMAkregatorArchiveConfig::KCMAkregatorArchiveConfig(QWidget *parent, const QVar
{
Ui::SettingsArchive m_ui;
m_ui.setupUi(m_widget);
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->addWidget(m_widget);
connect(m_ui.rb_LimitArticleNumber, &QAbstractButton::toggled,
......
......@@ -27,7 +27,7 @@ KCMAkregatorBrowserConfig::KCMAkregatorBrowserConfig(QWidget *parent, const QVar
Ui::SettingsBrowser ui;
ui.setupUi(m_widget);
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->addWidget(m_widget);
connect(ui.kcfg_ExternalBrowserUseCustomCommand, &QAbstractButton::toggled,
......
......@@ -28,7 +28,7 @@ KCMAkregatorGeneralConfig::KCMAkregatorGeneralConfig(QWidget *parent, const QVar
Ui::SettingsGeneral ui;
ui.setupUi(m_widget);
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->addWidget(m_widget);
ui.kcfg_AutoFetchInterval->setSuffix(ki18np(" minute", " minutes"));
......
......@@ -21,7 +21,7 @@ K_PLUGIN_FACTORY(KCMAkregatorPluginsConfigFactory, registerPlugin<KCMAkregatorPl
KCMAkregatorPluginsConfig::KCMAkregatorPluginsConfig(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
{
QHBoxLayout *lay = new QHBoxLayout(this);
auto *lay = new QHBoxLayout(this);
lay->setContentsMargins(0, 0, 0, 0);
KAboutData *about = new KAboutData(QStringLiteral("kcmakrpluginsconfig"),
......
......@@ -22,7 +22,7 @@ K_PLUGIN_FACTORY(KCMAkregatorUserFeedBackConfigFactory, registerPlugin<KCMAkrega
KCMAkregatorUserFeedBackConfig::KCMAkregatorUserFeedBackConfig(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
{
QHBoxLayout *lay = new QHBoxLayout(this);
auto *lay = new QHBoxLayout(this);
lay->setContentsMargins(0, 0, 0, 0);
KAboutData *about = new KAboutData(QStringLiteral("kcmaddressbookuserfeedbackconfig"),
......
......@@ -98,7 +98,7 @@ void AkregatorPlugin::addFeed()
void AkregatorPlugin::readProperties(const KConfigGroup &config)
{
if (part()) {
Akregator::Part *myPart = static_cast<Akregator::Part *>(part());
auto *myPart = static_cast<Akregator::Part *>(part());
myPart->readProperties(config);
}
}
......@@ -106,7 +106,7 @@ void AkregatorPlugin::readProperties(const KConfigGroup &config)
void AkregatorPlugin::saveProperties(KConfigGroup &config)
{
if (part()) {
Akregator::Part *myPart = static_cast<Akregator::Part *>(part());
auto *myPart = static_cast<Akregator::Part *>(part());
myPart->saveProperties(config);
}
}
......
......@@ -244,8 +244,8 @@ void ActionManagerImpl::initMainWidget(MainWidget *mainWidget)
// toolbar / View
const MainWidget::ViewMode viewMode = static_cast<MainWidget::ViewMode>(Settings::viewMode());
QActionGroup *group = new QActionGroup(this);
const auto viewMode = static_cast<MainWidget::ViewMode>(Settings::viewMode());
auto *group = new QActionGroup(this);
action = coll->addAction(QStringLiteral("normal_view"));
action->setCheckable(true);
action->setChecked(viewMode == MainWidget::NormalView);
......@@ -306,7 +306,7 @@ void ActionManagerImpl::initMainWidget(MainWidget *mainWidget)
coll->setDefaultShortcut(action, QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_R));
// Settings menu
KToggleAction *sqf = coll->add<KToggleAction>(QStringLiteral("show_quick_filter"));
auto *sqf = coll->add<KToggleAction>(QStringLiteral("show_quick_filter"));
sqf->setText(i18n("Show Quick Filter"));
connect(sqf, &QAction::triggered, d->mainWidget, &MainWidget::slotToggleShowQuickFilter);
sqf->setChecked(Settings::showQuickFilter());
......@@ -352,7 +352,7 @@ void ActionManagerImpl::initMainWidget(MainWidget *mainWidget)
connect(action, &QAction::triggered, d->mainWidget, &MainWidget::slotArticleDelete);
coll->setDefaultShortcut(action, QKeySequence(Qt::Key_Delete));
KActionMenu *statusMenu = coll->add<KActionMenu>(QStringLiteral("article_set_status"));
auto *statusMenu = coll->add<KActionMenu>(QStringLiteral("article_set_status"));
statusMenu->setText(i18n("&Mark As"));
statusMenu->setEnabled(false);
......@@ -380,7 +380,7 @@ void ActionManagerImpl::initMainWidget(MainWidget *mainWidget)
connect(action, &QAction::triggered, d->mainWidget, &MainWidget::slotSetSelectedArticleUnread);
statusMenu->addAction(action);
KToggleAction *importantAction = coll->add<KToggleAction>(QStringLiteral("article_set_status_important"));
auto *importantAction = coll->add<KToggleAction>(QStringLiteral("article_set_status_important"));
importantAction->setText(i18n("&Mark as Important"));
importantAction->setIcon(QIcon::fromTheme(QStringLiteral("mail-mark-important")));
const QList<QKeySequence> importantSC = {QKeySequence(Qt::CTRL + Qt::Key_I), QKeySequence(Qt::Key_I)};
......
......@@ -50,7 +50,7 @@ AddFeedDialog::AddFeedDialog(QWidget *parent, const QString &name)
{
setObjectName(name);
setWindowTitle(i18nc("@title:window", "Add Feed"));
QVBoxLayout *mainLayout = new QVBoxLayout(this);
auto *mainLayout = new QVBoxLayout(this);
widget = new AddFeedWidget(this);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
......
......@@ -157,7 +157,7 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList &)
QDir().mkpath(path);
m_standardFeedList = path + QStringLiteral("/feeds.opml");
Backend::StorageFactoryDummyImpl *dummyFactory = new Backend::StorageFactoryDummyImpl();
auto *dummyFactory = new Backend::StorageFactoryDummyImpl();
if (!Backend::StorageFactoryRegistry::self()->registerFactory(dummyFactory, dummyFactory->key())) {
// There was already a dummy factory registered.
delete dummyFactory;
......@@ -269,7 +269,7 @@ void Part::slotOnShutdown()
void Part::initializeTrayIcon()
{
TrayIcon *trayIcon = new TrayIcon(m_mainWidget->window());
auto *trayIcon = new TrayIcon(m_mainWidget->window());
TrayIcon::setInstance(trayIcon);
m_actionManager->setTrayIcon(trayIcon);
......
......@@ -128,14 +128,14 @@ void ArticleListView::setArticleModel(ArticleModel *model)
m_proxy->setSourceModel(model);
m_proxy->setSortRole(ArticleModel::SortRole);
m_proxy->setFilters(m_matchers);
FilterDeletedProxyModel *const proxy2 = new FilterDeletedProxyModel(model);
auto *const proxy2 = new FilterDeletedProxyModel(model);
proxy2->setSortRole(ArticleModel::SortRole);
proxy2->setSourceModel(m_proxy);
connect(model, &QAbstractItemModel::rowsInserted,
m_proxy.data(), &QSortFilterProxyModel::invalidate);
FilterColumnsProxyModel *const columnsProxy = new FilterColumnsProxyModel(model);
auto *const columnsProxy = new FilterColumnsProxyModel(model);
columnsProxy->setSortRole(ArticleModel::SortRole);
columnsProxy->setSourceModel(proxy2);
columnsProxy->setColumnEnabled(ArticleModel::ItemTitleColumn);
......@@ -399,7 +399,7 @@ void ArticleListView::mousePressEvent(QMouseEvent *ev)
void ArticleListView::contextMenuEvent(QContextMenuEvent *event)
{
QWidget *w = ActionManager::getInstance()->container(QStringLiteral("article_popup"));
QMenu *popup = qobject_cast<QMenu *>(w);
auto *popup = qobject_cast<QMenu *>(w);
if (popup) {
popup->exec(event->globalPos());
}
......
......@@ -159,7 +159,7 @@ bool Criterion::satisfiedBy(const Article &article) const
bool satisfied = false;
const Predicate predicateType = static_cast<Predicate>(m_predicate & ~Negation);
const auto predicateType = static_cast<Predicate>(m_predicate & ~Negation);
QString subjectType = QLatin1String(concreteSubject.typeName());
switch (predicateType) {
......@@ -265,8 +265,8 @@ void ArticleMatcher::readConfig(KConfigGroup *config)
bool ArticleMatcher::operator==(const AbstractMatcher &other) const
{
AbstractMatcher *ptr = const_cast<AbstractMatcher *>(&other);
ArticleMatcher *o = dynamic_cast<ArticleMatcher *>(ptr);
auto *ptr = const_cast<AbstractMatcher *>(&other);
auto *o = dynamic_cast<ArticleMatcher *>(ptr);
if (!o) {
return false;
} else {
......
......@@ -59,7 +59,7 @@ ArticleViewerWebEngineWidgetNg::ArticleViewerWebEngineWidgetNg(KActionCollection
void ArticleViewerWebEngineWidgetNg::initializeLayout(KActionCollection *ac)
{
QVBoxLayout *layout = new QVBoxLayout(this);
auto *layout = new QVBoxLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
mTextToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
......@@ -163,7 +163,7 @@ void ArticleViewerWebEngineWidgetNg::slotOpenInBrowser()
{
const QUrl currentUrl(mArticleViewerNg->url());
if (currentUrl.isLocalFile()) {
WebEngineViewer::WebEngineExportHtmlPageJob *job = new WebEngineViewer::WebEngineExportHtmlPageJob;
auto *job = new WebEngineViewer::WebEngineExportHtmlPageJob;
job->setEngineView(mArticleViewerNg);
connect(job, &WebEngineViewer::WebEngineExportHtmlPageJob::failed, this, &ArticleViewerWebEngineWidgetNg::slotExportHtmlPageFailed);
connect(job, &WebEngineViewer::WebEngineExportHtmlPageJob::success, this, &ArticleViewerWebEngineWidgetNg::slotExportHtmlPageSuccess);
......
......@@ -46,7 +46,7 @@ ArticleViewerWidget::ArticleViewerWidget(const QString &grantleeDirectory, KActi
, m_articleViewerWidgetNg(new Akregator::ArticleViewerWebEngineWidgetNg(ac, this))
, m_grantleeDirectory(grantleeDirectory)
{
QGridLayout *layout = new QGridLayout(this);
auto *layout = new QGridLayout(this);
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(m_articleViewerWidgetNg);
m_articleHtmlWriter = new Akregator::ArticleHtmlWebEngineWriter(m_articleViewerWidgetNg->articleViewerNg(), this);
......
......@@ -52,7 +52,7 @@ void CreateFolderCommand::Private::doCreate()
return;
}
Folder *parentFolder = qobject_cast<Folder *>(m_selectedSubscription);
auto *parentFolder = qobject_cast<Folder *>(m_selectedSubscription);
if (!parentFolder) {
parentFolder = m_selectedSubscription ? m_selectedSubscription->parent() : nullptr;
}
......@@ -62,7 +62,7 @@ void CreateFolderCommand::Private::doCreate()
TreeNode *const after = (m_selectedSubscription && m_selectedSubscription->isGroup()) ? m_selectedSubscription : nullptr;
Folder *const newFolder = new Folder(name);
auto *const newFolder = new Folder(name);
parentFolder->insertChild(newFolder, after);
m_subscriptionListView->ensureNodeVisible(newFolder);
q->done();
......
......@@ -86,7 +86,7 @@ public:
private:
static DeleteSubscriptionJob *reallyCreateJob(TreeNode *node)
{
DeleteSubscriptionJob *job = new DeleteSubscriptionJob;
auto *job = new DeleteSubscriptionJob;
job->setSubscriptionId(node->id());
return job;
}
......
......@@ -46,7 +46,7 @@ ExpireItemsCommand::Private::Private(ExpireItemsCommand *qq) : q(qq)
void ExpireItemsCommand::Private::addDeleteJobForFeed(Feed *feed)
{
Q_ASSERT(feed);
ArticleDeleteJob *job = new ArticleDeleteJob(q);
auto *job = new ArticleDeleteJob(q);
connect(job, &ArticleDeleteJob::finished, q, [this](KJob *job) {
jobFinished(job);
});
......
......@@ -15,9 +15,9 @@ using namespace Akregator;
CrashWidget::CrashWidget(QWidget *parent)
: QWidget(parent)
{
QVBoxLayout *vbox = new QVBoxLayout(this);
auto *vbox = new QVBoxLayout(this);
QHBoxLayout *labelLayout = new QHBoxLayout;
auto *labelLayout = new QHBoxLayout;
QLabel *label = new QLabel(i18n("Akregator did not close correctly. Would you like to restore the previous session?"), this);
label->setObjectName(QStringLiteral("restoresessionlabel"));
label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
......@@ -30,7 +30,7 @@ CrashWidget::CrashWidget(QWidget *parent)
labelLayout->addWidget(label);
labelLayout->addStretch(0);
QHBoxLayout *buttonLayout = new QHBoxLayout;
auto *buttonLayout = new QHBoxLayout;
vbox->addLayout(buttonLayout);
buttonLayout->addStretch(0);
......
......@@ -358,7 +358,7 @@ void Feed::loadFavicon(const QString &url, bool downloadFavicon)
if (u.isLocalFile()) {
setFaviconLocalPath(u.toLocalFile());
} else {
Akregator::DownloadFeedIconJob *job = new Akregator::DownloadFeedIconJob(this);
auto *job = new Akregator::DownloadFeedIconJob(this);
job->setFeedIconUrl(u);
job->setDownloadFavicon(downloadFavicon);
connect(job, &DownloadFeedIconJob::result, this, [this](const QString &fileName) {
......@@ -581,7 +581,7 @@ QDomElement Feed::toOPML(QDomElement parent, QDomDocument document) const
KJob *Feed::createMarkAsReadJob()
{
ArticleModifyJob *job = new ArticleModifyJob;
auto *job = new ArticleModifyJob;
const auto arts = articles();
for (const Article &i : arts) {
const ArticleId aid = { xmlUrl(), i.guid() };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment