Use "using namespace Mailcommon"

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)
 {

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;
 };
-
+}

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());
 }
-}

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

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();
 }
-}

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();
 }
-}

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()
 {
 }
-}