Commit e30f97a0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Don't export some symbol

parent 8da9742c
......@@ -34,6 +34,7 @@
#include "part/infopart.h"
#include "composer.h"
#include "utils/util.h"
#include "utils/util_p.h"
#include "imagescaling/imagescalingutils.h"
#include "SendLater/SendLaterInfo"
......
......@@ -21,7 +21,7 @@
#include "job/encryptjob.h"
#include "contentjobbase_p.h"
#include "utils/util.h"
#include "utils/util_p.h"
#include <Libkleo/Enum>
......
......@@ -22,6 +22,7 @@
#include "contentjobbase_p.h"
#include "utils/util.h"
#include "utils/util_p.h"
#include <Libkleo/Enum>
#include <QGpgME/Protocol>
......
......@@ -21,7 +21,7 @@
#include "job/signjob.h"
#include "contentjobbase_p.h"
#include "utils/util.h"
#include "utils/util_p.h"
#include <Libkleo/Enum>
#include <QGpgME/Protocol>
......
......@@ -24,6 +24,7 @@
#include "helper/messagehelper.h"
#include "settings/messagecomposersettings.h"
#include "MessageComposer/Util"
#include "utils/util_p.h"
#include <kmime/kmime_message.h>
#include <libkdepim/progressmanager.h>
......
......@@ -22,13 +22,13 @@
*/
#include "utils/util.h"
#include "util_p.h"
#include "helper/helper_p.h"
#include "composer/composer.h"
#include "job/singlepartjob.h"
#include <QTextCodec>
#include <QTextEdit>
#include <KCharsets>
#include "messagecomposer_debug.h"
......
......@@ -26,7 +26,6 @@
#include "Libkleo/Enum"
#include <KMime/Message>
#include <QTextEdit>
namespace KMime
{
class Content;
......@@ -42,41 +41,12 @@ namespace MessageComposer
namespace Util
{
/**
* Sets the proper structural information such as content-type, cte, and charset on the encoded body content. Depending on the crypto options,
* original content may be needed to determine some of the values
*/
KMime::Content *composeHeadersAndBody(KMime::Content *orig, QByteArray encodedBody, Kleo::CryptoMessageFormat format, bool sign, const QByteArray &hashAlgo = "pgp-sha1");
/**
* Sets the content-type for the top level of the mime content, based on the crypto format and if a signature is used.
*/
void makeToplevelContentType(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign, const QByteArray &hashAlgo = "pgp-sha1");
/**
* Sets the nested content type of the content, for crypto operations.
*/
void setNestedContentType(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign);
/**
* Sets the nested content dispositions for the crypto operations.
*/
void setNestedContentDisposition(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign);
/**
* Helper that returns whether or not the current combination of crypto format and signing choice means that the
* resulting message will be a mime message or not.
*/
bool makeMultiMime(Kleo::CryptoMessageFormat f, bool sign);
MESSAGECOMPOSER_EXPORT QByteArray selectCharset(const QList<QByteArray> &charsets,
const QString &text);
MESSAGECOMPOSER_EXPORT QStringList AttachmentKeywords();
MESSAGECOMPOSER_EXPORT QString cleanedUpHeaderString(const QString &s);
void addSendReplyForwardAction(const KMime::Message::Ptr &message, MailTransport::MessageQueueJob *qjob);
MESSAGECOMPOSER_EXPORT bool sendMailDispatcherIsOnline(QWidget *parent = nullptr);
MESSAGECOMPOSER_EXPORT void removeNotNecessaryHeaders(const KMime::Message::Ptr &msg);
......
/*
Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
Copyright (C) 2009 Klaralvdalens Datakonsult AB, a KDAB Group company, info@kdab.net
Copyright (c) 2009 Leo Franchi <lfranchi@kde.org>
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to the
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
*/
#ifndef MESSAGECOMPOSER_UTIL_P_H
#define MESSAGECOMPOSER_UTIL_P_H
#include "Libkleo/Enum"
#include <KMime/Message>
namespace KMime
{
class Content;
}
namespace MailTransport
{
class MessageQueueJob;
}
namespace MessageComposer
{
namespace Util
{
/**
* Sets the proper structural information such as content-type, cte, and charset on the encoded body content. Depending on the crypto options,
* original content may be needed to determine some of the values
*/
KMime::Content *composeHeadersAndBody(KMime::Content *orig, QByteArray encodedBody, Kleo::CryptoMessageFormat format, bool sign, const QByteArray &hashAlgo = "pgp-sha1");
/**
* Sets the content-type for the top level of the mime content, based on the crypto format and if a signature is used.
*/
void makeToplevelContentType(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign, const QByteArray &hashAlgo = "pgp-sha1");
/**
* Sets the nested content type of the content, for crypto operations.
*/
void setNestedContentType(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign);
/**
* Sets the nested content dispositions for the crypto operations.
*/
void setNestedContentDisposition(KMime::Content *content, Kleo::CryptoMessageFormat format, bool sign);
/**
* Helper that returns whether or not the current combination of crypto format and signing choice means that the
* resulting message will be a mime message or not.
*/
bool makeMultiMime(Kleo::CryptoMessageFormat f, bool sign);
void addSendReplyForwardAction(const KMime::Message::Ptr &message, MailTransport::MessageQueueJob *qjob);
}
}
#endif
......@@ -44,14 +44,6 @@ struct DeleteAndSetToZero {
}
};
template <typename T>
static inline void deleteAll(T &c)
{
for (typename T::iterator it = c.begin(); it != c.end(); ++it) {
delete *it; *it = 0;
}
}
}
#endif // __KDEPIM__MESSAGEVIEWER__STL_UTIL_H__
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