[pim/messagelib] /: coding style

Git commit 8d078969a4474df06eab13af4ef1b473d2658148 by Laurent Montel.
Committed on 21/07/2026 at 06:22.
Pushed by mlaurent into branch 'master'.

coding style

M  +2    -2    messagecomposer/autotests/composertest.cpp
M  +1    -1    messagecomposer/autotests/encryptjobtest.cpp
M  +1    -1    messagecore/tests/test_dates.cpp
M  +1    -1    messagelist/src/utils/configureaggregationsdialog.cpp
M  +1    -1    messagelist/src/utils/configurethemesdialog.cpp
M  +1    -1    messagelist/src/utils/themeeditor.cpp
M  +1    -1    messageviewer/src/header/headerstyleplugin.cpp
M  +1    -1    messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
M  +1    -1    messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
M  +1    -1    messageviewer/src/remote-content/autotests/remotecontentconfiguredialogtest.cpp
M  +1    -1    messageviewer/src/remote-content/autotests/remotecontentconfigurewidgettest.cpp
M  +1    -1    messageviewer/src/remote-content/autotests/remotecontentdialogtest.cpp
M  +1    -1    messageviewer/src/scamdetection/autotests/scamattributetest.cpp
M  +1    -1    messageviewer/src/scamdetection/autotests/scamdetectioninfotest.cpp
M  +1    -1    messageviewer/src/utils/iconnamecache.cpp
M  +1    -1    messageviewer/src/viewer/csshelper.cpp
M  +1    -1    messageviewer/src/viewer/csshelperbase.cpp
M  +1    -1    messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp
M  +1    -1    messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
M  +1    -1    messageviewer/src/widgets/autotests/shownextmessagewidgettest.cpp
M  +1    -1    messageviewer/tests/viewertest_gui.cpp
M  +1    -1    mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
M  +1    -1    mimetreeparser/autotests/cryptohelpertest.cpp
M  +1    -1    mimetreeparser/src/bodypartformatter.cpp
M  +1    -1    mimetreeparser/src/bodypartformatterfactory.cpp
M  +2    -3    mimetreeparser/src/memento/verifyopaquebodypartmemento.h
M  +1    -1    mimetreeparser/src/messagepart.cpp
M  +1    -1    mimetreeparser/src/nodehelper.cpp
M  +3    -3    mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.cpp
M  +1    -1    mimetreeparser/src/utils/util.cpp
M  +3    -3    templateparser/autotests/templateextracthtmlelementfrommailtest.cpp
M  +3    -3    templateparser/autotests/templateextracttextfrommailtest.cpp
M  +3    -3    templateparser/autotests/templateparseremailaddressrequesterinterfacewidgettest.cpp
M  +1    -1    templateparser/autotests/templateparserjobtest.cpp
M  +1    -1    templateparser/src/customtemplates.cpp
M  +1    -1    templateparser/src/customtemplatesmenu.cpp
M  +1    -1    templateparser/src/defaulttemplates.cpp
M  +1    -1    templateparser/src/templateparserjob_p.h
M  +1    -1    templateparser/src/templatescommandmenu.cpp
M  +1    -1    templateparser/src/templatesconfiguration.cpp
M  +1    -1    templateparser/src/templatestexteditor.cpp
M  +1    -1    templateparser/src/templatesutil.cpp
M  +1    -1    webengineviewer/src/autotests/webengineexportpdfpagejobtest.cpp
M  +1    -1    webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.cpp
M  +3    -3    webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.cpp
M  +3    -3    webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.cpp
M  +3    -3    webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.cpp
M  +5    -4    webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.cpp
M  +2    -3    webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
M  +3    -3    webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
M  +1    -1    webengineviewer/src/developertool/autotests/developertooldialogtest.cpp

https://invent.kde.org/pim/messagelib/-/commit/8d078969a4474df06eab13af4ef1b473d2658148

diff --git a/messagecomposer/autotests/composertest.cpp b/messagecomposer/autotests/composertest.cpp
index 6ce0ab83e..bb4c528ed 100644
--- a/messagecomposer/autotests/composertest.cpp
+++ b/messagecomposer/autotests/composertest.cpp
@@ -6,8 +6,6 @@
 */
 
 #include "composertest.h"
-using namespace Qt::Literals::StringLiterals;
-
 #include "qtest_messagecomposer.h"
 
 #include <QTest>
@@ -22,7 +20,9 @@ using namespace KMime;
 using namespace MessageComposer;
 
 #include <MessageCore/AttachmentPart>
+
 using MessageCore::AttachmentPart;
+using namespace Qt::Literals::StringLiterals;
 
 QTEST_MAIN(ComposerTest)
 
diff --git a/messagecomposer/autotests/encryptjobtest.cpp b/messagecomposer/autotests/encryptjobtest.cpp
index cdfd658bf..1a949f903 100644
--- a/messagecomposer/autotests/encryptjobtest.cpp
+++ b/messagecomposer/autotests/encryptjobtest.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "encryptjobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "cryptofunctions.h"
 #include "qtest_messagecomposer.h"
@@ -41,6 +40,7 @@ using namespace Qt::Literals::StringLiterals;
 
 QTEST_MAIN(EncryptJobTest)
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MessageComposer;
 
 void EncryptJobTest::initMain()
diff --git a/messagecore/tests/test_dates.cpp b/messagecore/tests/test_dates.cpp
index 63c3f394d..a8bb518b3 100644
--- a/messagecore/tests/test_dates.cpp
+++ b/messagecore/tests/test_dates.cpp
@@ -3,11 +3,11 @@
  *
  */
 #include <MessageCore/DateFormatter>
-using namespace Qt::Literals::StringLiterals;
 
 #include <QDebug>
 
 using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
 
 #ifndef Q_OS_WIN
 static void initLocale()
diff --git a/messagelist/src/utils/configureaggregationsdialog.cpp b/messagelist/src/utils/configureaggregationsdialog.cpp
index 192d93573..a20f8a45d 100644
--- a/messagelist/src/utils/configureaggregationsdialog.cpp
+++ b/messagelist/src/utils/configureaggregationsdialog.cpp
@@ -7,7 +7,6 @@
  *******************************************************************************/
 
 #include "utils/configureaggregationsdialog.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "utils/configureaggregationsdialog_p.h"
 
@@ -29,6 +28,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QIcon>
 #include <QVBoxLayout>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MessageList
 {
 namespace Utils
diff --git a/messagelist/src/utils/configurethemesdialog.cpp b/messagelist/src/utils/configurethemesdialog.cpp
index e6d40c87b..491d10620 100644
--- a/messagelist/src/utils/configurethemesdialog.cpp
+++ b/messagelist/src/utils/configurethemesdialog.cpp
@@ -7,7 +7,6 @@
  *******************************************************************************/
 
 #include "utils/configurethemesdialog.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "utils/configurethemesdialog_p.h"
 
@@ -31,6 +30,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QListWidget>
 #include <QVBoxLayout>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MessageList
 {
 namespace Utils
diff --git a/messagelist/src/utils/themeeditor.cpp b/messagelist/src/utils/themeeditor.cpp
index 9ab14db98..ab38d56f7 100644
--- a/messagelist/src/utils/themeeditor.cpp
+++ b/messagelist/src/utils/themeeditor.cpp
@@ -7,7 +7,6 @@
  *******************************************************************************/
 
 #include "utils/themeeditor.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "core/groupheaderitem.h"
 #include "core/messageitem.h"
@@ -48,6 +47,7 @@ using namespace Qt::Literals::StringLiterals;
 
 using namespace MessageList::Utils;
 using namespace MessageList::Core;
+using namespace Qt::Literals::StringLiterals;
 
 static const char gThemeContentItemTypeDndMimeDataFormat[] = "application/x-kmail-messagelistview-theme-contentitem-type";
 
diff --git a/messageviewer/src/header/headerstyleplugin.cpp b/messageviewer/src/header/headerstyleplugin.cpp
index 77b3004c6..5fe21cd9e 100644
--- a/messageviewer/src/header/headerstyleplugin.cpp
+++ b/messageviewer/src/header/headerstyleplugin.cpp
@@ -5,8 +5,8 @@
 */
 
 #include "headerstyleplugin.h"
-using namespace Qt::Literals::StringLiterals;
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MessageViewer;
 class MessageViewer::HeaderStylePluginPrivate
 {
diff --git a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
index ef93fd80f..03a30c27a 100644
--- a/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
+++ b/messageviewer/src/messagepartthemes/default/messagepartrendererfactory_p.h
@@ -7,13 +7,13 @@
 #pragma once
 
 #include <QByteArray>
-using namespace Qt::Literals::StringLiterals;
 
 #include <QHash>
 #include <QString>
 
 #include <vector>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MessageViewer
 {
 class MessagePartRendererBase;
diff --git a/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp b/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
index 7ce7ec5f5..06e24d057 100644
--- a/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/plugins/attachmentmessagepartrenderer.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "attachmentmessagepartrenderer.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../messagepartrenderermanager.h"
 #include "utils/mimetype.h"
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QUrl>
 
 using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
 
 AttachmentMessagePartRenderer::AttachmentMessagePartRenderer() = default;
 
diff --git a/messageviewer/src/remote-content/autotests/remotecontentconfiguredialogtest.cpp b/messageviewer/src/remote-content/autotests/remotecontentconfiguredialogtest.cpp
index c39746d7c..4b278550b 100644
--- a/messageviewer/src/remote-content/autotests/remotecontentconfiguredialogtest.cpp
+++ b/messageviewer/src/remote-content/autotests/remotecontentconfiguredialogtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "remotecontentconfiguredialogtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "remote-content/remotecontentconfiguredialog.h"
 #include "remote-content/remotecontentconfigurewidget.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 #include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(RemoteContentConfigureDialogTest)
 RemoteContentConfigureDialogTest::RemoteContentConfigureDialogTest(QObject *parent)
     : QObject(parent)
diff --git a/messageviewer/src/remote-content/autotests/remotecontentconfigurewidgettest.cpp b/messageviewer/src/remote-content/autotests/remotecontentconfigurewidgettest.cpp
index 2a0a36994..5fd9377ba 100644
--- a/messageviewer/src/remote-content/autotests/remotecontentconfigurewidgettest.cpp
+++ b/messageviewer/src/remote-content/autotests/remotecontentconfigurewidgettest.cpp
@@ -4,7 +4,6 @@
    SPDX-License-Identifier: LGPL-2.0-or-later
 */
 #include "remotecontentconfigurewidgettest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "remote-content/remotecontentconfigurewidget.h"
 #include <KTreeWidgetSearchLine>
@@ -12,6 +11,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QTest>
 #include <QVBoxLayout>
 
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(RemoteContentConfigureWidgetTest)
 RemoteContentConfigureWidgetTest::RemoteContentConfigureWidgetTest(QObject *parent)
     : QObject(parent)
diff --git a/messageviewer/src/remote-content/autotests/remotecontentdialogtest.cpp b/messageviewer/src/remote-content/autotests/remotecontentdialogtest.cpp
index e8b962a01..27e1a96f5 100644
--- a/messageviewer/src/remote-content/autotests/remotecontentdialogtest.cpp
+++ b/messageviewer/src/remote-content/autotests/remotecontentdialogtest.cpp
@@ -5,13 +5,13 @@
 */
 
 #include "remotecontentdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "remote-content/remotecontentdialog.h"
 #include "remote-content/remotecontentwidget.h"
 #include <QDialogButtonBox>
 #include <QTest>
 #include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(RemoteContentDialogTest)
 
 RemoteContentDialogTest::RemoteContentDialogTest(QObject *parent)
diff --git a/messageviewer/src/scamdetection/autotests/scamattributetest.cpp b/messageviewer/src/scamdetection/autotests/scamattributetest.cpp
index 27d065176..911811ad3 100644
--- a/messageviewer/src/scamdetection/autotests/scamattributetest.cpp
+++ b/messageviewer/src/scamdetection/autotests/scamattributetest.cpp
@@ -5,10 +5,10 @@
 
 */
 #include "scamattributetest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../scamattribute.h"
 #include <QTest>
+using namespace Qt::Literals::StringLiterals;
 ScamAttributeTest::ScamAttributeTest(QObject *parent)
     : QObject(parent)
 {
diff --git a/messageviewer/src/scamdetection/autotests/scamdetectioninfotest.cpp b/messageviewer/src/scamdetection/autotests/scamdetectioninfotest.cpp
index 91edbf257..84ded226f 100644
--- a/messageviewer/src/scamdetection/autotests/scamdetectioninfotest.cpp
+++ b/messageviewer/src/scamdetection/autotests/scamdetectioninfotest.cpp
@@ -6,10 +6,10 @@
 */
 
 #include "scamdetectioninfotest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "scamdetection/scamdetectioninfo.h"
 #include <QTest>
+using namespace Qt::Literals::StringLiterals;
 QTEST_GUILESS_MAIN(ScamDetectionInfoTest)
 ScamDetectionInfoTest::ScamDetectionInfoTest(QObject *parent)
     : QObject{parent}
diff --git a/messageviewer/src/utils/iconnamecache.cpp b/messageviewer/src/utils/iconnamecache.cpp
index 4f151cfdc..33a717539 100644
--- a/messageviewer/src/utils/iconnamecache.cpp
+++ b/messageviewer/src/utils/iconnamecache.cpp
@@ -8,8 +8,8 @@
 #include <KIconLoader>
 #include <QStandardPaths>
 
-using namespace Qt::Literals::StringLiterals;
 using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
 
 Q_GLOBAL_STATIC(IconNameCache, s_iconNameCache)
 
diff --git a/messageviewer/src/viewer/csshelper.cpp b/messageviewer/src/viewer/csshelper.cpp
index ffa1a24c5..a0c6294a3 100644
--- a/messageviewer/src/viewer/csshelper.cpp
+++ b/messageviewer/src/viewer/csshelper.cpp
@@ -8,7 +8,6 @@
 */
 
 #include "csshelper.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "settings/messageviewersettings.h"
 
@@ -23,6 +22,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QFont>
 #include <QPalette>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MessageViewer;
 
 static const struct {
diff --git a/messageviewer/src/viewer/csshelperbase.cpp b/messageviewer/src/viewer/csshelperbase.cpp
index 59b04dbb0..3a282e9ca 100644
--- a/messageviewer/src/viewer/csshelperbase.cpp
+++ b/messageviewer/src/viewer/csshelperbase.cpp
@@ -8,7 +8,6 @@
 */
 
 #include "csshelperbase.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "header/headerstyleplugin.h"
 #include "utils/iconnamecache.h"
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPalette>
 #include <QUrl>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MessageViewer
 {
 namespace
diff --git a/messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp b/messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp
index f22826d36..60543270f 100644
--- a/messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmailwebengineselection.cpp
@@ -4,7 +4,6 @@
    SPDX-License-Identifier: LGPL-2.0-or-later
 */
 #include "testmailwebengineselection.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include <KActionCollection>
 #include <QApplication>
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
 
 #include <MessageViewer/MailWebEngineView>
 
+using namespace Qt::Literals::StringLiterals;
 TestMailWebEngineSelection::TestMailWebEngineSelection(QWidget *parent)
     : QWidget(parent)
     , mNumber(0)
diff --git a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
index a4e5cc68c..6774d4a6e 100644
--- a/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
+++ b/messageviewer/src/viewerplugins/tests/viewerplugin_gui.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "viewerplugin_gui.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "viewerplugins/viewerplugintoolmanager.h"
 #include <KActionCollection>
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
 
 #include "viewerplugins/viewerplugininterface.h"
 
+using namespace Qt::Literals::StringLiterals;
 ViewerPluginTest::ViewerPluginTest(QWidget *parent)
     : QWidget(parent)
 {
diff --git a/messageviewer/src/widgets/autotests/shownextmessagewidgettest.cpp b/messageviewer/src/widgets/autotests/shownextmessagewidgettest.cpp
index e324e2a0b..511e55574 100644
--- a/messageviewer/src/widgets/autotests/shownextmessagewidgettest.cpp
+++ b/messageviewer/src/widgets/autotests/shownextmessagewidgettest.cpp
@@ -5,12 +5,12 @@
 */
 
 #include "shownextmessagewidgettest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "widgets/shownextmessagewidget.h"
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QTest>
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(ShowNextMessageWidgetTest)
 ShowNextMessageWidgetTest::ShowNextMessageWidgetTest(QObject *parent)
     : QObject(parent)
diff --git a/messageviewer/tests/viewertest_gui.cpp b/messageviewer/tests/viewertest_gui.cpp
index c5a6ab57a..22ed1d090 100644
--- a/messageviewer/tests/viewertest_gui.cpp
+++ b/messageviewer/tests/viewertest_gui.cpp
@@ -4,7 +4,6 @@
 */
 
 #include "messageviewer/headerstylepluginmanager.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "messageviewer/viewer.h"
 #include <KActionCollection>
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QWebEngineUrlScheme>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MessageViewer;
 
 int main(int argc, char **argv)
diff --git a/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp b/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
index 66bdcaaf0..cc99847d3 100644
--- a/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
+++ b/mimetreeparser/autotests/bodypartformatterbasefactorytest.cpp
@@ -5,12 +5,12 @@
 */
 
 #include "bodypartformatterfactory.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "interfaces/bodypartformatter.h"
 
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
 class DummyFormatter : public Interface::BodyPartFormatter
diff --git a/mimetreeparser/autotests/cryptohelpertest.cpp b/mimetreeparser/autotests/cryptohelpertest.cpp
index c509797b2..59d444aaa 100644
--- a/mimetreeparser/autotests/cryptohelpertest.cpp
+++ b/mimetreeparser/autotests/cryptohelpertest.cpp
@@ -3,12 +3,12 @@
    SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
 */
 #include "cryptohelpertest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "cryptohelper.h"
 
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
 void CryptoHelperTest::testPMFDEmpty()
diff --git a/mimetreeparser/src/bodypartformatter.cpp b/mimetreeparser/src/bodypartformatter.cpp
index 7d44470f4..f3b19941a 100644
--- a/mimetreeparser/src/bodypartformatter.cpp
+++ b/mimetreeparser/src/bodypartformatter.cpp
@@ -8,7 +8,6 @@
 */
 
 #include "bodyformatter/applicationpgpencrypted.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "bodyformatter/applicationpkcs7mime.h"
 #include "bodyformatter/encrypted.h"
@@ -31,6 +30,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <KMime/Content>
 
 using namespace MimeTreeParser;
+using namespace Qt::Literals::StringLiterals;
 
 namespace
 {
diff --git a/mimetreeparser/src/bodypartformatterfactory.cpp b/mimetreeparser/src/bodypartformatterfactory.cpp
index 371b8b5b5..9627e8b5a 100644
--- a/mimetreeparser/src/bodypartformatterfactory.cpp
+++ b/mimetreeparser/src/bodypartformatterfactory.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "bodypartformatterfactory.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "bodypartformatterfactory_p.h"
 #include "interfaces/bodypartformatter.h"
@@ -22,6 +21,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPluginLoader>
 #include <cassert>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
 BodyPartFormatterFactoryPrivate::BodyPartFormatterFactoryPrivate(BodyPartFormatterFactory *factory)
diff --git a/mimetreeparser/src/memento/verifyopaquebodypartmemento.h b/mimetreeparser/src/memento/verifyopaquebodypartmemento.h
index 60ebc3192..26d630f18 100644
--- a/mimetreeparser/src/memento/verifyopaquebodypartmemento.h
+++ b/mimetreeparser/src/memento/verifyopaquebodypartmemento.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include "cryptobodypartmemento.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include <gpgme++/decryptionresult.h>
 #include <gpgme++/key.h>
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QPointer>
 
 #include "interfaces/bodypart.h"
+#include <QStringList>
 
 namespace QGpgME
 {
@@ -23,8 +23,7 @@ class VerifyOpaqueJob;
 class KeyListJob;
 }
 
-#include <QStringList>
-
+using namespace Qt::Literals::StringLiterals;
 namespace MimeTreeParser
 {
 class VerifyOpaqueBodyPartMemento : public CryptoBodyPartMemento
diff --git a/mimetreeparser/src/messagepart.cpp b/mimetreeparser/src/messagepart.cpp
index d24fc0920..58dc63c07 100644
--- a/mimetreeparser/src/messagepart.cpp
+++ b/mimetreeparser/src/messagepart.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "messagepart.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "cryptohelper.h"
 #include "job/qgpgmejobexecutor.h"
@@ -39,6 +38,7 @@ using namespace Qt::Literals::StringLiterals;
 
 #include <QUrl>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
 //------MessagePart-----------------------
diff --git a/mimetreeparser/src/nodehelper.cpp b/mimetreeparser/src/nodehelper.cpp
index e0a51891b..889bb44c5 100644
--- a/mimetreeparser/src/nodehelper.cpp
+++ b/mimetreeparser/src/nodehelper.cpp
@@ -6,7 +6,6 @@
 */
 
 #include "nodehelper.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "interfaces/bodypart.h"
 #include "messagepart.h"
@@ -32,6 +31,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <sstream>
 #include <string>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MimeTreeParser
 {
 NodeHelper::NodeHelper()
diff --git a/mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.cpp b/mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.cpp
index 2056c5dfd..8a609de00 100644
--- a/mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.cpp
+++ b/mimetreeparser/src/temporaryfile/autotests/attachmenttemporaryfilesdirstest.cpp
@@ -5,15 +5,17 @@
 */
 
 #include "attachmenttemporaryfilesdirstest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../attachmenttemporaryfilesdirs.h"
 #include <QDebug>
 #include <QTemporaryDir>
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
+QTEST_GUILESS_MAIN(AttachmentTemporaryFilesDirsTest)
+
 AttachmentTemporaryFilesDirsTest::AttachmentTemporaryFilesDirsTest(QObject *parent)
     : QObject(parent)
 {
@@ -137,6 +139,4 @@ void AttachmentTemporaryFilesDirsTest::shouldRemoveTemporaryFilesAfterTime()
     QVERIFY(!QDir(path).exists());
 }
 
-QTEST_GUILESS_MAIN(AttachmentTemporaryFilesDirsTest)
-
 #include "moc_attachmenttemporaryfilesdirstest.cpp"
diff --git a/mimetreeparser/src/utils/util.cpp b/mimetreeparser/src/utils/util.cpp
index 66e19784c..bf6920f37 100644
--- a/mimetreeparser/src/utils/util.cpp
+++ b/mimetreeparser/src/utils/util.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "util.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "mimetreeparser_debug.h"
 
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
 
 using namespace MimeTreeParser;
 using namespace MimeTreeParser::Util;
+using namespace Qt::Literals::StringLiterals;
 
 bool MimeTreeParser::Util::isTypeBlacklisted(const KMime::Content *node)
 {
diff --git a/templateparser/autotests/templateextracthtmlelementfrommailtest.cpp b/templateparser/autotests/templateextracthtmlelementfrommailtest.cpp
index 87d22bc58..d22c29ffe 100644
--- a/templateparser/autotests/templateextracthtmlelementfrommailtest.cpp
+++ b/templateparser/autotests/templateextracthtmlelementfrommailtest.cpp
@@ -5,12 +5,14 @@
 */
 
 #include "templateextracthtmlelementfrommailtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templateextracthtmlelementfrommail.h"
 #include <QSignalSpy>
 #include <QTest>
 
+QTEST_MAIN(TemplateExtractHtmlElementFromMailTest)
+
+using namespace Qt::Literals::StringLiterals;
 TemplateExtractHtmlElementFromMailTest::TemplateExtractHtmlElementFromMailTest(QObject *parent)
     : QObject(parent)
 {
@@ -51,6 +53,4 @@ void TemplateExtractHtmlElementFromMailTest::shouldExtractHtml()
     QCOMPARE(w.bodyElement(), body);
 }
 
-QTEST_MAIN(TemplateExtractHtmlElementFromMailTest)
-
 #include "moc_templateextracthtmlelementfrommailtest.cpp"
diff --git a/templateparser/autotests/templateextracttextfrommailtest.cpp b/templateparser/autotests/templateextracttextfrommailtest.cpp
index 2efa79426..68b14a323 100644
--- a/templateparser/autotests/templateextracttextfrommailtest.cpp
+++ b/templateparser/autotests/templateextracttextfrommailtest.cpp
@@ -5,12 +5,14 @@
 */
 
 #include "templateextracttextfrommailtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templateextracttextfrommail.h"
 #include <QSignalSpy>
 #include <QTest>
 
+QTEST_MAIN(TemplateExtractTextFromMailTest)
+
+using namespace Qt::Literals::StringLiterals;
 TemplateExtractTextFromMailTest::TemplateExtractTextFromMailTest(QObject *parent)
     : QObject(parent)
 {
@@ -37,6 +39,4 @@ void TemplateExtractTextFromMailTest::shouldExtractHtml()
     QCOMPARE(w.plainText(), u"HTML Text"_s);
 }
 
-QTEST_MAIN(TemplateExtractTextFromMailTest)
-
 #include "moc_templateextracttextfrommailtest.cpp"
diff --git a/templateparser/autotests/templateparseremailaddressrequesterinterfacewidgettest.cpp b/templateparser/autotests/templateparseremailaddressrequesterinterfacewidgettest.cpp
index f040ecd92..cacc98164 100644
--- a/templateparser/autotests/templateparseremailaddressrequesterinterfacewidgettest.cpp
+++ b/templateparser/autotests/templateparseremailaddressrequesterinterfacewidgettest.cpp
@@ -5,12 +5,14 @@
 */
 
 #include "templateparseremailaddressrequesterinterfacewidgettest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../src/templateparseremailaddressrequesterinterfacewidget.h"
 #include <QHBoxLayout>
 #include <QTest>
 #include <TemplateParser/TemplateParserEmailAddressRequesterBase>
+using namespace Qt::Literals::StringLiterals;
+
+QTEST_MAIN(TemplateParserEmailAddressRequesterInterfaceWidgetTest)
 
 TemplateParserEmailAddressRequesterInterfaceWidgetTest::TemplateParserEmailAddressRequesterInterfaceWidgetTest(QObject *parent)
     : QObject(parent)
@@ -43,6 +45,4 @@ void TemplateParserEmailAddressRequesterInterfaceWidgetTest::shouldAssignValues(
     QVERIFY(mTemplateParserEmailBase->text().isEmpty());
 }
 
-QTEST_MAIN(TemplateParserEmailAddressRequesterInterfaceWidgetTest)
-
 #include "moc_templateparseremailaddressrequesterinterfacewidgettest.cpp"
diff --git a/templateparser/autotests/templateparserjobtest.cpp b/templateparser/autotests/templateparserjobtest.cpp
index 2d2918539..55ce63606 100644
--- a/templateparser/autotests/templateparserjobtest.cpp
+++ b/templateparser/autotests/templateparserjobtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "templateparserjobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templateparserjob.h"
 #include "templateparserjob_p.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace MimeTreeParser;
 
 TemplateParserJobTest::TemplateParserJobTest(QObject *parent)
diff --git a/templateparser/src/customtemplates.cpp b/templateparser/src/customtemplates.cpp
index a6982c32f..083b35cc9 100644
--- a/templateparser/src/customtemplates.cpp
+++ b/templateparser/src/customtemplates.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "customtemplates.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "customtemplates_kfg.h"
 #include "globalsettings_templateparser.h"
@@ -22,6 +21,7 @@ using namespace Qt::Literals::StringLiterals;
 
 #include <QWhatsThis>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 
 CustomTemplates::CustomTemplates(const QList<KActionCollection *> &actionCollection, QWidget *parent)
diff --git a/templateparser/src/customtemplatesmenu.cpp b/templateparser/src/customtemplatesmenu.cpp
index 7c50b486e..b8cab2e71 100644
--- a/templateparser/src/customtemplatesmenu.cpp
+++ b/templateparser/src/customtemplatesmenu.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "customtemplatesmenu.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "customtemplates.h"
 #include "customtemplates_kfg.h"
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QList>
 #include <QMenu>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 class TemplateParser::CustomTemplatesMenuPrivate
 {
diff --git a/templateparser/src/defaulttemplates.cpp b/templateparser/src/defaulttemplates.cpp
index 1f78ab211..b5440fa66 100644
--- a/templateparser/src/defaulttemplates.cpp
+++ b/templateparser/src/defaulttemplates.cpp
@@ -6,10 +6,10 @@
  */
 
 #include "defaulttemplates.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include <KLocalizedString>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 
 QString DefaultTemplates::defaultNewMessage()
diff --git a/templateparser/src/templateparserjob_p.h b/templateparser/src/templateparserjob_p.h
index ec0f7919e..a76152937 100644
--- a/templateparser/src/templateparserjob_p.h
+++ b/templateparser/src/templateparserjob_p.h
@@ -7,12 +7,12 @@
 #pragma once
 
 #include "templateparserextracthtmlinforesult.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templateparserjob.h"
 
 #include <KMime/Message>
 
+using namespace Qt::Literals::StringLiterals;
 namespace MimeTreeParser
 {
 class ObjectTreeParser;
diff --git a/templateparser/src/templatescommandmenu.cpp b/templateparser/src/templatescommandmenu.cpp
index 4ba07d3d2..fa9e0305d 100644
--- a/templateparser/src/templatescommandmenu.cpp
+++ b/templateparser/src/templatescommandmenu.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "templatescommandmenu.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templateparser_debug.h"
 #include <KActionMenu>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QAction>
 #include <QMenu>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 
 struct InsertCommand {
diff --git a/templateparser/src/templatesconfiguration.cpp b/templateparser/src/templatesconfiguration.cpp
index 102e3e367..b5e60634d 100644
--- a/templateparser/src/templatesconfiguration.cpp
+++ b/templateparser/src/templatesconfiguration.cpp
@@ -6,7 +6,6 @@
  */
 
 #include "templatesconfiguration.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "globalsettings_templateparser.h"
 #include "templatesconfiguration_kfg.h"
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
 
 #include <QWhatsThis>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 class TemplateParser::TemplatesConfigurationPrivate
 {
diff --git a/templateparser/src/templatestexteditor.cpp b/templateparser/src/templatestexteditor.cpp
index f09778574..e7be2bb49 100644
--- a/templateparser/src/templatestexteditor.cpp
+++ b/templateparser/src/templatestexteditor.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "templatestexteditor.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templatesutil_p.h"
 
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QCompleter>
 #include <QFontDatabase>
 #include <QKeyEvent>
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 
 TemplatesTextEditor::TemplatesTextEditor(QWidget *parent)
diff --git a/templateparser/src/templatesutil.cpp b/templateparser/src/templatesutil.cpp
index af8aacfef..9620cc33b 100644
--- a/templateparser/src/templatesutil.cpp
+++ b/templateparser/src/templatesutil.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "templatesutil.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "templatesutil_p.h"
 
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QRegularExpression>
 #include <QStringList>
 
+using namespace Qt::Literals::StringLiterals;
 using namespace TemplateParser;
 
 void TemplateParser::Util::deleteTemplate(const QString &id)
diff --git a/webengineviewer/src/autotests/webengineexportpdfpagejobtest.cpp b/webengineviewer/src/autotests/webengineexportpdfpagejobtest.cpp
index 67346b303..321003840 100644
--- a/webengineviewer/src/autotests/webengineexportpdfpagejobtest.cpp
+++ b/webengineviewer/src/autotests/webengineexportpdfpagejobtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "webengineexportpdfpagejobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "webengineexportpdfpagejob.h"
 #include <QDialog>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QTest>
 #include <QTimer>
 #include <QWebEngineView>
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(WebEngineExportPdfPageJobTest)
 WebEngineExportPdfPageJobTest::WebEngineExportPdfPageJobTest(QObject *parent)
     : QObject(parent)
diff --git a/webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.cpp b/webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.cpp
index fb7aaab5e..66ce4d565 100644
--- a/webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/backoffmodemanagertest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "backoffmodemanagertest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../backoffmodemanager.h"
 #include "../checkphishingurlutil.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 QTEST_GUILESS_MAIN(BackOffModeManagerTest)
+using namespace Qt::Literals::StringLiterals;
 BackOffModeManagerTest::BackOffModeManagerTest(QObject *parent)
     : QObject(parent)
 {
diff --git a/webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.cpp b/webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.cpp
index 9ad445991..1139db497 100644
--- a/webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/checkphishingurlcachetest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "checkphishingurlcachetest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../checkphishingurlcache.h"
 #include "../checkphishingurlutil.h"
@@ -14,6 +13,9 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
+QTEST_MAIN(CheckPhishingUrlCacheTest)
+
 CheckPhishingUrlCacheTest::CheckPhishingUrlCacheTest(QObject *parent)
     : QObject(parent)
 {
@@ -114,6 +116,4 @@ void CheckPhishingUrlCacheTest::shouldStoreValues()
     cache->clearCache();
 }
 
-QTEST_MAIN(CheckPhishingUrlCacheTest)
-
 #include "moc_checkphishingurlcachetest.cpp"
diff --git a/webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.cpp b/webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.cpp
index b55739bb7..66f8556c9 100644
--- a/webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/checkphishingurljobtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "checkphishingurljobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../checkphishingurljob.h"
 #include "../checkphishingurlutil.h"
@@ -13,6 +12,9 @@ using namespace Qt::Literals::StringLiterals;
 #include <QSignalSpy>
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
+
+QTEST_MAIN(CheckPhishingUrlJobTest)
 CheckPhishingUrlJobTest::CheckPhishingUrlJobTest(QObject *parent)
     : QObject(parent)
 {
@@ -89,6 +91,4 @@ void CheckPhishingUrlJobTest::shouldParseResult()
     QCOMPARE(spy1.at(0).at(2).value<uint>(), verifyCacheAfterThisTime);
 }
 
-QTEST_MAIN(CheckPhishingUrlJobTest)
-
 #include "moc_checkphishingurljobtest.cpp"
diff --git a/webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.cpp b/webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.cpp
index fe1867919..5ddb598c4 100644
--- a/webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/checkphishingurlutiltest.cpp
@@ -5,11 +5,13 @@
 */
 
 #include "checkphishingurlutiltest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../checkphishingurlutil.h"
 
 #include <QTest>
+using namespace Qt::Literals::StringLiterals;
+
+QTEST_GUILESS_MAIN(CheckPhishingUrlUtilTest)
 
 CheckPhishingUrlUtilTest::CheckPhishingUrlUtilTest(QObject *parent)
     : QObject(parent)
@@ -79,6 +81,4 @@ void CheckPhishingUrlUtilTest::shouldGenerateBackModeDelay()
     QVERIFY(result <= minuteMax);
 }
 
-QTEST_GUILESS_MAIN(CheckPhishingUrlUtilTest)
-
 #include "moc_checkphishingurlutiltest.cpp"
diff --git a/webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.cpp b/webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.cpp
index 847d70be1..c787cdd01 100644
--- a/webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/createdatabasefilejobtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "createdatabasefilejobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../createdatabasefilejob.h"
 #include "../createphishingurldatabasejob.h"
@@ -15,11 +14,15 @@ using namespace Qt::Literals::StringLiterals;
 #include <QDebug>
 #include <QSignalSpy>
 #include <QTest>
+using namespace Qt::Literals::StringLiterals;
+QTEST_MAIN(CreateDatabaseFileJobTest)
+
 Q_DECLARE_METATYPE(QList<WebEngineViewer::Addition>)
 static QByteArray readJsonFile(const QString &jsonFile)
 {
     QFile file(QLatin1StringView(CHECKPHISHINGURL_DATA_DIR) + u'/' + jsonFile);
-    file.open(QIODevice::ReadOnly);
+    const bool result = file.open(QIODevice::ReadOnly);
+    Q_ASSERT(result);
     Q_ASSERT(file.isOpen());
     const QByteArray data = file.readAll();
     Q_ASSERT(!data.isEmpty());
@@ -429,6 +432,4 @@ void CreateDatabaseFileJobTest::shouldUpdateDataBase()
     QVERIFY(successCreateDataBase);
 }
 
-QTEST_MAIN(CreateDatabaseFileJobTest)
-
 #include "moc_createdatabasefilejobtest.cpp"
diff --git a/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp b/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
index 4e4ee8bd0..d2d63266e 100644
--- a/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/createphishingurldatabasejobtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "createphishingurldatabasejobtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../checkphishingurlutil.h"
 #include "../createphishingurldatabasejob.h"
@@ -13,8 +12,10 @@ using namespace Qt::Literals::StringLiterals;
 #include <QSignalSpy>
 #include <QTest>
 
+using namespace Qt::Literals::StringLiterals;
 extern WEBENGINEVIEWER_EXPORT bool webengineview_useCompactJson_CreatePhishingUrlDataBaseJob;
 
+QTEST_MAIN(CreatePhishingUrlDataBaseJobTest)
 static QByteArray readJsonFile(const QString &jsonFile)
 {
     QFile file(QLatin1StringView(CHECKPHISHINGURL_DATA_DIR) + u'/' + jsonFile);
@@ -313,6 +314,4 @@ void CreatePhishingUrlDataBaseJobTest::shouldParseResult()
     QCOMPARE(spy1.at(0).at(0).value<WebEngineViewer::UpdateDataBaseInfo>(), parseInfo);
 }
 
-QTEST_MAIN(CreatePhishingUrlDataBaseJobTest)
-
 #include "moc_createphishingurldatabasejobtest.cpp"
diff --git a/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp b/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
index 11709af97..24edd53ed 100644
--- a/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
+++ b/webengineviewer/src/checkphishingurl/autotests/localdatabasefiletest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "localdatabasefiletest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "../createdatabasefilejob.h"
 #include "../localdatabasefile.h"
@@ -13,6 +12,9 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 
+QTEST_GUILESS_MAIN(LocalDataBaseFileTest)
+
+using namespace Qt::Literals::StringLiterals;
 LocalDataBaseFileTest::LocalDataBaseFileTest(QObject *parent)
     : QObject(parent)
 {
@@ -109,6 +111,4 @@ void LocalDataBaseFileTest::shouldCheckHashBinaryFile()
     }
 }
 
-QTEST_GUILESS_MAIN(LocalDataBaseFileTest)
-
 #include "moc_localdatabasefiletest.cpp"
diff --git a/webengineviewer/src/developertool/autotests/developertooldialogtest.cpp b/webengineviewer/src/developertool/autotests/developertooldialogtest.cpp
index 53214a3e7..050cb42ce 100644
--- a/webengineviewer/src/developertool/autotests/developertooldialogtest.cpp
+++ b/webengineviewer/src/developertool/autotests/developertooldialogtest.cpp
@@ -5,7 +5,6 @@
 */
 
 #include "developertooldialogtest.h"
-using namespace Qt::Literals::StringLiterals;
 
 #include "developertool/developertooldialog.h"
 #include "developertool/developertoolwidget.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
 #include <QStandardPaths>
 #include <QTest>
 #include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
 QTEST_MAIN(DeveloperToolDialogTest)
 DeveloperToolDialogTest::DeveloperToolDialogTest(QObject *parent)
     : QObject(parent)