From c70134b905090bac7c19e44406e124f218f3e953 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Sun, 17 Oct 2021 13:41:35 +0200
Subject: [PATCH] Use "using namespace Mailcommon"

---
 .../filterconverttosievepurposemenuwidget.cpp             | 2 +-
 .../filterconverttosievepurposemenuwidget.h               | 4 +++-
 src/folder/entitycollectionorderproxymodel.cpp            | 8 +++-----
 src/folder/folderrequester.cpp                            | 7 +++----
 src/folder/folderselectiondialog.cpp                      | 6 ++----
 src/folder/foldertreewidgetproxymodel.cpp                 | 4 +---
 src/job/jobscheduler.cpp                                  | 5 ++---
 7 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/filter/filterconverter/filterconverttosievepurposemenuwidget.cpp b/src/filter/filterconverter/filterconverttosievepurposemenuwidget.cpp
index a3b894c..efed512 100644
--- a/src/filter/filterconverter/filterconverttosievepurposemenuwidget.cpp
+++ b/src/filter/filterconverter/filterconverttosievepurposemenuwidget.cpp
@@ -5,7 +5,7 @@
 */
 #include "filterconverttosievepurposemenuwidget.h"
 #include <KPIMTextEdit/PlainTextEditor>
-
+using namespace MailCommon;
 FilterconverttosievePurposeMenuWidget::FilterconverttosievePurposeMenuWidget(QWidget *parentWidget, QObject *parent)
     : PimCommon::PurposeMenuWidget(parentWidget, parent)
 {
diff --git a/src/filter/filterconverter/filterconverttosievepurposemenuwidget.h b/src/filter/filterconverter/filterconverttosievepurposemenuwidget.h
index e34da58..cce1ba3 100644
--- a/src/filter/filterconverter/filterconverttosievepurposemenuwidget.h
+++ b/src/filter/filterconverter/filterconverttosievepurposemenuwidget.h
@@ -11,6 +11,8 @@ namespace KPIMTextEdit
 {
 class PlainTextEditor;
 }
+namespace MailCommon
+{
 class FilterconverttosievePurposeMenuWidget : public PimCommon::PurposeMenuWidget
 {
     Q_OBJECT
@@ -24,4 +26,4 @@ public:
 private:
     KPIMTextEdit::PlainTextEditor *mEditor = nullptr;
 };
-
+}
diff --git a/src/folder/entitycollectionorderproxymodel.cpp b/src/folder/entitycollectionorderproxymodel.cpp
index e730c96..ac0bceb 100644
--- a/src/folder/entitycollectionorderproxymodel.cpp
+++ b/src/folder/entitycollectionorderproxymodel.cpp
@@ -17,9 +17,8 @@
 
 #include <QRegularExpression>
 
-namespace MailCommon
-{
-class Q_DECL_HIDDEN EntityCollectionOrderProxyModel::EntityCollectionOrderProxyModelPrivate
+using namespace MailCommon;
+class Q_DECL_HIDDEN MailCommon::EntityCollectionOrderProxyModel::EntityCollectionOrderProxyModelPrivate
 {
 public:
     EntityCollectionOrderProxyModelPrivate()
@@ -171,7 +170,6 @@ bool EntityCollectionOrderProxyModel::filterAcceptsRow(int sourceRow, const QMod
     if (d->matcher.isNull()) {
         return EntityOrderProxyModel::filterAcceptsRow(sourceRow, sourceParent);
     }
-    QModelIndex sourceIndex = sourceModel()->index(sourceRow, filterKeyColumn(), sourceParent);
+    const QModelIndex sourceIndex = sourceModel()->index(sourceRow, filterKeyColumn(), sourceParent);
     return d->matcher.matches(sourceModel(), sourceIndex, filterRole());
 }
-}
diff --git a/src/folder/folderrequester.cpp b/src/folder/folderrequester.cpp
index 55114c8..26a2f64 100644
--- a/src/folder/folderrequester.cpp
+++ b/src/folder/folderrequester.cpp
@@ -21,9 +21,9 @@
 #include <QKeyEvent>
 #include <QToolButton>
 
-namespace MailCommon
-{
-class FolderRequesterPrivate
+using namespace MailCommon;
+
+class MailCommon::FolderRequesterPrivate
 {
 public:
     Akonadi::Collection mCollection;
@@ -177,4 +177,3 @@ void FolderRequester::setSelectFolderTitleDialog(const QString &title)
 {
     d->mSelectFolderTitleDialog = title;
 }
-} // namespace MailCommon
diff --git a/src/folder/folderselectiondialog.cpp b/src/folder/folderselectiondialog.cpp
index 4c8aa17..513b323 100644
--- a/src/folder/folderselectiondialog.cpp
+++ b/src/folder/folderselectiondialog.cpp
@@ -28,9 +28,8 @@
 #include <QShowEvent>
 #include <QVBoxLayout>
 
-namespace MailCommon
-{
-class Q_DECL_HIDDEN FolderSelectionDialog::FolderSelectionDialogPrivate
+using namespace MailCommon;
+class Q_DECL_HIDDEN MailCommon::FolderSelectionDialog::FolderSelectionDialogPrivate
 {
 public:
     FolderTreeWidget *folderTreeWidget = nullptr;
@@ -274,4 +273,3 @@ void FolderSelectionDialog::hideEvent(QHideEvent *)
 {
     d->folderTreeWidget->clearFilter();
 }
-}
diff --git a/src/folder/foldertreewidgetproxymodel.cpp b/src/folder/foldertreewidgetproxymodel.cpp
index a0ae8dc..3324951 100644
--- a/src/folder/foldertreewidgetproxymodel.cpp
+++ b/src/folder/foldertreewidgetproxymodel.cpp
@@ -23,8 +23,7 @@
 #include <QIcon>
 #include <QPalette>
 
-namespace MailCommon
-{
+using namespace MailCommon;
 class FolderTreeWidgetProxyModel::FolderTreeWidgetProxyModelPrivate
 {
 public:
@@ -270,4 +269,3 @@ void FolderTreeWidgetProxyModel::addContentMimeTypeInclusionFilter(const QString
     d->checker.setWantedMimeTypes(d->includedMimeTypes.values());
     invalidateFilter();
 }
-}
diff --git a/src/job/jobscheduler.cpp b/src/job/jobscheduler.cpp
index be24d9c..4b73235 100644
--- a/src/job/jobscheduler.cpp
+++ b/src/job/jobscheduler.cpp
@@ -6,8 +6,8 @@
 
 #include "jobscheduler.h"
 #include "mailcommon_debug.h"
-namespace MailCommon
-{
+using namespace MailCommon;
+
 ScheduledTask::ScheduledTask(const Akonadi::Collection &folder, bool immediate)
     : mCurrentFolder(folder)
     , mImmediate(immediate)
@@ -220,4 +220,3 @@ ScheduledJob::ScheduledJob(const Akonadi::Collection &folder, bool immediate)
 ScheduledJob::~ScheduledJob()
 {
 }
-}