Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
PIM MailCommon
Commits
2f394d45
Commit
2f394d45
authored
Jun 08, 2017
by
Laurent Montel
Browse files
Adapt to new api
parent
9bdf758d
Changes
6
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
2f394d45
...
...
@@ -22,7 +22,7 @@ include(ECMCoverageOption)
set
(
MAILCOMMON_LIB_VERSION
${
PIM_VERSION
}
)
set
(
AKONADIMIME_LIB_VERSION
"5.5.40"
)
set
(
MESSAGELIB_LIB_VERSION
"5.5.4
0
"
)
set
(
MESSAGELIB_LIB_VERSION
"5.5.4
8
"
)
set
(
QT_REQUIRED_VERSION
"5.7.0"
)
set
(
KMIME_LIB_VERSION
"5.5.40"
)
set
(
KMAILTRANSPORT_LIB_VERSION
"5.5.40"
)
...
...
src/filter/filteractions/filteraction.cpp
View file @
2f394d45
...
...
@@ -27,7 +27,7 @@
#include
<MessageComposer/MessageFactoryNG>
#include
<MessageComposer/MessageSender>
#include
<
m
essage
core/messagehelpers.h
>
#include
<
M
essage
Composer/Util
>
#include
<messageviewer/messageviewersettings.h>
#include
<KLocalizedString>
...
...
@@ -108,7 +108,7 @@ bool FilterAction::folderRemoved(const Akonadi::Collection &, const Akonadi::Col
void
FilterAction
::
sendMDN
(
const
Akonadi
::
Item
&
item
,
KMime
::
MDN
::
DispositionType
type
,
const
QVector
<
KMime
::
MDN
::
DispositionModifier
>
&
modifiers
)
{
const
KMime
::
Message
::
Ptr
msg
=
MessageCor
e
::
Util
::
message
(
item
);
const
KMime
::
Message
::
Ptr
msg
=
MessageCo
mpose
r
::
Util
::
message
(
item
);
if
(
!
msg
)
{
return
;
}
...
...
src/filter/filteractions/filteractionredirect.cpp
View file @
2f394d45
...
...
@@ -24,7 +24,7 @@
#include
<MessageComposer/MessageFactoryNG>
#include
<MessageComposer/MessageSender>
#include
<
m
essage
core/messagehelpers.h
>
#include
<
M
essage
Composer/Util
>
#include
<KLocalizedString>
...
...
@@ -46,7 +46,7 @@ FilterAction::ReturnCode FilterActionRedirect::process(ItemContext &context, boo
return
ErrorButGoOn
;
}
KMime
::
Message
::
Ptr
msg
=
MessageCor
e
::
Util
::
message
(
context
.
item
());
KMime
::
Message
::
Ptr
msg
=
MessageCo
mpose
r
::
Util
::
message
(
context
.
item
());
MessageComposer
::
MessageFactoryNG
factory
(
msg
,
context
.
item
().
id
());
factory
.
setFolderIdentity
(
Util
::
folderIdentity
(
context
.
item
()));
...
...
src/filter/mdnadvicedialog.cpp
View file @
2f394d45
...
...
@@ -20,7 +20,6 @@
#include
"kernel/mailkernel.h"
#include
"mailcommon_debug.h"
#include
<messagecore/messagehelpers.h>
#include
<MessageComposer/MessageFactoryNG>
#include
<MessageComposer/Util>
...
...
@@ -166,7 +165,7 @@ MessageComposer::MDNAdvice MDNAdviceHelper::questionIgnoreSend(const QString &te
QPair
<
bool
,
KMime
::
MDN
::
SendingMode
>
MDNAdviceHelper
::
checkAndSetMDNInfo
(
const
Akonadi
::
Item
&
item
,
KMime
::
MDN
::
DispositionType
d
,
bool
forceSend
)
{
KMime
::
Message
::
Ptr
msg
=
MessageCor
e
::
Util
::
message
(
item
);
KMime
::
Message
::
Ptr
msg
=
MessageCo
mpose
r
::
Util
::
message
(
item
);
// RFC 2298: At most one MDN may be issued on behalf of each
// particular recipient by their user agent. That is, once an MDN
...
...
src/mdn/sendmdnhandler.cpp
View file @
2f394d45
...
...
@@ -25,9 +25,9 @@
#include
"util/mailutil.h"
#include
"filter/mdnadvicedialog.h"
#include
"mailcommon_debug.h"
#include
<MessageComposer/Util>
#include
<MessageComposer/MessageFactoryNG>
#include
<MessageComposer/MessageSender>
#include
<messagecore/messagehelpers.h>
#include
<messageviewer/messageviewersettings.h>
#include
<Collection>
...
...
@@ -81,7 +81,7 @@ void SendMdnHandler::Private::handleMessages()
continue
;
}
const
KMime
::
Message
::
Ptr
message
=
MessageCor
e
::
Util
::
message
(
item
);
const
KMime
::
Message
::
Ptr
message
=
MessageCo
mpose
r
::
Util
::
message
(
item
);
if
(
!
message
)
{
continue
;
}
...
...
src/util/mailutil.cpp
View file @
2f394d45
...
...
@@ -59,7 +59,6 @@
#include
"mailimporter/othermailerutil.h"
#include
<MessageCore/StringUtil>
#include
<messagecore/messagehelpers.h>
#include
<MessageComposer/MessageHelper>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment