[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [mailcommon] /: Compile with QT_NO_CAST_FROM_BYTEARRAY
From: Montel Laurent <null () kde ! org>
Date: 2017-05-07 8:51:20
Message-ID: E1d7HuS-000167-4X () code ! kde ! org
[Download RAW message or body]
Git commit 976b92da3d42ee65839d11003ea33ce9580da337 by Montel Laurent.
Committed on 07/05/2017 at 08:51.
Pushed by mlaurent into branch 'master'.
Compile with QT_NO_CAST_FROM_BYTEARRAY
M +0 -1 CMakeLists.txt
M +2 -2 src/filter/filteractions/filteractionremoveheader.cpp
M +1 -1 src/filter/filteractions/filteractionreplyto.cpp
M +3 -3 src/filter/filteractions/filteractionrewriteheader.cpp
M +1 -1 src/filter/filteractions/filteractionwithcommand.cpp
https://commits.kde.org/mailcommon/976b92da3d42ee65839d11003ea33ce9580da337
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ae328d..8f2e4c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,6 @@ set_package_properties(Xsltproc PROPERTIES DESCRIPTION "XSLT \
processor from libx #add_definitions("-DQT_NO_CAST_FROM_ASCII \
-DQT_NO_CAST_TO_ASCII") add_definitions( -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT )
add_definitions("-DQT_NO_CAST_TO_ASCII")
-remove_definitions( -DQT_NO_CAST_FROM_BYTEARRAY )
remove_definitions( -DQT_NO_CAST_FROM_ASCII )
#add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
diff --git a/src/filter/filteractions/filteractionremoveheader.cpp \
b/src/filter/filteractions/filteractionremoveheader.cpp index 2e6a759..cf461e1 100644
--- a/src/filter/filteractions/filteractionremoveheader.cpp
+++ b/src/filter/filteractions/filteractionremoveheader.cpp
@@ -67,9 +67,9 @@ FilterAction::ReturnCode \
FilterActionRemoveHeader::process(ItemContext &context,
KMime::Message::Ptr msg = context.item().payload<KMime::Message::Ptr>();
const QByteArray param(mParameter.toLatin1());
bool headerRemove = false;
- while (msg->headerByType(param)) {
+ while (msg->headerByType(param.constData())) {
headerRemove = true;
- msg->removeHeader(param);
+ msg->removeHeader(param.constData());
}
if (headerRemove) {
msg->assemble();
diff --git a/src/filter/filteractions/filteractionreplyto.cpp \
b/src/filter/filteractions/filteractionreplyto.cpp index a5b0803..d44bccd 100644
--- a/src/filter/filteractions/filteractionreplyto.cpp
+++ b/src/filter/filteractions/filteractionreplyto.cpp
@@ -42,7 +42,7 @@ FilterAction::ReturnCode FilterActionReplyTo::process(ItemContext \
&context, bool const QByteArray replyTo("Reply-To");
KMime::Headers::Base *header = KMime::Headers::createHeader(replyTo);
if (!header) {
- header = new KMime::Headers::Generic(replyTo);
+ header = new KMime::Headers::Generic(replyTo.constData());
}
header->fromUnicodeString(mParameter, "utf-8");
msg->setHeader(header);
diff --git a/src/filter/filteractions/filteractionrewriteheader.cpp \
b/src/filter/filteractions/filteractionrewriteheader.cpp index f72a4e6..b157147 \
100644
--- a/src/filter/filteractions/filteractionrewriteheader.cpp
+++ b/src/filter/filteractions/filteractionrewriteheader.cpp
@@ -78,7 +78,7 @@ FilterAction::ReturnCode \
FilterActionRewriteHeader::process(ItemContext &context
const KMime::Message::Ptr msg = context.item().payload<KMime::Message::Ptr>();
const QByteArray param(mParameter.toLatin1());
- KMime::Headers::Base *header = msg->headerByType(param);
+ KMime::Headers::Base *header = msg->headerByType(param.constData());
if (!header) {
return GoOn; //TODO: Maybe create a new header by type?
}
@@ -87,11 +87,11 @@ FilterAction::ReturnCode \
FilterActionRewriteHeader::process(ItemContext &context const QString oldValue = \
value; const QString newValue = value.replace(mRegExp, mReplacementString);
if (newValue != oldValue) {
- msg->removeHeader(param);
+ msg->removeHeader(param.constData());
KMime::Headers::Base *newheader = KMime::Headers::createHeader(param);
if (!newheader) {
- newheader = new KMime::Headers::Generic(param);
+ newheader = new KMime::Headers::Generic(param.constData());
}
newheader->fromUnicodeString(newValue, "utf-8");
msg->setHeader(newheader);
diff --git a/src/filter/filteractions/filteractionwithcommand.cpp \
b/src/filter/filteractions/filteractionwithcommand.cpp index ac0038c..93e94e7 100644
--- a/src/filter/filteractions/filteractionwithcommand.cpp
+++ b/src/filter/filteractions/filteractionwithcommand.cpp
@@ -156,7 +156,7 @@ void substituteMessageHeaders(const KMime::Message::Ptr &aMsg, \
QString &result)
QRegExp header_rx(QStringLiteral("%\\{([a-z0-9-]+)\\}"), Qt::CaseInsensitive);
int idx = 0;
while ((idx = header_rx.indexIn(result, idx)) != -1) {
- const KMime::Headers::Base *header = \
aMsg->headerByType(header_rx.cap(1).toLatin1()); + const KMime::Headers::Base \
*header = aMsg->headerByType(header_rx.cap(1).toLatin1().constData()); QString \
replacement; if (header) {
replacement = \
KShell::quoteArg(QString::fromLatin1(header->as7BitString()));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic