Adapt to new api

wilder
Laurent Montel 7 years ago
parent 11b4b597ed
commit c9ecc04d06
  1. 2
      CMakeLists.txt
  2. 2
      src/tag/tagactionmanager.cpp
  3. 6
      src/tag/tagactionmanager.h
  4. 3
      src/tag/tagselectdialog.h

@ -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")

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

@ -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;

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

Loading…
Cancel
Save