From c9ecc04d068e2bb8fc2dd82d6c57ee0f999b7335 Mon Sep 17 00:00:00 2001
From: Laurent Montel <montel@kde.org>
Date: Mon, 3 Jun 2019 07:21:35 +0200
Subject: [PATCH] Adapt to new api

---
 CMakeLists.txt               | 2 +-
 src/tag/tagactionmanager.cpp | 2 +-
 src/tag/tagactionmanager.h   | 6 +++---
 src/tag/tagselectdialog.h    | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a3c63852..d8221761a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE)
 
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets)
 set(LIBGRAVATAR_VERSION_LIB "5.11.40")
-set(MAILCOMMON_LIB_VERSION_LIB "5.11.41")
+set(MAILCOMMON_LIB_VERSION_LIB "5.11.42")
 set(KDEPIM_APPS_LIB_VERSION_LIB "5.11.40")
 set(MESSAGELIB_LIB_VERSION_LIB "5.11.42")
 set(LIBKLEO_LIB_VERSION_LIB "5.11.40")
diff --git a/src/tag/tagactionmanager.cpp b/src/tag/tagactionmanager.cpp
index fb761623c..3e0e027cf 100644
--- a/src/tag/tagactionmanager.cpp
+++ b/src/tag/tagactionmanager.cpp
@@ -173,7 +173,7 @@ void TagActionManager::onSignalMapped(const QString &tag)
     Q_EMIT tagActionTriggered(Akonadi::Tag(tag.toLongLong()));
 }
 
-void TagActionManager::createTagActions(const QList<MailCommon::Tag::Ptr> &tags)
+void TagActionManager::createTagActions(const QVector<MailCommon::Tag::Ptr> &tags)
 {
     clearActions();
 
diff --git a/src/tag/tagactionmanager.h b/src/tag/tagactionmanager.h
index 80b5b4903..4351775e8 100644
--- a/src/tag/tagactionmanager.h
+++ b/src/tag/tagactionmanager.h
@@ -24,7 +24,7 @@
 #include "kmail_export.h"
 #include "mailcommon/tag.h"
 #include <QMap>
-
+#include <QVector>
 class KJob;
 class KActionCollection;
 class KXMLGUIClient;
@@ -112,7 +112,7 @@ private:
 
     void fillTagList();
     void createTagAction(const MailCommon::Tag::Ptr &tag, bool addToMenu);
-    void createTagActions(const QList<MailCommon::Tag::Ptr> &);
+    void createTagActions(const QVector<MailCommon::Tag::Ptr> &);
     void checkTags(const QList<qint64> &tags);
     QList<qint64> checkedTags() const;
 
@@ -132,7 +132,7 @@ private:
     QList<QAction *> mToolbarActions;
 
     // A sorted list of all tags
-    QList<MailCommon::Tag::Ptr> mTags;
+    QVector<MailCommon::Tag::Ptr> mTags;
 
     // Uri of a newly created tag
     qint64 mNewTagId = -1;
diff --git a/src/tag/tagselectdialog.h b/src/tag/tagselectdialog.h
index cebb04dc9..08dfcf10a 100644
--- a/src/tag/tagselectdialog.h
+++ b/src/tag/tagselectdialog.h
@@ -21,6 +21,7 @@
 #define TAGSELECTDIALOG_H
 
 #include <QDialog>
+#include <QVector>
 #include <AkonadiCore/Item>
 #include <AkonadiCore/Tag>
 #include "MailCommon/Tag"
@@ -50,7 +51,7 @@ private:
     Akonadi::Item mSelectedItem;
 
     Akonadi::Tag::List mCurrentSelectedTags;
-    QList<MailCommon::Tag::Ptr> mTagList;
+    QVector<MailCommon::Tag::Ptr> mTagList;
     QList<KActionCollection *> mActionCollectionList;
     QListWidget *mListTag = nullptr;
 };