Commit 21e4dff2 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new api

parent 41054138
......@@ -67,7 +67,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.13.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.13.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.13.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.13.44")
set(LIBKLEO_LIB_VERSION_LIB "5.13.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.13.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40")
......
......@@ -61,9 +61,9 @@ CodecAction::~CodecAction()
{
}
QList<QByteArray> CodecAction::mimeCharsets() const
QVector<QByteArray> CodecAction::mimeCharsets() const
{
QList<QByteArray> ret;
QVector<QByteArray> ret;
qCDebug(KMAIL_LOG) << "current item" << currentItem() << currentText();
if (currentItem() == 0) {
// 'Default' selected: return the preferred charsets.
......
......@@ -21,7 +21,7 @@
#define CODECACTION_H
// Qt
#include <QList>
#include <QVector>
// KDE
#include <kcodecaction.h>
......@@ -49,7 +49,7 @@ public:
mode. In Reader mode it probably makes more sense to use KCodecAction::currentCodec()
and KCodecAction::currentAutoDetectScript().
*/
Q_REQUIRED_RESULT QList<QByteArray> mimeCharsets() const;
Q_REQUIRED_RESULT QVector<QByteArray> mimeCharsets() const;
void setAutoCharset();
void setCharset(const QByteArray &charset);
......
......@@ -45,7 +45,7 @@ CodecManager *CodecManager::self()
return &instance;
}
QList<QByteArray> CodecManager::preferredCharsets() const
QVector<QByteArray> CodecManager::preferredCharsets() const
{
return mPreferredCharsets;
}
......
......@@ -21,7 +21,7 @@
#define CODECMANAGER_H
#include <QByteArray>
#include <QList>
#include <QVector>
class CodecManager
{
public:
......@@ -33,7 +33,7 @@ public:
/**
A list of preferred charsets to use when composing messages.
*/
Q_REQUIRED_RESULT QList<QByteArray> preferredCharsets() const;
Q_REQUIRED_RESULT QVector<QByteArray> preferredCharsets() const;
/**
Re-read the preferred charsets from settings.
......@@ -46,7 +46,7 @@ private:
// Singleton. The only instance lives in sInstance->instance
CodecManager();
QList<QByteArray> mPreferredCharsets;
QVector<QByteArray> mPreferredCharsets;
};
#endif /* CODECMANAGER_H */
......@@ -716,7 +716,7 @@ void KMComposerWin::writeConfig()
MessageComposer::Composer *KMComposerWin::createSimpleComposer()
{
QList< QByteArray > charsets = mCodecAction->mimeCharsets();
QVector< QByteArray > charsets = mCodecAction->mimeCharsets();
if (!mOriginalPreferredCharset.isEmpty()) {
charsets.insert(0, mOriginalPreferredCharset);
}
......@@ -2737,7 +2737,7 @@ void KMComposerWin::slotDoDelayedSend(KJob *job)
void KMComposerWin::applyComposerSetting(MessageComposer::ComposerViewBase *mComposerBase)
{
QList< QByteArray > charsets = mCodecAction->mimeCharsets();
QVector< QByteArray > charsets = mCodecAction->mimeCharsets();
if (!mOriginalPreferredCharset.isEmpty()) {
charsets.insert(0, mOriginalPreferredCharset);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment