diff --git a/src/kcm/configmodule.cpp b/src/kcm/configmodule.cpp
index e62284702e9cb3fc60057b2f8b1c4e075a842176..d0461b8a581eb12ee79920ae0ddff3b8c874bf3d 100644
--- a/src/kcm/configmodule.cpp
+++ b/src/kcm/configmodule.cpp
@@ -21,9 +21,9 @@ ConfigModule::ConfigModule(QWidget *parent, const QVariantList &args)
     : KCModule(parent, args)
 {
     setButtons(NoAdditionalButton);
-    QVBoxLayout *l = new QVBoxLayout(this);
+    auto *l = new QVBoxLayout(this);
     l->setContentsMargins(0, 0, 0, 0);
-    TransportManagementWidget *tmw = new TransportManagementWidget(this);
+    auto *tmw = new TransportManagementWidget(this);
     l->addWidget(tmw);
 }
 
diff --git a/src/kmailtransport/plugins/smtp/autotests/fakeserver.cpp b/src/kmailtransport/plugins/smtp/autotests/fakeserver.cpp
index b027bf82d2b1d3ab7268045bdbc72b11464c4515..c6ededb39643d8e0b48bc6ed86450adcce8befd8 100644
--- a/src/kmailtransport/plugins/smtp/autotests/fakeserver.cpp
+++ b/src/kmailtransport/plugins/smtp/autotests/fakeserver.cpp
@@ -57,7 +57,7 @@ void FakeServer::dataAvailable()
 {
     QMutexLocker locker(&m_mutex);
 
-    QTcpSocket *socket = qobject_cast<QTcpSocket *>(sender());
+    auto *socket = qobject_cast<QTcpSocket *>(sender());
     Q_ASSERT(socket != nullptr);
 
     int scenarioNumber = m_clientSockets.indexOf(socket);
diff --git a/src/kmailtransport/plugins/smtp/smtpconfigdialog.cpp b/src/kmailtransport/plugins/smtp/smtpconfigdialog.cpp
index 456c295e82a79eccf97141906fabbc410e8b344c..4b5e1c3b6df9587363761da8ba65c37fd5821592 100644
--- a/src/kmailtransport/plugins/smtp/smtpconfigdialog.cpp
+++ b/src/kmailtransport/plugins/smtp/smtpconfigdialog.cpp
@@ -22,7 +22,7 @@ SmtpConfigDialog::SmtpConfigDialog(Transport *transport, QWidget *parent)
 {
     Q_ASSERT(transport);
     mTransport = transport;
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    auto *mainLayout = new QVBoxLayout(this);
     mConfigWidget = new SMTPConfigWidget(transport, this);
     mConfigWidget->setObjectName(QStringLiteral("smtpconfigwidget"));
     mainLayout->addWidget(mConfigWidget);
diff --git a/src/kmailtransport/tests/addtransportdialogng_gui.cpp b/src/kmailtransport/tests/addtransportdialogng_gui.cpp
index 1cf02aedbd4d25f8655ed3c9957acae6d7ef0a91..c9f3344b50ee6255a202e04581bf0e5d8c3e7bc6 100644
--- a/src/kmailtransport/tests/addtransportdialogng_gui.cpp
+++ b/src/kmailtransport/tests/addtransportdialogng_gui.cpp
@@ -15,11 +15,11 @@
 AddTransportDialogNG_gui::AddTransportDialogNG_gui(QWidget *parent)
     : QWidget(parent)
 {
-    QHBoxLayout *layout = new QHBoxLayout(this);
+    auto *layout = new QHBoxLayout(this);
     QPushButton *button = new QPushButton(QStringLiteral("Add transport"));
     layout->addWidget(button);
     connect(button, &QPushButton::clicked, this, [this] {
-        MailTransport::AddTransportDialogNG *dlg = new MailTransport::AddTransportDialogNG(this);
+        auto *dlg = new MailTransport::AddTransportDialogNG(this);
         dlg->exec();
         delete dlg;
     });
@@ -30,7 +30,7 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     app.setApplicationName(QStringLiteral("addtransportnewng"));
     QStandardPaths::setTestModeEnabled(true);
-    AddTransportDialogNG_gui *t = new AddTransportDialogNG_gui();
+    auto *t = new AddTransportDialogNG_gui();
     t->show();
     app.exec();
     delete t;
diff --git a/src/kmailtransport/tests/transportmgr.cpp b/src/kmailtransport/tests/transportmgr.cpp
index 526695a5f6f959da4c549334066827718cb800f6..885f730945934288a3d14529a40ca610e78d8607 100644
--- a/src/kmailtransport/tests/transportmgr.cpp
+++ b/src/kmailtransport/tests/transportmgr.cpp
@@ -24,7 +24,7 @@ using namespace MailTransport;
 TransportMgr::TransportMgr()
     : mCurrentJob(nullptr)
 {
-    QVBoxLayout *vbox = new QVBoxLayout(this);
+    auto *vbox = new QVBoxLayout(this);
     vbox->setContentsMargins(0, 0, 0, 0);
 
     vbox->addWidget(new TransportManagementWidget(this));
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     app.setApplicationName(QStringLiteral("transportmgr"));
 
-    TransportMgr *t = new TransportMgr();
+    auto *t = new TransportMgr();
     t->show();
     app.exec();
     delete t;
diff --git a/src/kmailtransport/widgets/addtransportdialogng.cpp b/src/kmailtransport/widgets/addtransportdialogng.cpp
index 072b37ace31c3cc333f0b4fc5186d29382bd0b8d..ad8202a389af37a3f4ae9184b04df11a5fedf365 100644
--- a/src/kmailtransport/widgets/addtransportdialogng.cpp
+++ b/src/kmailtransport/widgets/addtransportdialogng.cpp
@@ -87,7 +87,7 @@ AddTransportDialogNG::AddTransportDialogNG(QWidget *parent)
 {
     // Setup UI.
     {
-        QVBoxLayout *mainLayout = new QVBoxLayout(this);
+        auto *mainLayout = new QVBoxLayout(this);
         QWidget *widget = new QWidget(this);
         d->ui.setupUi(widget);
         mainLayout->addWidget(widget);
@@ -105,7 +105,7 @@ AddTransportDialogNG::AddTransportDialogNG(QWidget *parent)
     // Populate type list.
     const auto transportTypes = TransportManager::self()->types();
     for (const TransportType &type : transportTypes) {
-        QTreeWidgetItem *treeItem = new QTreeWidgetItem(d->ui.typeListView);
+        auto *treeItem = new QTreeWidgetItem(d->ui.typeListView);
         treeItem->setText(0, type.name());
         treeItem->setText(1, type.description());
         treeItem->setToolTip(1, type.description());
diff --git a/src/kmailtransport/widgets/transportlistview.cpp b/src/kmailtransport/widgets/transportlistview.cpp
index d93290dccffc315b41b0adfb87e9aad46c35129e..35d7f47afeb6ef07f63c3cc8cae8009a60f78136 100644
--- a/src/kmailtransport/widgets/transportlistview.cpp
+++ b/src/kmailtransport/widgets/transportlistview.cpp
@@ -68,7 +68,7 @@ void TransportListView::commitData(QWidget *editor)
         return;
     }
     QTreeWidgetItem *item = selectedItems().first();
-    QLineEdit *edit = dynamic_cast<QLineEdit *>(editor);  // krazy:exclude=qclasses
+    auto *edit = dynamic_cast<QLineEdit *>(editor);  // krazy:exclude=qclasses
     Q_ASSERT(edit);   // original code had if
 
     const int id = item->data(0, Qt::UserRole).toInt();
@@ -94,7 +94,7 @@ void TransportListView::fillTransportList()
     clear();
     const auto lstTransports = TransportManager::self()->transports();
     for (Transport *t : lstTransports) {
-        QTreeWidgetItem *item = new QTreeWidgetItem(this);
+        auto *item = new QTreeWidgetItem(this);
         item->setData(0, Qt::UserRole, t->id());
         QString name = t->name();
         if (TransportManager::self()->defaultTransportId() == t->id()) {
diff --git a/src/kmailtransportakonadi/autotests/attributetest.cpp b/src/kmailtransportakonadi/autotests/attributetest.cpp
index e8c2579ac8b387ba8cfb4f8fbed1bee9e8985435..e3c3124b0db8d2264f65551d1b7d04531ee14206 100644
--- a/src/kmailtransportakonadi/autotests/attributetest.cpp
+++ b/src/kmailtransportakonadi/autotests/attributetest.cpp
@@ -73,7 +73,7 @@ void AttributeTest::testSerialization()
         cc << QStringLiteral("cc2@me.org");
         QStringList bcc(QStringLiteral("bcc1@me.org"));
         bcc << QStringLiteral("bcc2@me.org");
-        AddressAttribute *a = new AddressAttribute(from, to, cc, bcc);
+        auto *a = new AddressAttribute(from, to, cc, bcc);
         QByteArray data = a->serialized();
         delete a;
         a = new AddressAttribute;
@@ -92,7 +92,7 @@ void AttributeTest::testSerialization()
         qDebug() << "ms" << date.toString(QStringLiteral("z"));
         int ms = date.toString(QStringLiteral("z")).toInt();
         date = date.addMSecs(-ms);
-        DispatchModeAttribute *a = new DispatchModeAttribute(mode);
+        auto *a = new DispatchModeAttribute(mode);
         a->setSendAfter(date);
         QByteArray data = a->serialized();
         delete a;
@@ -105,7 +105,7 @@ void AttributeTest::testSerialization()
 
     {
         QString msg(QStringLiteral("The #!@$ing thing failed!"));
-        ErrorAttribute *a = new ErrorAttribute(msg);
+        auto *a = new ErrorAttribute(msg);
         QByteArray data = a->serialized();
         delete a;
         a = new ErrorAttribute;
@@ -115,7 +115,7 @@ void AttributeTest::testSerialization()
     }
 
     {
-        SentActionAttribute *a = new SentActionAttribute();
+        auto *a = new SentActionAttribute();
         const qlonglong id = 123456789012345ll;
 
         a->addAction(SentActionAttribute::Action::MarkAsReplied, QVariant(id));
@@ -225,7 +225,7 @@ void AttributeTest::testSerialization()
 
     {
         int id = 3219;
-        TransportAttribute *a = new TransportAttribute(id);
+        auto *a = new TransportAttribute(id);
         QByteArray data = a->serialized();
         delete a;
         a = new TransportAttribute;
diff --git a/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp b/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp
index 2444af2dd55ddac10710842399e623fa798ed743..d90d97615f807e29eacfecdf747a34833eb76717 100644
--- a/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp
+++ b/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp
@@ -52,7 +52,7 @@ void MessageQueueJobTest::initTestCase()
     mda.setIsOnline(false);
 
     // check that outbox is empty
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    auto *rjob = new SpecialMailCollectionsRequestJob(this);
     rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
     QSignalSpy spy(rjob, &KJob::result);
     QVERIFY(spy.wait(10000));
@@ -66,7 +66,7 @@ void MessageQueueJobTest::testValidMessages()
     QVERIFY2(tid >= 0, "I need a default transport, but there is none.");
 
     // send a valid message using the default transport
-    MessageQueueJob *qjob = new MessageQueueJob;
+    auto *qjob = new MessageQueueJob;
     qjob->transportAttribute().setTransportId(tid);
     Message::Ptr msg = Message::Ptr(new Message);
     msg->setContent("\nThis is message #1 from the MessageQueueJobTest unit test.\n");
@@ -87,30 +87,30 @@ void MessageQueueJobTest::testValidMessages()
     Item item = fjob->items().constFirst();
     QVERIFY(!item.remoteId().isEmpty());   // stored by the resource
     QVERIFY(item.hasPayload<Message::Ptr>());
-    AddressAttribute *addrA = item.attribute<AddressAttribute>();
+    auto *addrA = item.attribute<AddressAttribute>();
     QVERIFY(addrA);
     QVERIFY(addrA->from().isEmpty());
     QCOMPARE(addrA->to().count(), 1);
     QCOMPARE(addrA->to(), SPAM_ADDRESS);
     QCOMPARE(addrA->cc().count(), 0);
     QCOMPARE(addrA->bcc().count(), 0);
-    DispatchModeAttribute *dA = item.attribute<DispatchModeAttribute>();
+    auto *dA = item.attribute<DispatchModeAttribute>();
     QVERIFY(dA);
     QCOMPARE(dA->dispatchMode(), DispatchModeAttribute::Automatic);   // default mode
-    SentBehaviourAttribute *sA = item.attribute<SentBehaviourAttribute>();
+    auto *sA = item.attribute<SentBehaviourAttribute>();
     QVERIFY(sA);
     // default sent collection
     QCOMPARE(sA->sentBehaviour(), SentBehaviourAttribute::MoveToDefaultSentCollection);
-    TransportAttribute *tA = item.attribute<TransportAttribute>();
+    auto *tA = item.attribute<TransportAttribute>();
     QVERIFY(tA);
     QCOMPARE(tA->transportId(), tid);
-    ErrorAttribute *eA = item.attribute<ErrorAttribute>();
+    auto *eA = item.attribute<ErrorAttribute>();
     QVERIFY(!eA);   // no error
     QCOMPARE(item.flags().count(), 1);
     QVERIFY(item.flags().contains(Akonadi::MessageFlags::Queued));
 
     // delete message, for further tests
-    ItemDeleteJob *djob = new ItemDeleteJob(item);
+    auto *djob = new ItemDeleteJob(item);
     AKVERIFYEXEC(djob);
     verifyOutboxContents(0);
 
@@ -126,7 +126,7 @@ void MessageQueueJobTest::testInvalidMessages()
     Message::Ptr msg;
 
     // without message
-    MessageQueueJob *job = new MessageQueueJob;
+    auto *job = new MessageQueueJob;
     job->transportAttribute().setTransportId(TransportManager::self()->defaultTransportId());
     job->addressAttribute().setTo(SPAM_ADDRESS);
     QVERIFY(!job->exec());
@@ -166,7 +166,7 @@ void MessageQueueJobTest::verifyOutboxContents(qlonglong count)
     Collection outbox
         = SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
     QVERIFY(outbox.isValid());
-    CollectionStatisticsJob *job = new CollectionStatisticsJob(outbox);
+    auto *job = new CollectionStatisticsJob(outbox);
     AKVERIFYEXEC(job);
     QCOMPARE(job->statistics().count(), count);
 }
diff --git a/src/kmailtransportakonadi/dispatcherinterface.cpp b/src/kmailtransportakonadi/dispatcherinterface.cpp
index 854b122e32fac53749edefbbe5197ad4065fc625..711fa8c88338a9e3ac47503e3e55f467c9a1922e 100644
--- a/src/kmailtransportakonadi/dispatcherinterface.cpp
+++ b/src/kmailtransportakonadi/dispatcherinterface.cpp
@@ -54,7 +54,7 @@ void DispatcherInterface::dispatchManually()
         return;
     }
 
-    FilterActionJob *mjob = new FilterActionJob(outbox, new SendQueuedAction, sInstance);
+    auto *mjob = new FilterActionJob(outbox, new SendQueuedAction, sInstance);
     QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
 }
 
@@ -67,7 +67,7 @@ void DispatcherInterface::retryDispatching()
         return;
     }
 
-    FilterActionJob *mjob = new FilterActionJob(outbox, new ClearErrorAction, sInstance);
+    auto *mjob = new FilterActionJob(outbox, new ClearErrorAction, sInstance);
     QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
 }
 
@@ -80,7 +80,7 @@ void DispatcherInterface::dispatchManualTransport(int transportId)
         return;
     }
 
-    FilterActionJob *mjob
+    auto *mjob
         = new FilterActionJob(outbox, new DispatchManualTransportAction(transportId), sInstance);
     QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
 }
diff --git a/src/kmailtransportakonadi/dispatchmodeattribute.cpp b/src/kmailtransportakonadi/dispatchmodeattribute.cpp
index 1b3bed887bdcbe6f0b6dd6e1a945ad8dd1e705df..01d7256081b5c4861a91733bb39f12d6f8f03114 100644
--- a/src/kmailtransportakonadi/dispatchmodeattribute.cpp
+++ b/src/kmailtransportakonadi/dispatchmodeattribute.cpp
@@ -33,7 +33,7 @@ DispatchModeAttribute::~DispatchModeAttribute()
 
 DispatchModeAttribute *DispatchModeAttribute::clone() const
 {
-    DispatchModeAttribute *const cloned = new DispatchModeAttribute(d->mMode);
+    auto *const cloned = new DispatchModeAttribute(d->mMode);
     cloned->setSendAfter(d->mDueDate);
     return cloned;
 }
diff --git a/src/kmailtransportakonadi/filteractionjob.cpp b/src/kmailtransportakonadi/filteractionjob.cpp
index 61074db98d4a659f4df214595597b79d3d04bcda..2553f9e8bbbdb8a177bc146feba45c9b3fd0e943 100644
--- a/src/kmailtransportakonadi/filteractionjob.cpp
+++ b/src/kmailtransportakonadi/filteractionjob.cpp
@@ -46,7 +46,7 @@ void FilterActionJob::Private::fetchResult(KJob *job)
         return;
     }
 
-    ItemFetchJob *fjob = dynamic_cast<ItemFetchJob *>(job);
+    auto *fjob = dynamic_cast<ItemFetchJob *>(job);
     Q_ASSERT(fjob);
     Q_ASSERT(items.isEmpty());
     items = fjob->items();
@@ -109,7 +109,7 @@ void FilterActionJob::doStart()
 {
     if (d->collection.isValid()) {
         qCDebug(MAILTRANSPORTAKONADI_LOG) << "Fetching collection" << d->collection.id();
-        ItemFetchJob *fjob = new ItemFetchJob(d->collection, this);
+        auto *fjob = new ItemFetchJob(d->collection, this);
         Q_ASSERT(d->functor);
         d->fetchScope = d->functor->fetchScope();
         fjob->setFetchScope(d->fetchScope);
diff --git a/src/kmailtransportakonadi/messagequeuejob.cpp b/src/kmailtransportakonadi/messagequeuejob.cpp
index 519521981ed2c2eefe2167b14d8bbad28276b958..6705be217f1b044dfe497214a54ea86f3560c84b 100644
--- a/src/kmailtransportakonadi/messagequeuejob.cpp
+++ b/src/kmailtransportakonadi/messagequeuejob.cpp
@@ -111,7 +111,7 @@ void MessageQueueJob::Private::outboxRequestResult(KJob *job)
         return;
     }
 
-    SpecialMailCollectionsRequestJob *requestJob
+    auto *requestJob
         = qobject_cast<SpecialMailCollectionsRequestJob *>(job);
     if (!requestJob) {
         return;
@@ -136,7 +136,7 @@ void MessageQueueJob::Private::outboxRequestResult(KJob *job)
     // Store the item in the outbox.
     const Collection collection = requestJob->collection();
     Q_ASSERT(collection.isValid());
-    ItemCreateJob *cjob = new ItemCreateJob(item, collection);   // job autostarts
+    auto *cjob = new ItemCreateJob(item, collection);   // job autostarts
     q->addSubjob(cjob);
 }
 
@@ -188,7 +188,7 @@ void MessageQueueJob::setMessage(const Message::Ptr &message)
 
 void MessageQueueJob::start()
 {
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    auto *rjob = new SpecialMailCollectionsRequestJob(this);
     rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
     connect(rjob, &SpecialMailCollectionsRequestJob::result, this, [this](KJob *job) {
         d->outboxRequestResult(job);
diff --git a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
index 1c9a72731094aea007f74cd36c6fc2add117f0ba..c88661a561d0395e42c197e2ba6a456d49995770 100644
--- a/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
+++ b/src/kmailtransportakonadi/plugins/akonadimailtransportplugin.cpp
@@ -84,7 +84,7 @@ MailTransport::TransportJob *AkonadiMailTransportPlugin::createTransportJob(Mail
 
 void AkonadiMailTransportPlugin::initializeTransport(MailTransport::Transport *t, const QString &identifier)
 {
-    AgentInstanceCreateJob *cjob = new AgentInstanceCreateJob(identifier);
+    auto *cjob = new AgentInstanceCreateJob(identifier);
     if (!cjob->exec()) {
         qCWarning(MAILTRANSPORT_AKONADI_LOG) << "Failed to create agent instance of type" << identifier;
         return;
diff --git a/src/kmailtransportakonadi/plugins/resourcesendjob.cpp b/src/kmailtransportakonadi/plugins/resourcesendjob.cpp
index 469145b677835a51cfb37b3dda123ad11babb22e..deee321765a70956a28b9ebdf80c2043e579c712 100644
--- a/src/kmailtransportakonadi/plugins/resourcesendjob.cpp
+++ b/src/kmailtransportakonadi/plugins/resourcesendjob.cpp
@@ -30,7 +30,7 @@ void ResourceSendJob::doStart()
 {
     Message::Ptr msg = Message::Ptr(new Message);
     msg->setContent(data());
-    MessageQueueJob *job = new MessageQueueJob;
+    auto *job = new MessageQueueJob;
     job->setMessage(msg);
     job->transportAttribute().setTransportId(transport()->id());
     // Default dispatch mode (send now).
diff --git a/src/kmailtransportakonadi/sentactionattribute.cpp b/src/kmailtransportakonadi/sentactionattribute.cpp
index e6970d0f78a82c617a9b7e45fea2c26c15e02169..9ae2e97f19ff0fbbbe4a37259713b8c02a2fb99c 100644
--- a/src/kmailtransportakonadi/sentactionattribute.cpp
+++ b/src/kmailtransportakonadi/sentactionattribute.cpp
@@ -104,7 +104,7 @@ SentActionAttribute::Action::List SentActionAttribute::actions() const
 
 SentActionAttribute *SentActionAttribute::clone() const
 {
-    SentActionAttribute *attribute = new SentActionAttribute;
+    auto *attribute = new SentActionAttribute;
     attribute->d->mActions = d->mActions;
 
     return attribute;
diff --git a/src/kmailtransportakonadi/tests/clearerror.cpp b/src/kmailtransportakonadi/tests/clearerror.cpp
index 448389cda5631d3624dd56963cff94998f48c0bc..13a6860ad46f0fa3962c650bb574992483fdabf1 100644
--- a/src/kmailtransportakonadi/tests/clearerror.cpp
+++ b/src/kmailtransportakonadi/tests/clearerror.cpp
@@ -22,7 +22,7 @@ Runner::Runner()
 {
     Control::start();
 
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    auto *rjob = new SpecialMailCollectionsRequestJob(this);
     rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
     connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
     rjob->start();
diff --git a/src/kmailtransportakonadi/tests/queuer.cpp b/src/kmailtransportakonadi/tests/queuer.cpp
index cec88986e721e44a0c839b093522563af1c5d205..f6f45ed773692c409624a58ed7834ce4cb65283a 100644
--- a/src/kmailtransportakonadi/tests/queuer.cpp
+++ b/src/kmailtransportakonadi/tests/queuer.cpp
@@ -35,7 +35,7 @@ MessageQueuer::MessageQueuer()
     if (!Akonadi::Control::start()) {
         qFatal("Could not start Akonadi server.");
     }
-    QVBoxLayout *vbox = new QVBoxLayout(this);
+    auto *vbox = new QVBoxLayout(this);
     vbox->setContentsMargins(0, 0, 0, 0);
 
     mComboBox = new TransportComboBox(this);
@@ -89,7 +89,7 @@ void MessageQueuer::sendOnDateClicked()
 {
     QPointer<QDialog> dialog = new QDialog(this);
     auto layout = new QVBoxLayout(dialog);
-    QDateTimeEdit *dt = new QDateTimeEdit(dialog);
+    auto *dt = new QDateTimeEdit(dialog);
     dt->setDateTime(QDateTime::currentDateTime());
     dt->setDisplayFormat(QStringLiteral("hh:mm:ss"));
     layout->addWidget(dt);
@@ -116,7 +116,7 @@ MessageQueueJob *MessageQueuer::createQueueJob()
     msg->setContent(QByteArray("\n") + mMailEdit->document()->toPlainText().toLatin1());
     qDebug() << "msg:" << msg->encodedContent(true);
 
-    MessageQueueJob *job = new MessageQueueJob();
+    auto *job = new MessageQueueJob();
     job->setMessage(msg);
     job->transportAttribute().setTransportId(mComboBox->currentTransportId());
     // default dispatch mode
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     app.setApplicationName(QStringLiteral("messagequeuer"));
 
-    MessageQueuer *t = new MessageQueuer();
+    auto *t = new MessageQueuer();
     t->show();
     app.exec();
     delete t;
diff --git a/src/kmailtransportakonadi/tests/sendqueued.cpp b/src/kmailtransportakonadi/tests/sendqueued.cpp
index f99c8c2b1a261bdd2a6f8f3ab1a28509f87d3454..644e1a52a4172a2844b4d1359f37fb208121cc11 100644
--- a/src/kmailtransportakonadi/tests/sendqueued.cpp
+++ b/src/kmailtransportakonadi/tests/sendqueued.cpp
@@ -22,7 +22,7 @@ Runner::Runner()
 {
     Control::start();
 
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    auto *rjob = new SpecialMailCollectionsRequestJob(this);
     rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
     connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
     rjob->start();