[pim/messagelib] /: Coding style
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 77b17e3cea19a0650022e2a3eecbfa13b22a812a by Laurent Montel.
Committed on 18/07/2026 at 07:50.
Pushed by mlaurent into branch 'master'.
Coding style
M +1 -1 messagecomposer/autotests/composerviewbasetest.cpp
M +1 -1 messagecomposer/autotests/cryptofunctions.cpp
M +1 -1 messagecomposer/autotests/followupreminderselectdatedialogtest.cpp
M +1 -1 messagecomposer/autotests/keyresolvertest.cpp
M +1 -1 messagecomposer/autotests/maintextjobtest.cpp
M +1 -1 messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
M +1 -1 messagecomposer/autotests/recipientseditortest.cpp
M +1 -1 messagecomposer/autotests/sendlaterdialogtest.cpp
M +1 -1 messagecomposer/autotests/sendlaterinfotest.cpp
M +1 -1 messagecomposer/autotests/setupenv.cpp
M +1 -1 messagecomposer/autotests/signandencrypttest.cpp
M +1 -1 messagecomposer/autotests/signjobtest.cpp
M +1 -1 messagecomposer/autotests/singlepartjobtest.cpp
M +1 -1 messagecomposer/autotests/utiltest.cpp
M +1 -1 messagecomposer/src/attachment/editorwatcher.cpp
M +1 -1 messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp
M +1 -1 messagecomposer/src/composer/composerviewinterface.cpp
M +1 -1 messagecomposer/src/followupreminder/followupremindercreatejob.cpp
M +1 -1 messagecomposer/src/helper/messagehelper.cpp
M +1 -1 messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
M +1 -1 messagecomposer/src/imagescaling/imagescaling.cpp
M +1 -1 messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
M +1 -1 messagecomposer/src/job/itipjob.cpp
M +1 -1 messagecomposer/src/job/protectedheadersjob.cpp
M +1 -1 messagecomposer/src/job/signencryptjob.cpp
M +1 -1 messagecomposer/src/job/signjob.cpp
M +1 -1 messagecomposer/src/job/singlepartjob.cpp
M +1 -1 messagecomposer/src/job/skeletonmessagejob.cpp
M +1 -1 messagecomposer/src/mdn/tests/mndadvicedialoggui.cpp
M +1 -1 messagecomposer/src/part/itippart.cpp
M +1 -1 messagecomposer/src/plugineditor/plugineditormanager.cpp
M +1 -1 messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
M +1 -1 messagecomposer/src/plugineditorconverttext/plugineditorconverttextmanager.cpp
M +1 -1 messagecomposer/src/plugineditorgrammar/plugineditorgrammarmanager.cpp
M +1 -1 messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp
M +1 -1 messagecomposer/src/recipient/recipientseditorsidewidget.cpp
M +1 -1 messagecomposer/src/recipient/recipientspicker.cpp
M +1 -1 messagecomposer/src/snippet/autotests/convertsnippetvariablesutiltest.cpp
M +1 -1 messagecomposer/src/snippet/autotests/convertvariablesjobtest.cpp
M +1 -1 messagecomposer/src/snippet/convertsnippetvariablesutil.cpp
M +1 -1 messagecomposer/src/statusbarwidget/autotests/statusbarlabeltoggledstatetest.cpp
M +1 -1 messagecore/autotests/attachmentcompressjobtest.cpp
M +1 -1 messagecore/autotests/attachmentfrommimecontentjobtest.cpp
M +1 -1 messagecore/autotests/attachmentfromurljobtest.cpp
M +1 -1 messagecore/autotests/attachmentparttest.cpp
M +1 -1 messagecore/autotests/attachmentpropertiesdialogtest.cpp
M +1 -1 messagecore/autotests/attachmentupdatejobtest.cpp
M +1 -1 messagecore/autotests/autocryptrecipienttest.cpp
M +0 -1 messagecore/autotests/autocryptrecipienttest.h
M +1 -1 messagecore/autotests/autocryptstoragetest.cpp
M +0 -1 messagecore/autotests/autocryptstoragetest.h
M +1 -1 messagecore/autotests/autocryptutilstest.cpp
M +1 -1 messagecore/autotests/dateformattertest.cpp
M +1 -1 messagecore/autotests/mailinglisttest.cpp
M +1 -1 messagecore/autotests/stringutiltest.cpp
M +0 -1 messagecore/autotests/stringutiltest.h
M +1 -1 messagecore/src/autocrypt/autocryptrecipient.cpp
M +1 -1 messagecore/src/autocrypt/autocryptstorage.cpp
M +1 -1 messagecore/src/misc/mailinglist.cpp
M +1 -1 messagecore/src/utils/colorutil.cpp
M +1 -1 messagelist/src/core/threadingcache.cpp
M +1 -1 messagelist/src/core/widgets/autotests/configurefilterswidgettest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/filternamewidgettest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/quicksearchwarningtest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchcollectionindexingwarningtest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchlinecommandbuttonswidgettest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchlinecommandtest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchlinecommandwidgettest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchlinestatustest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchmessagebybuttonstest.cpp
M +1 -1 messagelist/src/core/widgets/autotests/searchstatusbuttonstest.cpp
M +1 -1 messagelist/src/utils/aggregationcombobox.cpp
M +1 -1 messagelist/src/utils/themecombobox.cpp
M +1 -1 messageviewer/autotests/urlhandlermanagertest.cpp
M +1 -1 messageviewer/autotests/util.cpp
M +1 -1 messageviewer/autotests/viewergrantleethemesupporttest.cpp
M +1 -1 messageviewer/autotests/viewertest.cpp
M +1 -1 messageviewer/src/antispam/antispamconfig.cpp
M +1 -1 messageviewer/src/antispam/spamheaderanalyzer.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimauthenticationstatusinfotest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimcheckauthenticationstatusjobtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimchecksignaturejobtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimdownloadkeyjobtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimheaderparsertest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkiminfotest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimmanagerkeydialogtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimmanagerkeywidgettest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimmanagerrulestest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimmanagerulesdialogtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimmanageruleswidgettest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimruledialogtest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimrulewidgettest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimutiltest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dkimwidgetinfotest.cpp
M +1 -1 messageviewer/src/dkim-verify/autotests/dmarcinfotest.cpp
M +1 -1 messageviewer/src/dkim-verify/tests/checkrsapublickey.cpp
M +1 -1 messageviewer/src/dkim-verify/tests/checksignature.cpp
M +1 -1 messageviewer/src/dkim-verify/tests/dmarclookupkey.cpp
M +1 -1 messageviewer/src/dkim-verify/tests/lookupkey.cpp
M +1 -1 messageviewer/src/dkim-verify/tests/main.cpp
M +1 -1 messageviewer/src/header/autotests/grantleeheaderformattertest.cpp
M +1 -1 messageviewer/src/header/autotests/grantleeheaderstyletest.cpp
M +1 -1 messageviewer/src/htmlwriter/webengineembedpart.cpp
M +1 -1 messageviewer/src/mdn/autotests/mdnwarningwidgettest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/rendertest-headeronly.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/rendertest-hidden.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/rendertest-iconic.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/rendertest-inlined.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/rendertest-smart.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/autotests/util.cpp
M +1 -1 messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
M +1 -1 messageviewer/src/messagepartthemes/grantlee/ktexttemplateextension.cpp
M +1 -1 messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
M +1 -1 messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
M +1 -1 messageviewer/src/openurlwith/autotests/openurlwithmanagertest.cpp
M +1 -1 messageviewer/src/remote-content/autotests/remotecontentinfotest.cpp
M +1 -1 messageviewer/src/remote-content/autotests/remotecontentmanagertest.cpp
M +1 -1 messageviewer/src/utils/autotests/messageviewerutilstest.cpp
M +1 -1 messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
M +1 -1 messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
M +1 -1 templateparser/autotests/templateparseremailaddressrequesterlineedittest.cpp
M +1 -1 templateparser/autotests/templateparserextracthtmlinfotest.cpp
https://invent.kde.org/pim/messagelib/-/commit/77b17e3cea19a0650022e2a3eecbfa13b22a812a
diff --git a/messagecomposer/autotests/composerviewbasetest.cpp b/messagecomposer/autotests/composerviewbasetest.cpp
index 62934b6dd..4f9413d9e 100644
--- a/messagecomposer/autotests/composerviewbasetest.cpp
+++ b/messagecomposer/autotests/composerviewbasetest.cpp
@@ -5,7 +5,6 @@
*/
#include "composerviewbasetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "cryptofunctions.h"
#include "qtest_messagecomposer.h"
@@ -29,6 +28,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
Q_DECLARE_METATYPE(Kleo::CryptoMessageFormat)
diff --git a/messagecomposer/autotests/cryptofunctions.cpp b/messagecomposer/autotests/cryptofunctions.cpp
index 0b523de57..ea42ee357 100644
--- a/messagecomposer/autotests/cryptofunctions.cpp
+++ b/messagecomposer/autotests/cryptofunctions.cpp
@@ -6,7 +6,6 @@
*/
#include "cryptofunctions.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
@@ -23,6 +22,7 @@ using namespace Qt::Literals::StringLiterals;
#include <gpgme++/keylistresult.h>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
void ComposerTestUtil::verify(bool sign,
bool encrypt,
diff --git a/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp b/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp
index 178143d57..b68337e86 100644
--- a/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp
+++ b/messagecomposer/autotests/followupreminderselectdatedialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "followupreminderselectdatedialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include <Akonadi/CollectionComboBox>
#include <KDateComboBox>
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QPushButton>
#include <QStandardItemModel>
+using namespace Qt::Literals::StringLiterals;
FollowupReminderSelectDateDialogTest::FollowupReminderSelectDateDialogTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/autotests/keyresolvertest.cpp b/messagecomposer/autotests/keyresolvertest.cpp
index a955643fb..b46eadfea 100644
--- a/messagecomposer/autotests/keyresolvertest.cpp
+++ b/messagecomposer/autotests/keyresolvertest.cpp
@@ -5,7 +5,6 @@
*/
#include "keyresolvertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../src/composer/keyresolver.h"
@@ -21,6 +20,7 @@ using namespace Qt::Literals::StringLiterals;
#include <gpgme.h>
QTEST_MAIN(KeyResolverTest)
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
using namespace Kleo;
diff --git a/messagecomposer/autotests/maintextjobtest.cpp b/messagecomposer/autotests/maintextjobtest.cpp
index ba50af979..838c80090 100644
--- a/messagecomposer/autotests/maintextjobtest.cpp
+++ b/messagecomposer/autotests/maintextjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "maintextjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include <QDebug>
#include <QStandardPaths>
@@ -24,6 +23,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KActionCollection>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
using namespace KMime;
diff --git a/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp b/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
index 6fa6218a4..065ec2e9e 100644
--- a/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
+++ b/messagecomposer/autotests/plugineditorcheckbeforesendparamstest.cpp
@@ -5,11 +5,11 @@
*/
#include "plugineditorcheckbeforesendparamstest.h"
-using namespace Qt::Literals::StringLiterals;
#include <MessageComposer/PluginEditorCheckBeforeSendParams>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
PluginEditorCheckBeforeSendParamsTest::PluginEditorCheckBeforeSendParamsTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/autotests/recipientseditortest.cpp b/messagecomposer/autotests/recipientseditortest.cpp
index 96e5cc82b..7342e41d5 100644
--- a/messagecomposer/autotests/recipientseditortest.cpp
+++ b/messagecomposer/autotests/recipientseditortest.cpp
@@ -5,7 +5,6 @@
*/
#include <QObject>
-using namespace Qt::Literals::StringLiterals;
#include <QTest>
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KMime/Types>
#include <QClipboard>
+using namespace Qt::Literals::StringLiterals;
class RecipientsLineTestFactory : public MessageComposer::RecipientLineFactory
{
Q_OBJECT
diff --git a/messagecomposer/autotests/sendlaterdialogtest.cpp b/messagecomposer/autotests/sendlaterdialogtest.cpp
index c86aced93..d447de3dd 100644
--- a/messagecomposer/autotests/sendlaterdialogtest.cpp
+++ b/messagecomposer/autotests/sendlaterdialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "sendlaterdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "sendlater/sendlaterdialog.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
SendLaterDialogTest::SendLaterDialogTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/autotests/sendlaterinfotest.cpp b/messagecomposer/autotests/sendlaterinfotest.cpp
index 26830b93c..b0df82a5e 100644
--- a/messagecomposer/autotests/sendlaterinfotest.cpp
+++ b/messagecomposer/autotests/sendlaterinfotest.cpp
@@ -5,7 +5,6 @@
*/
#include "sendlaterinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "sendlater/sendlaterinfo.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
SendLaterInfoTest::SendLaterInfoTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/autotests/setupenv.cpp b/messagecomposer/autotests/setupenv.cpp
index 081ff26f2..7c50650b3 100644
--- a/messagecomposer/autotests/setupenv.cpp
+++ b/messagecomposer/autotests/setupenv.cpp
@@ -6,7 +6,6 @@
*/
#include "setupenv.h"
-using namespace Qt::Literals::StringLiterals;
#include <QGpgME/ExportJob>
#include <QGpgME/ImportJob>
@@ -21,6 +20,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
void Test::setupEnv()
diff --git a/messagecomposer/autotests/signandencrypttest.cpp b/messagecomposer/autotests/signandencrypttest.cpp
index 67fb048ee..74025bf85 100644
--- a/messagecomposer/autotests/signandencrypttest.cpp
+++ b/messagecomposer/autotests/signandencrypttest.cpp
@@ -6,7 +6,6 @@
*/
#include "signandencrypttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "cryptofunctions.h"
#include "qtest_messagecomposer.h"
@@ -28,6 +27,7 @@ using namespace Qt::Literals::StringLiterals;
#include <gpgme.h>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(SignAndEncryptTest)
using namespace MessageComposer;
diff --git a/messagecomposer/autotests/signjobtest.cpp b/messagecomposer/autotests/signjobtest.cpp
index d00e490f0..d9fd062af 100644
--- a/messagecomposer/autotests/signjobtest.cpp
+++ b/messagecomposer/autotests/signjobtest.cpp
@@ -6,7 +6,6 @@
*/
#include "signjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "cryptofunctions.h"
#include "qtest_messagecomposer.h"
@@ -29,6 +28,7 @@ using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(SignJobTest)
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
void SignJobTest::initMain()
{
diff --git a/messagecomposer/autotests/singlepartjobtest.cpp b/messagecomposer/autotests/singlepartjobtest.cpp
index ea281e1dc..c6808b74a 100644
--- a/messagecomposer/autotests/singlepartjobtest.cpp
+++ b/messagecomposer/autotests/singlepartjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "singlepartjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include <QDebug>
#include <QTest>
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
using namespace KMime;
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(SinglepartJobTest)
diff --git a/messagecomposer/autotests/utiltest.cpp b/messagecomposer/autotests/utiltest.cpp
index 024a59fb4..a648c997c 100644
--- a/messagecomposer/autotests/utiltest.cpp
+++ b/messagecomposer/autotests/utiltest.cpp
@@ -6,7 +6,6 @@
*/
#include "utiltest.h"
-using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageComposer/Util>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(UtilTest)
diff --git a/messagecomposer/src/attachment/editorwatcher.cpp b/messagecomposer/src/attachment/editorwatcher.cpp
index bb079f0d1..728d84bf8 100644
--- a/messagecomposer/src/attachment/editorwatcher.cpp
+++ b/messagecomposer/src/attachment/editorwatcher.cpp
@@ -5,7 +5,6 @@
*/
#include "editorwatcher.h"
-using namespace Qt::Literals::StringLiterals;
#include <config-messagecomposer.h>
@@ -34,6 +33,7 @@ using namespace Qt::Literals::StringLiterals;
#include <chrono>
using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
diff --git a/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp b/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp
index 19e729279..c5446fe0e 100644
--- a/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp
+++ b/messagecomposer/src/composer-ng/autotests/richtextcomposersignaturestest.cpp
@@ -5,7 +5,6 @@
*/
#include "richtextcomposersignaturestest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../richtextcomposerng.h"
#include "../richtextcomposersignatures.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
QTEST_MAIN(RichTextComposerSignaturesTest)
+using namespace Qt::Literals::StringLiterals;
RichTextComposerSignaturesTest::RichTextComposerSignaturesTest(QObject *parent)
: QObject(parent)
diff --git a/messagecomposer/src/composer/composerviewinterface.cpp b/messagecomposer/src/composer/composerviewinterface.cpp
index 90a0c5517..e0c2bed3d 100644
--- a/messagecomposer/src/composer/composerviewinterface.cpp
+++ b/messagecomposer/src/composer/composerviewinterface.cpp
@@ -5,12 +5,12 @@
*/
#include "composerviewinterface.h"
-using namespace Qt::Literals::StringLiterals;
#include "composerviewbase.h"
#include "snippet/convertsnippetvariablesutil.h"
#include <KIO/Global>
#include <MessageComposer/AttachmentModel>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
ComposerViewInterface::ComposerViewInterface(ComposerViewBase *composerView)
: mComposerView(composerView)
diff --git a/messagecomposer/src/followupreminder/followupremindercreatejob.cpp b/messagecomposer/src/followupreminder/followupremindercreatejob.cpp
index c0555059c..efbc4e5b7 100644
--- a/messagecomposer/src/followupreminder/followupremindercreatejob.cpp
+++ b/messagecomposer/src/followupreminder/followupremindercreatejob.cpp
@@ -5,7 +5,6 @@
*/
#include "followupremindercreatejob.h"
-using namespace Qt::Literals::StringLiterals;
#include "followupreminderinterface.h"
#include "messagecomposer_debug.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QDBusPendingCallWatcher>
#include <QDBusPendingReply>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::FollowupReminderCreateJobPrivate
{
diff --git a/messagecomposer/src/helper/messagehelper.cpp b/messagecomposer/src/helper/messagehelper.cpp
index eb74f0d96..6cb931bf5 100644
--- a/messagecomposer/src/helper/messagehelper.cpp
+++ b/messagecomposer/src/helper/messagehelper.cpp
@@ -6,7 +6,6 @@
*/
#include "messagehelper.h"
-using namespace Qt::Literals::StringLiterals;
#include "MessageCore/MailingList"
#include "MessageCore/StringUtil"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KIdentityManagementCore/IdentityManager>
#include <KMime/MDN>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageCore;
namespace MessageHelper
diff --git a/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp b/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
index c88437f51..cf3c94e9b 100644
--- a/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
+++ b/messagecomposer/src/imagescaling/autotests/imagescalingtest.cpp
@@ -5,13 +5,13 @@
*/
#include "imagescalingtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../imagescaling.h"
#include "settings/messagecomposersettings.h"
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
ImageScalingTest::ImageScalingTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/src/imagescaling/imagescaling.cpp b/messagecomposer/src/imagescaling/imagescaling.cpp
index 3e75a87e7..600be005e 100644
--- a/messagecomposer/src/imagescaling/imagescaling.cpp
+++ b/messagecomposer/src/imagescaling/imagescaling.cpp
@@ -5,12 +5,12 @@
*/
#include "imagescaling.h"
-using namespace Qt::Literals::StringLiterals;
#include "settings/messagecomposersettings.h"
#include <QBuffer>
#include <QImage>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
class MessageComposer::ImageScalingPrivate
{
diff --git a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
index fbe8fd2e4..6152f1e95 100644
--- a/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
+++ b/messagecomposer/src/job/attachmentvcardfromaddressbookjob.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentvcardfromaddressbookjob.h"
-using namespace Qt::Literals::StringLiterals;
#include <Akonadi/ContactGroupExpandJob>
#include <KContacts/Addressee>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KContacts/VCardConverter>
#include <KLocalizedString>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::AttachmentVcardFromAddressBookJobPrivate
diff --git a/messagecomposer/src/job/itipjob.cpp b/messagecomposer/src/job/itipjob.cpp
index 1a9e13ba8..928951c12 100644
--- a/messagecomposer/src/job/itipjob.cpp
+++ b/messagecomposer/src/job/itipjob.cpp
@@ -5,7 +5,6 @@
*/
#include "job/itipjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "contentjobbase_p.h"
#include "job/multipartjob.h"
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KMime/Content>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::ItipJobPrivate : public ContentJobBasePrivate
diff --git a/messagecomposer/src/job/protectedheadersjob.cpp b/messagecomposer/src/job/protectedheadersjob.cpp
index 14d310911..62e937332 100644
--- a/messagecomposer/src/job/protectedheadersjob.cpp
+++ b/messagecomposer/src/job/protectedheadersjob.cpp
@@ -5,7 +5,6 @@
*/
#include "job/protectedheadersjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "contentjobbase_p.h"
#include "job/singlepartjob.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KMime/Content>
#include <KMime/Message>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::ProtectedHeadersJobPrivate : public ContentJobBasePrivate
diff --git a/messagecomposer/src/job/signencryptjob.cpp b/messagecomposer/src/job/signencryptjob.cpp
index 8f831c18a..984eda62f 100644
--- a/messagecomposer/src/job/signencryptjob.cpp
+++ b/messagecomposer/src/job/signencryptjob.cpp
@@ -6,7 +6,6 @@
*/
#include "job/signencryptjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "contentjobbase_p.h"
#include "job/protectedheadersjob.h"
@@ -25,6 +24,7 @@ using namespace Qt::Literals::StringLiterals;
#include <gpgme++/global.h>
#include <gpgme++/signingresult.h>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::SignEncryptJobPrivate : public ContentJobBasePrivate
diff --git a/messagecomposer/src/job/signjob.cpp b/messagecomposer/src/job/signjob.cpp
index c62371a28..d661815a9 100644
--- a/messagecomposer/src/job/signjob.cpp
+++ b/messagecomposer/src/job/signjob.cpp
@@ -6,7 +6,6 @@
*/
#include "job/signjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "contentjobbase_p.h"
#include "job/protectedheadersjob.h"
@@ -27,6 +26,7 @@ using namespace Qt::Literals::StringLiterals;
#include <gpgme++/signingresult.h>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
class MessageComposer::SignJobPrivate : public ContentJobBasePrivate
{
diff --git a/messagecomposer/src/job/singlepartjob.cpp b/messagecomposer/src/job/singlepartjob.cpp
index 74dda640b..3b60e2e37 100644
--- a/messagecomposer/src/job/singlepartjob.cpp
+++ b/messagecomposer/src/job/singlepartjob.cpp
@@ -5,7 +5,6 @@
*/
#include "job/singlepartjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "contentjobbase_p.h"
#include "part/globalpart.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KMime/Content>
#include <KMime/Headers>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class MessageComposer::SinglepartJobPrivate : public ContentJobBasePrivate
diff --git a/messagecomposer/src/job/skeletonmessagejob.cpp b/messagecomposer/src/job/skeletonmessagejob.cpp
index 521ced981..f7bac54d7 100644
--- a/messagecomposer/src/job/skeletonmessagejob.cpp
+++ b/messagecomposer/src/job/skeletonmessagejob.cpp
@@ -5,7 +5,6 @@
*/
#include "job/skeletonmessagejob.h"
-using namespace Qt::Literals::StringLiterals;
#include "settings/messagecomposersettings.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include <KMime/Message>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
diff --git a/messagecomposer/src/mdn/tests/mndadvicedialoggui.cpp b/messagecomposer/src/mdn/tests/mndadvicedialoggui.cpp
index 6b5db3f72..c419c71e8 100644
--- a/messagecomposer/src/mdn/tests/mndadvicedialoggui.cpp
+++ b/messagecomposer/src/mdn/tests/mndadvicedialoggui.cpp
@@ -5,10 +5,10 @@
*/
#include "mdn/mdnadvicedialog.h"
-using namespace Qt::Literals::StringLiterals;
#include <QApplication>
#include <QDebug>
+using namespace Qt::Literals::StringLiterals;
int main(int argc, char **argv)
{
QApplication app(argc, argv);
diff --git a/messagecomposer/src/part/itippart.cpp b/messagecomposer/src/part/itippart.cpp
index 958cb56c7..fb38bd8c7 100644
--- a/messagecomposer/src/part/itippart.cpp
+++ b/messagecomposer/src/part/itippart.cpp
@@ -5,8 +5,8 @@
*/
#include "itippart.h"
-using namespace Qt::Literals::StringLiterals;
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class ItipPart::ItipPartPrivate
diff --git a/messagecomposer/src/plugineditor/plugineditormanager.cpp b/messagecomposer/src/plugineditor/plugineditormanager.cpp
index ef5451d7a..c8e6fc5cc 100644
--- a/messagecomposer/src/plugineditor/plugineditormanager.cpp
+++ b/messagecomposer/src/plugineditor/plugineditormanager.cpp
@@ -5,7 +5,6 @@
*/
#include "plugineditormanager.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include "plugineditor.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <PimCommon/PluginUtil>
#include <QFileInfo>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
class PluginEditorInfo
{
diff --git a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
index 6ee5dc0a7..f0c0e86e1 100644
--- a/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
+++ b/messagecomposer/src/plugineditorcheckbeforesend/plugineditorcheckbeforesendmanager.cpp
@@ -5,7 +5,6 @@
*/
#include "plugineditorcheckbeforesendmanager.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include "plugineditorcheckbeforesend.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <PimCommon/PluginUtil>
#include <QFileInfo>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class PluginEditorCheckBeforeSendInfo
diff --git a/messagecomposer/src/plugineditorconverttext/plugineditorconverttextmanager.cpp b/messagecomposer/src/plugineditorconverttext/plugineditorconverttextmanager.cpp
index 0e43f40ec..35ff0317b 100644
--- a/messagecomposer/src/plugineditorconverttext/plugineditorconverttextmanager.cpp
+++ b/messagecomposer/src/plugineditorconverttext/plugineditorconverttextmanager.cpp
@@ -5,7 +5,6 @@
*/
#include "plugineditorconverttextmanager.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include "plugineditorconverttext.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QFileInfo>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
class PluginEditorConvertTextInfo
{
diff --git a/messagecomposer/src/plugineditorgrammar/plugineditorgrammarmanager.cpp b/messagecomposer/src/plugineditorgrammar/plugineditorgrammarmanager.cpp
index 5675ec9a6..efb8cb68a 100644
--- a/messagecomposer/src/plugineditorgrammar/plugineditorgrammarmanager.cpp
+++ b/messagecomposer/src/plugineditorgrammar/plugineditorgrammarmanager.cpp
@@ -5,7 +5,6 @@
*/
#include "plugineditorgrammarmanager.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include "plugineditorgrammarcustomtoolsviewinterface.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QFileInfo>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
class PluginEditorGrammarInfo
{
diff --git a/messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp b/messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp
index 16136a3ab..43c2e25de 100644
--- a/messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp
+++ b/messagecomposer/src/plugineditorinit/plugineditorinitmanager.cpp
@@ -5,7 +5,6 @@
*/
#include "plugineditorinitmanager.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecomposer_debug.h"
#include "plugineditorinit.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <PimCommon/PluginUtil>
#include <QFileInfo>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
class PluginEditorInitInfo
diff --git a/messagecomposer/src/recipient/recipientseditorsidewidget.cpp b/messagecomposer/src/recipient/recipientseditorsidewidget.cpp
index e148f02e2..9cc792084 100644
--- a/messagecomposer/src/recipient/recipientseditorsidewidget.cpp
+++ b/messagecomposer/src/recipient/recipientseditorsidewidget.cpp
@@ -10,7 +10,6 @@
*/
#include "recipientseditorsidewidget.h"
-using namespace Qt::Literals::StringLiterals;
#include "kwindowpositioner.h"
#include "recipientspicker.h"
@@ -20,6 +19,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QPushButton>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageComposer;
RecipientsEditorSideWidget::RecipientsEditorSideWidget(RecipientsEditor *view, QWidget *parent)
diff --git a/messagecomposer/src/recipient/recipientspicker.cpp b/messagecomposer/src/recipient/recipientspicker.cpp
index ed21e60e8..fc6707813 100644
--- a/messagecomposer/src/recipient/recipientspicker.cpp
+++ b/messagecomposer/src/recipient/recipientspicker.cpp
@@ -7,7 +7,6 @@
*/
#include "recipientspicker.h"
-using namespace Qt::Literals::StringLiterals;
#include "settings/messagecomposersettings.h"
@@ -33,6 +32,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QVBoxLayout>
using namespace MessageComposer;
+using namespace Qt::Literals::StringLiterals;
namespace
{
static const char myRecipientsPickerConfigGroupName[] = "RecipientsPicker";
diff --git a/messagecomposer/src/snippet/autotests/convertsnippetvariablesutiltest.cpp b/messagecomposer/src/snippet/autotests/convertsnippetvariablesutiltest.cpp
index 72c1f72a3..2e1f1999e 100644
--- a/messagecomposer/src/snippet/autotests/convertsnippetvariablesutiltest.cpp
+++ b/messagecomposer/src/snippet/autotests/convertsnippetvariablesutiltest.cpp
@@ -5,11 +5,11 @@
*/
#include "convertsnippetvariablesutiltest.h"
-using namespace Qt::Literals::StringLiterals;
#include "snippet/convertsnippetvariablesutil.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(ConvertSnippetVariablesUtilTest)
ConvertSnippetVariablesUtilTest::ConvertSnippetVariablesUtilTest(QObject *parent)
diff --git a/messagecomposer/src/snippet/autotests/convertvariablesjobtest.cpp b/messagecomposer/src/snippet/autotests/convertvariablesjobtest.cpp
index 5541b75ee..78cdd6dec 100644
--- a/messagecomposer/src/snippet/autotests/convertvariablesjobtest.cpp
+++ b/messagecomposer/src/snippet/autotests/convertvariablesjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "convertvariablesjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "composer/composerviewbase.h"
#include "composer/composerviewinterface.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
QTEST_GUILESS_MAIN(ConvertVariablesJobTest)
+using namespace Qt::Literals::StringLiterals;
ConvertVariablesJobTest::ConvertVariablesJobTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecomposer/src/snippet/convertsnippetvariablesutil.cpp b/messagecomposer/src/snippet/convertsnippetvariablesutil.cpp
index 2c0bdc80b..43985903e 100644
--- a/messagecomposer/src/snippet/convertsnippetvariablesutil.cpp
+++ b/messagecomposer/src/snippet/convertsnippetvariablesutil.cpp
@@ -5,11 +5,11 @@
*/
#include "convertsnippetvariablesutil.h"
-using namespace Qt::Literals::StringLiterals;
#include <QDateTime>
#include <QLocale>
+using namespace Qt::Literals::StringLiterals;
QString MessageComposer::ConvertSnippetVariablesUtil::snippetVariableFromEnum(MessageComposer::ConvertSnippetVariablesUtil::VariableType type)
{
switch (type) {
diff --git a/messagecomposer/src/statusbarwidget/autotests/statusbarlabeltoggledstatetest.cpp b/messagecomposer/src/statusbarwidget/autotests/statusbarlabeltoggledstatetest.cpp
index 1f5399c3d..f63b82c19 100644
--- a/messagecomposer/src/statusbarwidget/autotests/statusbarlabeltoggledstatetest.cpp
+++ b/messagecomposer/src/statusbarwidget/autotests/statusbarlabeltoggledstatetest.cpp
@@ -5,7 +5,6 @@
*/
#include "statusbarlabeltoggledstatetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "MessageComposer/StatusBarLabelToggledState"
#include <QSignalSpy>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(StatusBarLabelToggledStateTest)
+using namespace Qt::Literals::StringLiterals;
StatusBarLabelToggledStateTest::StatusBarLabelToggledStateTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagecore/autotests/attachmentcompressjobtest.cpp b/messagecore/autotests/attachmentcompressjobtest.cpp
index d26682350..07d811d5f 100644
--- a/messagecore/autotests/attachmentcompressjobtest.cpp
+++ b/messagecore/autotests/attachmentcompressjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentcompressjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "qtest_messagecore.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageCore/AttachmentCompressJob>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AttachmentCompressJobTest)
diff --git a/messagecore/autotests/attachmentfrommimecontentjobtest.cpp b/messagecore/autotests/attachmentfrommimecontentjobtest.cpp
index e30bb59c3..1d1e9b0b1 100644
--- a/messagecore/autotests/attachmentfrommimecontentjobtest.cpp
+++ b/messagecore/autotests/attachmentfrommimecontentjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentfrommimecontentjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "qtest_messagecore.h"
@@ -18,6 +17,7 @@ using namespace KMime;
#include "attachment/attachmentfrommimecontentjob.h"
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AttachmentFromMimeContentJobTest)
diff --git a/messagecore/autotests/attachmentfromurljobtest.cpp b/messagecore/autotests/attachmentfromurljobtest.cpp
index 6b1785487..618c01245 100644
--- a/messagecore/autotests/attachmentfromurljobtest.cpp
+++ b/messagecore/autotests/attachmentfromurljobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentfromurljobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "qtest_messagecore.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include "attachment/attachmentfromurljob.h"
#include <MessageCore/StringUtil>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AttachmentFromUrlJobTest)
diff --git a/messagecore/autotests/attachmentparttest.cpp b/messagecore/autotests/attachmentparttest.cpp
index 40f7f8743..0beec8277 100644
--- a/messagecore/autotests/attachmentparttest.cpp
+++ b/messagecore/autotests/attachmentparttest.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentparttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "qtest_messagecore.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageCore/AttachmentPart>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AttachmentPartTest)
diff --git a/messagecore/autotests/attachmentpropertiesdialogtest.cpp b/messagecore/autotests/attachmentpropertiesdialogtest.cpp
index bc3120d5e..24cfb2972 100644
--- a/messagecore/autotests/attachmentpropertiesdialogtest.cpp
+++ b/messagecore/autotests/attachmentpropertiesdialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "attachmentpropertiesdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "qtest_messagecore.h"
@@ -23,6 +22,7 @@ using namespace KMime;
#include <MessageCore/AttachmentPropertiesDialog>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AttachmentPropertiesDialogTest)
AttachmentPropertiesDialogTest::AttachmentPropertiesDialogTest(QObject *parent)
diff --git a/messagecore/autotests/attachmentupdatejobtest.cpp b/messagecore/autotests/attachmentupdatejobtest.cpp
index f16b38d49..b941a5aed 100644
--- a/messagecore/autotests/attachmentupdatejobtest.cpp
+++ b/messagecore/autotests/attachmentupdatejobtest.cpp
@@ -4,13 +4,13 @@
SPDX-License-Identifier: GPL-2.0-only
*/
#include "attachmentupdatejobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "attachment/attachmentupdatejob.h"
#include "qtest_messagecore.h"
#include <MessageCore/AttachmentPart>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
#define PATH_ATTACHMENTS QLatin1StringView(KDESRCDIR "/attachments/")
AttachmentUpdateJobTest::AttachmentUpdateJobTest(QObject *parent)
diff --git a/messagecore/autotests/autocryptrecipienttest.cpp b/messagecore/autotests/autocryptrecipienttest.cpp
index 083d49773..46c36ef4c 100644
--- a/messagecore/autotests/autocryptrecipienttest.cpp
+++ b/messagecore/autotests/autocryptrecipienttest.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "autocryptrecipienttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "autocrypt/autocryptrecipient.h"
#include "autocrypt/autocryptrecipient_p.h"
@@ -24,6 +23,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
static std::shared_ptr<KMime::Message> readAndParseMail(const QString &mailFile)
{
QFile file(QLatin1StringView(MAIL_DATA_DIR) + u'/' + mailFile);
diff --git a/messagecore/autotests/autocryptrecipienttest.h b/messagecore/autotests/autocryptrecipienttest.h
index 62bac3c48..080cc2c14 100644
--- a/messagecore/autotests/autocryptrecipienttest.h
+++ b/messagecore/autotests/autocryptrecipienttest.h
@@ -5,7 +5,6 @@
#pragma once
#include <QObject>
-using namespace Qt::Literals::StringLiterals;
class AutocryptRecipientTest : public QObject
{
diff --git a/messagecore/autotests/autocryptstoragetest.cpp b/messagecore/autotests/autocryptstoragetest.cpp
index 235e81949..10107025e 100644
--- a/messagecore/autotests/autocryptstoragetest.cpp
+++ b/messagecore/autotests/autocryptstoragetest.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "autocryptstoragetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "autocrypt/autocryptstorage.h"
#include "autocrypt/autocryptstorage_p.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(AutocryptStorageTest)
diff --git a/messagecore/autotests/autocryptstoragetest.h b/messagecore/autotests/autocryptstoragetest.h
index 37fb2db9a..10bdb285f 100644
--- a/messagecore/autotests/autocryptstoragetest.h
+++ b/messagecore/autotests/autocryptstoragetest.h
@@ -5,7 +5,6 @@
#pragma once
#include <QDir>
-using namespace Qt::Literals::StringLiterals;
#include <QObject>
diff --git a/messagecore/autotests/autocryptutilstest.cpp b/messagecore/autotests/autocryptutilstest.cpp
index a294da8bf..94b54ae8c 100644
--- a/messagecore/autotests/autocryptutilstest.cpp
+++ b/messagecore/autotests/autocryptutilstest.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "autocryptutilstest.h"
-using namespace Qt::Literals::StringLiterals;
#include "autocrypt/autocryptrecipient_p.h"
#include "autocrypt/autocryptstorage.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(AutocryptUtilsTest)
diff --git a/messagecore/autotests/dateformattertest.cpp b/messagecore/autotests/dateformattertest.cpp
index b442875d2..3b15dd71b 100644
--- a/messagecore/autotests/dateformattertest.cpp
+++ b/messagecore/autotests/dateformattertest.cpp
@@ -5,7 +5,6 @@
*/
#include <utils/dateformatter.h>
-using namespace Qt::Literals::StringLiterals;
#include <QDateTime>
#include <QObject>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
static void initLocale()
{
qputenv("LANG", "en_US.utf-8");
diff --git a/messagecore/autotests/mailinglisttest.cpp b/messagecore/autotests/mailinglisttest.cpp
index 07435c8b4..4d851915d 100644
--- a/messagecore/autotests/mailinglisttest.cpp
+++ b/messagecore/autotests/mailinglisttest.cpp
@@ -5,7 +5,6 @@
*/
#include "mailinglisttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecore_debug.h"
#include "misc/mailinglist.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
// TODO add test for static MailingList detect( const std::shared_ptr<KMime::Message> &message ); and static QString name( ... );
+using namespace Qt::Literals::StringLiterals;
MailingListTest::MailingListTest(QObject *parent)
: QObject(parent)
diff --git a/messagecore/autotests/stringutiltest.cpp b/messagecore/autotests/stringutiltest.cpp
index 3d1e6f2da..6421c6e32 100644
--- a/messagecore/autotests/stringutiltest.cpp
+++ b/messagecore/autotests/stringutiltest.cpp
@@ -3,13 +3,13 @@
SPDX-License-Identifier: LGPL-2.0-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
#include "stringutiltest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../src/utils/stringutil.h"
#include <QTest>
#include <QUrl>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(StringUtilTest)
#define lineLength 40
diff --git a/messagecore/autotests/stringutiltest.h b/messagecore/autotests/stringutiltest.h
index b77a4da1e..f34655536 100644
--- a/messagecore/autotests/stringutiltest.h
+++ b/messagecore/autotests/stringutiltest.h
@@ -5,7 +5,6 @@
#pragma once
#include <QObject>
-using namespace Qt::Literals::StringLiterals;
class StringUtilTest : public QObject
{
diff --git a/messagecore/src/autocrypt/autocryptrecipient.cpp b/messagecore/src/autocrypt/autocryptrecipient.cpp
index a64879c8a..3aebd8c77 100644
--- a/messagecore/src/autocrypt/autocryptrecipient.cpp
+++ b/messagecore/src/autocrypt/autocryptrecipient.cpp
@@ -5,7 +5,6 @@
*/
#include "autocryptrecipient.h"
-using namespace Qt::Literals::StringLiterals;
#include "autocryptrecipient_p.h"
#include "autocryptutils.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QJsonObject>
#include <gpgme++/data.h>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageCore;
AutocryptRecipientPrivate::AutocryptRecipientPrivate() = default;
diff --git a/messagecore/src/autocrypt/autocryptstorage.cpp b/messagecore/src/autocrypt/autocryptstorage.cpp
index b2330d4d3..62e384821 100644
--- a/messagecore/src/autocrypt/autocryptstorage.cpp
+++ b/messagecore/src/autocrypt/autocryptstorage.cpp
@@ -5,7 +5,6 @@
*/
#include "autocryptstorage.h"
-using namespace Qt::Literals::StringLiterals;
#include "autocryptrecipient_p.h"
#include "autocryptstorage_p.h"
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QUrl>
#include <autocrypt_debug.h>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageCore;
AutocryptStoragePrivate::AutocryptStoragePrivate()
diff --git a/messagecore/src/misc/mailinglist.cpp b/messagecore/src/misc/mailinglist.cpp
index 4fd666007..7a2ac1ace 100644
--- a/messagecore/src/misc/mailinglist.cpp
+++ b/messagecore/src/misc/mailinglist.cpp
@@ -4,7 +4,6 @@
*/
#include "mailinglist.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagecore_debug.h"
#include <KConfig>
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStringList>
using namespace MessageCore;
+using namespace Qt::Literals::StringLiterals;
using MagicDetectorFunc = QString (*)(const std::shared_ptr<KMime::Message> &, QByteArray &, QString &);
diff --git a/messagecore/src/utils/colorutil.cpp b/messagecore/src/utils/colorutil.cpp
index 8ed1509e5..e244b1c3b 100644
--- a/messagecore/src/utils/colorutil.cpp
+++ b/messagecore/src/utils/colorutil.cpp
@@ -6,11 +6,11 @@
*/
#include "colorutil.h"
-using namespace Qt::Literals::StringLiterals;
#include <KColorScheme>
#include <QApplication>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageCore;
static bool isLightTheme()
diff --git a/messagelist/src/core/threadingcache.cpp b/messagelist/src/core/threadingcache.cpp
index b3c9343ed..7b48cf02d 100644
--- a/messagelist/src/core/threadingcache.cpp
+++ b/messagelist/src/core/threadingcache.cpp
@@ -7,7 +7,6 @@
*******************************************************************************/
#include "threadingcache.h"
-using namespace Qt::Literals::StringLiterals;
#include "aggregation.h"
#include "messagelist_debug.h"
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QFile>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageList::Core;
namespace
diff --git a/messagelist/src/core/widgets/autotests/configurefilterswidgettest.cpp b/messagelist/src/core/widgets/autotests/configurefilterswidgettest.cpp
index 53b052c42..0eca646fb 100644
--- a/messagelist/src/core/widgets/autotests/configurefilterswidgettest.cpp
+++ b/messagelist/src/core/widgets/autotests/configurefilterswidgettest.cpp
@@ -5,12 +5,12 @@
*/
#include "configurefilterswidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/configurefilterswidget.h"
#include <QListWidget>
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(ConfigureFiltersWidgetTest)
ConfigureFiltersWidgetTest::ConfigureFiltersWidgetTest(QObject *parent)
: QObject(parent)
diff --git a/messagelist/src/core/widgets/autotests/filternamewidgettest.cpp b/messagelist/src/core/widgets/autotests/filternamewidgettest.cpp
index c66ac31ff..7aaecba10 100644
--- a/messagelist/src/core/widgets/autotests/filternamewidgettest.cpp
+++ b/messagelist/src/core/widgets/autotests/filternamewidgettest.cpp
@@ -5,13 +5,13 @@
*/
#include "filternamewidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/filternamewidget.h"
#include <KIconButton>
#include <QHBoxLayout>
#include <QLineEdit>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(FilterNameWidgetTest)
FilterNameWidgetTest::FilterNameWidgetTest(QObject *parent)
: QObject(parent)
diff --git a/messagelist/src/core/widgets/autotests/quicksearchwarningtest.cpp b/messagelist/src/core/widgets/autotests/quicksearchwarningtest.cpp
index 71335f34f..cec98d931 100644
--- a/messagelist/src/core/widgets/autotests/quicksearchwarningtest.cpp
+++ b/messagelist/src/core/widgets/autotests/quicksearchwarningtest.cpp
@@ -5,11 +5,11 @@
*/
#include "quicksearchwarningtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../src/core/widgets/quicksearchwarning.h"
#include <QAction>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QuickSearchWarningTest::QuickSearchWarningTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagelist/src/core/widgets/autotests/searchcollectionindexingwarningtest.cpp b/messagelist/src/core/widgets/autotests/searchcollectionindexingwarningtest.cpp
index 194865281..70d9e91e4 100644
--- a/messagelist/src/core/widgets/autotests/searchcollectionindexingwarningtest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchcollectionindexingwarningtest.cpp
@@ -6,11 +6,11 @@
*/
#include "searchcollectionindexingwarningtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchcollectionindexingwarning.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
SearchCollectionIndexingWarningTest::SearchCollectionIndexingWarningTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagelist/src/core/widgets/autotests/searchlinecommandbuttonswidgettest.cpp b/messagelist/src/core/widgets/autotests/searchlinecommandbuttonswidgettest.cpp
index 6e81e190c..fcd4e458a 100644
--- a/messagelist/src/core/widgets/autotests/searchlinecommandbuttonswidgettest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchlinecommandbuttonswidgettest.cpp
@@ -5,13 +5,13 @@
*/
#include "searchlinecommandbuttonswidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchlinecommandbuttonswidget.h"
#include "core/widgets/searchlinecommandflowlayout.h"
#include <QTest>
QTEST_MAIN(SearchLineCommandButtonsWidgetTest)
+using namespace Qt::Literals::StringLiterals;
SearchLineCommandButtonsWidgetTest::SearchLineCommandButtonsWidgetTest(QObject *parent)
: QObject{parent}
{
diff --git a/messagelist/src/core/widgets/autotests/searchlinecommandtest.cpp b/messagelist/src/core/widgets/autotests/searchlinecommandtest.cpp
index a82388f6e..193d16818 100644
--- a/messagelist/src/core/widgets/autotests/searchlinecommandtest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchlinecommandtest.cpp
@@ -5,11 +5,11 @@
*/
#include "searchlinecommandtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchlinecommand.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(SearchLineCommandTest)
static void initLocale()
{
diff --git a/messagelist/src/core/widgets/autotests/searchlinecommandwidgettest.cpp b/messagelist/src/core/widgets/autotests/searchlinecommandwidgettest.cpp
index c823a1494..610c4ea68 100644
--- a/messagelist/src/core/widgets/autotests/searchlinecommandwidgettest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchlinecommandwidgettest.cpp
@@ -4,7 +4,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "searchlinecommandwidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchlinecommandbuttonswidget.h"
#include "core/widgets/searchlinecommandwidget.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QVBoxLayout>
QTEST_MAIN(SearchLineCommandWidgetTest)
+using namespace Qt::Literals::StringLiterals;
SearchLineCommandWidgetTest::SearchLineCommandWidgetTest(QObject *parent)
: QObject{parent}
{
diff --git a/messagelist/src/core/widgets/autotests/searchlinestatustest.cpp b/messagelist/src/core/widgets/autotests/searchlinestatustest.cpp
index 869ba48de..a0ce08bf1 100644
--- a/messagelist/src/core/widgets/autotests/searchlinestatustest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchlinestatustest.cpp
@@ -5,13 +5,13 @@
*/
#include "searchlinestatustest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../src/core/widgets/searchlinestatus.h"
#include <QCompleter>
#include <QMenu>
#include <QTest>
QTEST_MAIN(SearchLineStatusTest)
+using namespace Qt::Literals::StringLiterals;
SearchLineStatusTest::SearchLineStatusTest(QObject *parent)
: QObject(parent)
{
diff --git a/messagelist/src/core/widgets/autotests/searchmessagebybuttonstest.cpp b/messagelist/src/core/widgets/autotests/searchmessagebybuttonstest.cpp
index c9567df43..37d046efc 100644
--- a/messagelist/src/core/widgets/autotests/searchmessagebybuttonstest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchmessagebybuttonstest.cpp
@@ -4,7 +4,6 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "searchmessagebybuttonstest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchmessagebybuttons.h"
#include <QButtonGroup>
@@ -12,6 +11,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
QTEST_MAIN(SearchMessageByButtonsTest)
using namespace MessageList::Core;
+using namespace Qt::Literals::StringLiterals;
SearchMessageByButtonsTest::SearchMessageByButtonsTest(QObject *parent)
: QObject{parent}
{
diff --git a/messagelist/src/core/widgets/autotests/searchstatusbuttonstest.cpp b/messagelist/src/core/widgets/autotests/searchstatusbuttonstest.cpp
index 96569d90d..e4310bea5 100644
--- a/messagelist/src/core/widgets/autotests/searchstatusbuttonstest.cpp
+++ b/messagelist/src/core/widgets/autotests/searchstatusbuttonstest.cpp
@@ -4,13 +4,13 @@
SPDX-License-Identifier: GPL-2.0-or-later
*/
#include "searchstatusbuttonstest.h"
-using namespace Qt::Literals::StringLiterals;
#include "core/widgets/searchstatusbuttons.h"
#include <QButtonGroup>
#include <QHBoxLayout>
#include <QTest>
QTEST_MAIN(SearchStatusButtonsTest)
+using namespace Qt::Literals::StringLiterals;
using namespace MessageList::Core;
SearchStatusButtonsTest::SearchStatusButtonsTest(QObject *parent)
: QObject{parent}
diff --git a/messagelist/src/utils/aggregationcombobox.cpp b/messagelist/src/utils/aggregationcombobox.cpp
index ac5af6b8e..2e0610d5a 100644
--- a/messagelist/src/utils/aggregationcombobox.cpp
+++ b/messagelist/src/utils/aggregationcombobox.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "aggregationcombobox.h"
-using namespace Qt::Literals::StringLiterals;
#include "aggregationcombobox_p.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
using namespace MessageList::Core;
using namespace MessageList::Utils;
+using namespace Qt::Literals::StringLiterals;
AggregationComboBox::AggregationComboBox(QWidget *parent)
: QComboBox(parent)
diff --git a/messagelist/src/utils/themecombobox.cpp b/messagelist/src/utils/themecombobox.cpp
index fa9489876..c86a445e4 100644
--- a/messagelist/src/utils/themecombobox.cpp
+++ b/messagelist/src/utils/themecombobox.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "themecombobox.h"
-using namespace Qt::Literals::StringLiterals;
#include "utils/themecombobox.h"
#include "utils/themecombobox_p.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include "messagelistsettings.h"
#include "storagemodel.h"
+using namespace Qt::Literals::StringLiterals;
using namespace MessageList::Core;
using namespace MessageList::Utils;
diff --git a/messageviewer/autotests/urlhandlermanagertest.cpp b/messageviewer/autotests/urlhandlermanagertest.cpp
index 2c5c90cce..1b8fa4370 100644
--- a/messageviewer/autotests/urlhandlermanagertest.cpp
+++ b/messageviewer/autotests/urlhandlermanagertest.cpp
@@ -5,7 +5,6 @@
*/
#include "urlhandlermanagertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "util.h"
#include "viewer/urlhandlermanager_p.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
class TestBodyPartURLHandler : public Interface::BodyPartURLHandler
diff --git a/messageviewer/autotests/util.cpp b/messageviewer/autotests/util.cpp
index ee6cf27b8..a834d486b 100644
--- a/messageviewer/autotests/util.cpp
+++ b/messageviewer/autotests/util.cpp
@@ -4,10 +4,10 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "util.h"
-using namespace Qt::Literals::StringLiterals;
#include <QFile>
+using namespace Qt::Literals::StringLiterals;
std::shared_ptr<KMime::Message> MessageViewer::Test::readAndParseMail(const QString &mailFile)
{
QFile file(QStringLiteral(MAIL_DATA_DIR) + u'/' + mailFile);
diff --git a/messageviewer/autotests/viewergrantleethemesupporttest.cpp b/messageviewer/autotests/viewergrantleethemesupporttest.cpp
index 5899eb36e..f27bcb962 100644
--- a/messageviewer/autotests/viewergrantleethemesupporttest.cpp
+++ b/messageviewer/autotests/viewergrantleethemesupporttest.cpp
@@ -5,7 +5,6 @@
*/
#include "viewergrantleethemesupporttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "messageviewer/viewer.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
ViewerGrantleeThemeSupportTest::ViewerGrantleeThemeSupportTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/autotests/viewertest.cpp b/messageviewer/autotests/viewertest.cpp
index 9ade9fe46..9ce870b86 100644
--- a/messageviewer/autotests/viewertest.cpp
+++ b/messageviewer/autotests/viewertest.cpp
@@ -5,13 +5,13 @@
*/
#include "viewertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "messageviewer/viewer.h"
#include <KActionCollection>
#include <QTest>
#include <qtestmouse.h>
+using namespace Qt::Literals::StringLiterals;
ViewerTest::ViewerTest()
{
}
diff --git a/messageviewer/src/antispam/antispamconfig.cpp b/messageviewer/src/antispam/antispamconfig.cpp
index 9d78ae9a4..cc79de281 100644
--- a/messageviewer/src/antispam/antispamconfig.cpp
+++ b/messageviewer/src/antispam/antispamconfig.cpp
@@ -9,11 +9,11 @@
*/
#include "antispamconfig.h"
-using namespace Qt::Literals::StringLiterals;
#include <KConfig>
#include <KConfigGroup>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
AntiSpamConfig *AntiSpamConfig::instance()
diff --git a/messageviewer/src/antispam/spamheaderanalyzer.cpp b/messageviewer/src/antispam/spamheaderanalyzer.cpp
index 537036d78..aa8c506a6 100644
--- a/messageviewer/src/antispam/spamheaderanalyzer.cpp
+++ b/messageviewer/src/antispam/spamheaderanalyzer.cpp
@@ -9,7 +9,6 @@
*/
#include "spamheaderanalyzer.h"
-using namespace Qt::Literals::StringLiterals;
#include "antispamconfig.h"
#include "messageviewer_debug.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QRegularExpression>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
// static
diff --git a/messageviewer/src/dkim-verify/autotests/dkimauthenticationstatusinfotest.cpp b/messageviewer/src/dkim-verify/autotests/dkimauthenticationstatusinfotest.cpp
index 2205868f1..cacc3020f 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimauthenticationstatusinfotest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimauthenticationstatusinfotest.cpp
@@ -5,13 +5,13 @@
*/
#include "dkimauthenticationstatusinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimauthenticationstatusinfo.h"
#include <QTest>
QTEST_GUILESS_MAIN(DKIMAuthenticationStatusInfoTest)
+using namespace Qt::Literals::StringLiterals;
DKIMAuthenticationStatusInfoTest::DKIMAuthenticationStatusInfoTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/autotests/dkimcheckauthenticationstatusjobtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimcheckauthenticationstatusjobtest.cpp
index 05400ae6e..70bad3ea9 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimcheckauthenticationstatusjobtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimcheckauthenticationstatusjobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimcheckauthenticationstatusjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimauthenticationstatusinfo.h"
#include "dkim-verify/dkimcheckauthenticationstatusjob.h"
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMCheckAuthenticationStatusJobTest)
DKIMCheckAuthenticationStatusJobTest::DKIMCheckAuthenticationStatusJobTest(QObject *parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimchecksignaturejobtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimchecksignaturejobtest.cpp
index ffbeb13df..9e021eb4d 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimchecksignaturejobtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimchecksignaturejobtest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimchecksignaturejobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimchecksignaturejob.h"
#include <QSignalSpy>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTimer>
using namespace std::chrono_literals;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMCheckSignatureJobTest)
// #define USE_EXTRA_CHECK 1
diff --git a/messageviewer/src/dkim-verify/autotests/dkimdownloadkeyjobtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimdownloadkeyjobtest.cpp
index a23398660..1d8a882cb 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimdownloadkeyjobtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimdownloadkeyjobtest.cpp
@@ -5,12 +5,12 @@
*/
#include "dkimdownloadkeyjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimdownloadkeyjob.h"
#include <QTest>
QTEST_MAIN(DKIMDownloadKeyJobTest)
+using namespace Qt::Literals::StringLiterals;
DKIMDownloadKeyJobTest::DKIMDownloadKeyJobTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/autotests/dkimheaderparsertest.cpp b/messageviewer/src/dkim-verify/autotests/dkimheaderparsertest.cpp
index cd3135f7e..febf9dd48 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimheaderparsertest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimheaderparsertest.cpp
@@ -5,11 +5,11 @@
*/
#include "dkimheaderparsertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimheaderparser.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(DKIMHeaderParserTest)
DKIMHeaderParserTest::DKIMHeaderParserTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkiminfotest.cpp b/messageviewer/src/dkim-verify/autotests/dkiminfotest.cpp
index de3cdeef6..80eea0336 100644
--- a/messageviewer/src/dkim-verify/autotests/dkiminfotest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkiminfotest.cpp
@@ -5,13 +5,13 @@
*/
#include "dkiminfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkiminfo.h"
#include <QDebug>
#include <QTest>
QTEST_GUILESS_MAIN(DKIMInfoTest)
+using namespace Qt::Literals::StringLiterals;
DKIMInfoTest::DKIMInfoTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimmanagerkeydialogtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimmanagerkeydialogtest.cpp
index d2a595ef9..88163b410 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimmanagerkeydialogtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimmanagerkeydialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimmanagerkeydialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanagerkeydialog.h"
#include "dkim-verify/dkimmanagerkeywidget.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QVBoxLayout>
QTEST_MAIN(DKIMManagerKeyDialogTest)
+using namespace Qt::Literals::StringLiterals;
DKIMManagerKeyDialogTest::DKIMManagerKeyDialogTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimmanagerkeywidgettest.cpp b/messageviewer/src/dkim-verify/autotests/dkimmanagerkeywidgettest.cpp
index e09e78a4e..b16fb8bb9 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimmanagerkeywidgettest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimmanagerkeywidgettest.cpp
@@ -5,13 +5,13 @@
*/
#include "dkimmanagerkeywidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanagerkeytreeview.h"
#include "dkim-verify/dkimmanagerkeywidget.h"
#include <QLineEdit>
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMManagerKeyWidgetTest)
DKIMManagerKeyWidgetTest::DKIMManagerKeyWidgetTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimmanagerrulestest.cpp b/messageviewer/src/dkim-verify/autotests/dkimmanagerrulestest.cpp
index 9cd7d2620..d2cb8b3c5 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimmanagerrulestest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimmanagerrulestest.cpp
@@ -5,11 +5,11 @@
*/
#include "dkimmanagerrulestest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanagerrules.h"
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(DKIMManagerRulesTest)
DKIMManagerRulesTest::DKIMManagerRulesTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimmanagerulesdialogtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimmanagerulesdialogtest.cpp
index 864709abd..85fe7939b 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimmanagerulesdialogtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimmanagerulesdialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimmanagerulesdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanagerulesdialog.h"
#include "dkim-verify/dkimmanageruleswidget.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMManageRulesDialogTest)
DKIMManageRulesDialogTest::DKIMManageRulesDialogTest(QObject *parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimmanageruleswidgettest.cpp b/messageviewer/src/dkim-verify/autotests/dkimmanageruleswidgettest.cpp
index 3aa27e0a9..a8b866c31 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimmanageruleswidgettest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimmanageruleswidgettest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimmanageruleswidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanageruleswidget.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTreeWidget>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMManageRulesWidgetTest)
DKIMManageRulesWidgetTest::DKIMManageRulesWidgetTest(QObject *parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimruledialogtest.cpp b/messageviewer/src/dkim-verify/autotests/dkimruledialogtest.cpp
index 220e214fd..9dbfd68c0 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimruledialogtest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimruledialogtest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimruledialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimruledialog.h"
#include "dkim-verify/dkimrulewidget.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QVBoxLayout>
QTEST_MAIN(DKIMRuleDialogTest)
+using namespace Qt::Literals::StringLiterals;
DKIMRuleDialogTest::DKIMRuleDialogTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimrulewidgettest.cpp b/messageviewer/src/dkim-verify/autotests/dkimrulewidgettest.cpp
index 8f06215b1..537501bc0 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimrulewidgettest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimrulewidgettest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimrulewidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimmanagerulescombobox.h"
#include "dkim-verify/dkimrulewidget.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QLineEdit>
#include <QSpinBox>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMRuleWidgetTest)
DKIMRuleWidgetTest::DKIMRuleWidgetTest(QObject *parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimutiltest.cpp b/messageviewer/src/dkim-verify/autotests/dkimutiltest.cpp
index ee7891aae..68023b06d 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimutiltest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimutiltest.cpp
@@ -5,11 +5,11 @@
*/
#include "dkimutiltest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimutil.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(DKIMUtilTest)
DKIMUtilTest::DKIMUtilTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dkimwidgetinfotest.cpp b/messageviewer/src/dkim-verify/autotests/dkimwidgetinfotest.cpp
index 444a86448..2692f2037 100644
--- a/messageviewer/src/dkim-verify/autotests/dkimwidgetinfotest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dkimwidgetinfotest.cpp
@@ -5,7 +5,6 @@
*/
#include "dkimwidgetinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dkimwidgetinfo.h"
#include <MessageViewer/DKIMCheckSignatureJob>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QLabel>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(DKIMWidgetInfoTest)
DKIMWidgetInfoTest::DKIMWidgetInfoTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/dkim-verify/autotests/dmarcinfotest.cpp b/messageviewer/src/dkim-verify/autotests/dmarcinfotest.cpp
index db4b593e8..52a561524 100644
--- a/messageviewer/src/dkim-verify/autotests/dmarcinfotest.cpp
+++ b/messageviewer/src/dkim-verify/autotests/dmarcinfotest.cpp
@@ -5,12 +5,12 @@
*/
#include "dmarcinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dmarcinfo.h"
#include <QTest>
QTEST_GUILESS_MAIN(DMARCInfoTest)
+using namespace Qt::Literals::StringLiterals;
DMARCInfoTest::DMARCInfoTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/tests/checkrsapublickey.cpp b/messageviewer/src/dkim-verify/tests/checkrsapublickey.cpp
index a84e4f7e4..049dfb5b5 100644
--- a/messageviewer/src/dkim-verify/tests/checkrsapublickey.cpp
+++ b/messageviewer/src/dkim-verify/tests/checkrsapublickey.cpp
@@ -5,7 +5,6 @@
*/
#include "checkrsapublickey.h"
-using namespace Qt::Literals::StringLiterals;
#include <QCommandLineParser>
#include <QCoreApplication>
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <openssl/err.h>
#include <openssl/evp.h>
+using namespace Qt::Literals::StringLiterals;
CheckRSAPublicKey::CheckRSAPublicKey(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/tests/checksignature.cpp b/messageviewer/src/dkim-verify/tests/checksignature.cpp
index 792c05582..2e1ce3ade 100644
--- a/messageviewer/src/dkim-verify/tests/checksignature.cpp
+++ b/messageviewer/src/dkim-verify/tests/checksignature.cpp
@@ -5,7 +5,6 @@
*/
#include "checksignature.h"
-using namespace Qt::Literals::StringLiterals;
#include <QCommandLineParser>
#include <QCoreApplication>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QFile>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
CheckSignature::CheckSignature(const QString &fileName, QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/tests/dmarclookupkey.cpp b/messageviewer/src/dkim-verify/tests/dmarclookupkey.cpp
index 790004880..b8233fd70 100644
--- a/messageviewer/src/dkim-verify/tests/dmarclookupkey.cpp
+++ b/messageviewer/src/dkim-verify/tests/dmarclookupkey.cpp
@@ -5,7 +5,6 @@
*/
#include "dmarclookupkey.h"
-using namespace Qt::Literals::StringLiterals;
#include "dkim-verify/dmarcrecordjob.h"
#include <QCommandLineParser>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QDebug>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
DMarcLookUpKey::DMarcLookUpKey(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/tests/lookupkey.cpp b/messageviewer/src/dkim-verify/tests/lookupkey.cpp
index 92f9dc78c..a098a74af 100644
--- a/messageviewer/src/dkim-verify/tests/lookupkey.cpp
+++ b/messageviewer/src/dkim-verify/tests/lookupkey.cpp
@@ -5,10 +5,10 @@
*/
#include "lookupkey.h"
-using namespace Qt::Literals::StringLiterals;
#include <QDebug>
#include <QDnsLookup>
+using namespace Qt::Literals::StringLiterals;
LookUpKey::LookUpKey(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/dkim-verify/tests/main.cpp b/messageviewer/src/dkim-verify/tests/main.cpp
index 8ae5bbe41..8f6e15daf 100644
--- a/messageviewer/src/dkim-verify/tests/main.cpp
+++ b/messageviewer/src/dkim-verify/tests/main.cpp
@@ -5,11 +5,11 @@
*/
#include "lookupkey.h"
-using namespace Qt::Literals::StringLiterals;
#include <QCommandLineParser>
#include <QCoreApplication>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
int main(int argc, char **argv)
{
QCoreApplication app(argc, argv);
diff --git a/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp b/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp
index 30d3a2baa..6d09122b9 100644
--- a/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp
+++ b/messageviewer/src/header/autotests/grantleeheaderformattertest.cpp
@@ -4,7 +4,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "grantleeheaderformattertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../grantleeheaderformatter.h"
#include <MessageViewer/GrantleeHeaderStyle>
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(GrantleeHeaderFormatterTest)
diff --git a/messageviewer/src/header/autotests/grantleeheaderstyletest.cpp b/messageviewer/src/header/autotests/grantleeheaderstyletest.cpp
index 160d1d191..ff643a900 100644
--- a/messageviewer/src/header/autotests/grantleeheaderstyletest.cpp
+++ b/messageviewer/src/header/autotests/grantleeheaderstyletest.cpp
@@ -4,7 +4,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "grantleeheaderstyletest.h"
-using namespace Qt::Literals::StringLiterals;
#include <MessageViewer/GrantleeHeaderStyle>
#include <MimeTreeParser/NodeHelper>
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStringList>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
QTEST_MAIN(GrantleeHeaderStyleTest)
diff --git a/messageviewer/src/htmlwriter/webengineembedpart.cpp b/messageviewer/src/htmlwriter/webengineembedpart.cpp
index 72c5b0a83..174bf1202 100644
--- a/messageviewer/src/htmlwriter/webengineembedpart.cpp
+++ b/messageviewer/src/htmlwriter/webengineembedpart.cpp
@@ -5,9 +5,9 @@
*/
#include "webengineembedpart.h"
-using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
WebEngineEmbedPart::WebEngineEmbedPart(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/mdn/autotests/mdnwarningwidgettest.cpp b/messageviewer/src/mdn/autotests/mdnwarningwidgettest.cpp
index f52a625ab..020e41830 100644
--- a/messageviewer/src/mdn/autotests/mdnwarningwidgettest.cpp
+++ b/messageviewer/src/mdn/autotests/mdnwarningwidgettest.cpp
@@ -4,7 +4,6 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "mdnwarningwidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "mdn/mdnwarningwidget.h"
@@ -12,6 +11,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QSignalSpy>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(MDNWarningWidgetTest)
Q_DECLARE_METATYPE(MessageViewer::MDNWarningWidget::ResponseType)
MDNWarningWidgetTest::MDNWarningWidgetTest(QObject *parent)
diff --git a/messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp b/messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp
index 13bd43b67..fe287985e 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/converthtmltoplaintexttest.cpp
@@ -6,11 +6,11 @@
*/
#include "converthtmltoplaintexttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../converthtmltoplaintext.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
ConvertHtmlToPlainTextTest::ConvertHtmlToPlainTextTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp b/messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
index eaed61be2..c1be63891 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/objecttreeparsertest.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "objecttreeparsertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "util.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
using namespace MimeTreeParser;
diff --git a/messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp b/messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp
index 34177a4fa..e8473851b 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/quotehtmltest.cpp
@@ -3,7 +3,6 @@
SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
*/
#include "quotehtmltest.h"
-using namespace Qt::Literals::StringLiterals;
#include "../plugins/quotehtml.h"
#include "setupenv.h"
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
QTEST_MAIN(QuoteHtmlTest)
diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest-headeronly.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest-headeronly.cpp
index c7d13a8ad..aea30058d 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest-headeronly.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest-headeronly.cpp
@@ -6,7 +6,6 @@
*/
#include "rendertest-headeronly.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -20,6 +19,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QDir>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
void RenderTest::initMain()
diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest-hidden.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest-hidden.cpp
index c7708b9ce..15f57c759 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest-hidden.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest-hidden.cpp
@@ -6,7 +6,6 @@
*/
#include "rendertest-hidden.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -21,6 +20,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
void RenderTest::initMain()
{
diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest-iconic.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest-iconic.cpp
index 0588ffce4..119cf31f3 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest-iconic.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest-iconic.cpp
@@ -6,7 +6,6 @@
*/
#include "rendertest-iconic.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -21,6 +20,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
void RenderTest::initMain()
{
diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest-inlined.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest-inlined.cpp
index b12046dd4..30aa057e9 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest-inlined.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest-inlined.cpp
@@ -6,7 +6,6 @@
*/
#include "rendertest-inlined.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -20,6 +19,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QDir>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
void RenderTest::initMain()
diff --git a/messageviewer/src/messagepartthemes/default/autotests/rendertest-smart.cpp b/messageviewer/src/messagepartthemes/default/autotests/rendertest-smart.cpp
index 8342e4350..4a7f3b865 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/rendertest-smart.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/rendertest-smart.cpp
@@ -6,7 +6,6 @@
*/
#include "rendertest-smart.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -20,6 +19,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QDir>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
void RenderTest::initMain()
diff --git a/messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp b/messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp
index 03b6af18c..c218fc9ce 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/setupenv.cpp
@@ -6,7 +6,6 @@
*/
#include "setupenv.h"
-using namespace Qt::Literals::StringLiterals;
#include "messagepartthemes/default/messagepartrendererfactory.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QIcon>
#include <QLocale>
+using namespace Qt::Literals::StringLiterals;
void MessageViewer::Test::setupEnv()
{
diff --git a/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp b/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
index b882d9c21..1b35dc661 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/showonlymimeparttest.cpp
@@ -6,7 +6,6 @@
*/
#include "showonlymimeparttest.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "testcsshelper.h"
@@ -19,6 +18,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QString>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
void ShowOnlyMimePartTest::initTestCase()
diff --git a/messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp b/messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp
index 3b5c7b754..14c7e9bf2 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/testcsshelper.cpp
@@ -5,13 +5,13 @@
*/
#include "testcsshelper.h"
-using namespace Qt::Literals::StringLiterals;
#include <QApplication>
#include <QColor>
#include <QFont>
#include <QPalette>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer::Test;
TestCSSHelper::TestCSSHelper(const QPaintDevice *pd)
diff --git a/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp b/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
index 8569fb5ef..411888945 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/unencryptedmessagetest.cpp
@@ -6,7 +6,6 @@
*/
#include "unencryptedmessagetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "setupenv.h"
#include "util.h"
@@ -18,6 +17,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(UnencryptedMessageTest)
diff --git a/messageviewer/src/messagepartthemes/default/autotests/util.cpp b/messageviewer/src/messagepartthemes/default/autotests/util.cpp
index 25c863ea3..24a33e045 100644
--- a/messageviewer/src/messagepartthemes/default/autotests/util.cpp
+++ b/messageviewer/src/messagepartthemes/default/autotests/util.cpp
@@ -4,13 +4,13 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "util.h"
-using namespace Qt::Literals::StringLiterals;
#include <QFile>
#include <QProcess>
#include <QRegularExpression>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
std::shared_ptr<KMime::Message> Test::readAndParseMail(const QString &mailFile)
{
diff --git a/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp b/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
index 7d0191e94..2dd469d24 100644
--- a/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
+++ b/messageviewer/src/messagepartthemes/default/plugins/textmessagepartrenderer.cpp
@@ -5,7 +5,6 @@
*/
#include "textmessagepartrenderer.h"
-using namespace Qt::Literals::StringLiterals;
#include "../messagepartrenderermanager.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageCore/StringUtil>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
TextMessagePartRenderer::TextMessagePartRenderer() = default;
diff --git a/messageviewer/src/messagepartthemes/grantlee/ktexttemplateextension.cpp b/messageviewer/src/messagepartthemes/grantlee/ktexttemplateextension.cpp
index 869814aed..8d0bac750 100644
--- a/messageviewer/src/messagepartthemes/grantlee/ktexttemplateextension.cpp
+++ b/messageviewer/src/messagepartthemes/grantlee/ktexttemplateextension.cpp
@@ -5,12 +5,12 @@
*/
#include "ktexttemplateextension.h"
-using namespace Qt::Literals::StringLiterals;
#include <KTextTemplate/Exception>
#include <KTextTemplate/Parser>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
CallbackTag::CallbackTag(const QString &name, QObject *parent)
: KTextTemplate::Node(parent)
diff --git a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
index aa84aaba9..344bb62c7 100644
--- a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
+++ b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleinterface.cpp
@@ -5,7 +5,6 @@
*/
#include "defaultgrantleeheaderstyleinterface.h"
-using namespace Qt::Literals::StringLiterals;
#include "globalsettings_base.h"
#include "messageviewer/headerstyle.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <KToggleAction>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
using namespace MessageViewer;
DefaultGrantleeHeaderStyleInterface::DefaultGrantleeHeaderStyleInterface(MessageViewer::HeaderStylePlugin *plugin, QObject *parent)
: MessageViewer::HeaderStyleInterface(plugin, parent)
diff --git a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
index e96147ba0..bff738570 100644
--- a/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
+++ b/messageviewer/src/messageviewerheaderplugins/defaultgrantleeheaderstyleplugin/defaultgrantleeheaderstyleplugin.cpp
@@ -5,7 +5,6 @@
*/
#include "defaultgrantleeheaderstyleplugin.h"
-using namespace Qt::Literals::StringLiterals;
#include "defaultgrantleeheaderstrategy.h"
#include "defaultgrantleeheaderstyleinterface.h"
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include "messageviewer/grantleeheaderstyle.h"
#include <KPluginFactory>
using namespace MessageViewer;
+using namespace Qt::Literals::StringLiterals;
K_PLUGIN_CLASS_WITH_JSON(DefaultGrantleeHeaderStylePlugin, "messageviewer_defaultgrantleeheaderstyleplugin.json")
diff --git a/messageviewer/src/openurlwith/autotests/openurlwithmanagertest.cpp b/messageviewer/src/openurlwith/autotests/openurlwithmanagertest.cpp
index 52e00afb0..3213dd887 100644
--- a/messageviewer/src/openurlwith/autotests/openurlwithmanagertest.cpp
+++ b/messageviewer/src/openurlwith/autotests/openurlwithmanagertest.cpp
@@ -5,11 +5,11 @@
*/
#include "openurlwithmanagertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "openurlwith/openurlwithmanager.h"
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(OpenUrlWithManagerTest)
OpenUrlWithManagerTest::OpenUrlWithManagerTest(QObject *parent)
diff --git a/messageviewer/src/remote-content/autotests/remotecontentinfotest.cpp b/messageviewer/src/remote-content/autotests/remotecontentinfotest.cpp
index 2d1b0fa50..0c5dfc4d0 100644
--- a/messageviewer/src/remote-content/autotests/remotecontentinfotest.cpp
+++ b/messageviewer/src/remote-content/autotests/remotecontentinfotest.cpp
@@ -4,10 +4,10 @@
SPDX-License-Identifier: LGPL-2.0-or-later
*/
#include "remotecontentinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "remote-content/remotecontentinfo.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(RemoteContentInfoTest)
RemoteContentInfoTest::RemoteContentInfoTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/remote-content/autotests/remotecontentmanagertest.cpp b/messageviewer/src/remote-content/autotests/remotecontentmanagertest.cpp
index f66417f49..a8c48d78e 100644
--- a/messageviewer/src/remote-content/autotests/remotecontentmanagertest.cpp
+++ b/messageviewer/src/remote-content/autotests/remotecontentmanagertest.cpp
@@ -5,11 +5,11 @@
*/
#include "remotecontentmanagertest.h"
-using namespace Qt::Literals::StringLiterals;
#include "remote-content/remotecontentinfo.h"
#include <QStandardPaths>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(RemoteContentManagerTest)
RemoteContentManagerTest::RemoteContentManagerTest(QObject *parent)
: QObject(parent)
diff --git a/messageviewer/src/utils/autotests/messageviewerutilstest.cpp b/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
index a0324551b..df44b3dc8 100644
--- a/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
+++ b/messageviewer/src/utils/autotests/messageviewerutilstest.cpp
@@ -5,12 +5,12 @@
*/
#include "messageviewerutilstest.h"
-using namespace Qt::Literals::StringLiterals;
#include "utils/messageviewerutil.h"
#include <QTest>
QTEST_GUILESS_MAIN(MessageViewerUtilsTest)
+using namespace Qt::Literals::StringLiterals;
MessageViewerUtilsTest::MessageViewerUtilsTest(QObject *parent)
: QObject(parent)
{
diff --git a/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp b/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
index 5b1d5c4e7..ac25b6ceb 100644
--- a/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmaildndattachment.cpp
@@ -5,7 +5,6 @@
*/
#include "testmaildndattachment.h"
-using namespace Qt::Literals::StringLiterals;
#include <KActionCollection>
#include <KMime/Content>
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageViewer/MailWebEngineView>
#include <MessageViewer/Viewer>
+using namespace Qt::Literals::StringLiterals;
TestMailDndAttachment::TestMailDndAttachment(QWidget *parent)
: QWidget(parent)
{
diff --git a/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp b/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
index 85aad42af..0b8f7137f 100644
--- a/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
+++ b/messageviewer/src/viewer/webengine/tests/testmailmboxwebengine.cpp
@@ -5,7 +5,6 @@
*/
#include "testmailmboxwebengine.h"
-using namespace Qt::Literals::StringLiterals;
#include <KActionCollection>
#include <KMime/Content>
@@ -17,6 +16,7 @@ using namespace Qt::Literals::StringLiterals;
#include <MessageViewer/MailWebEngineView>
#include <MessageViewer/Viewer>
+using namespace Qt::Literals::StringLiterals;
TestMailMBoxWebEngine::TestMailMBoxWebEngine(QWidget *parent)
: QWidget(parent)
{
diff --git a/templateparser/autotests/templateparseremailaddressrequesterlineedittest.cpp b/templateparser/autotests/templateparseremailaddressrequesterlineedittest.cpp
index ec9b10ea6..387e18a2f 100644
--- a/templateparser/autotests/templateparseremailaddressrequesterlineedittest.cpp
+++ b/templateparser/autotests/templateparseremailaddressrequesterlineedittest.cpp
@@ -5,7 +5,6 @@
*/
#include "templateparseremailaddressrequesterlineedittest.h"
-using namespace Qt::Literals::StringLiterals;
#include "templateparseremailaddressrequesterlineedit.h"
#include <QHBoxLayout>
@@ -13,6 +12,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QSignalSpy>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
TemplateParserEmailAddressRequesterLineEditTest::TemplateParserEmailAddressRequesterLineEditTest(QObject *parent)
: QObject(parent)
{
diff --git a/templateparser/autotests/templateparserextracthtmlinfotest.cpp b/templateparser/autotests/templateparserextracthtmlinfotest.cpp
index 0e78d1b27..9e8e1da66 100644
--- a/templateparser/autotests/templateparserextracthtmlinfotest.cpp
+++ b/templateparser/autotests/templateparserextracthtmlinfotest.cpp
@@ -5,13 +5,13 @@
*/
#include "templateparserextracthtmlinfotest.h"
-using namespace Qt::Literals::StringLiterals;
#include "templateparserextracthtmlinfo.h"
#include <QSignalSpy>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
TemplateParserExtractHtmlInfoTest::TemplateParserExtractHtmlInfoTest(QObject *parent)
: QObject(parent)
{