wilderjds
/
mailcommon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start to make it compile with QT_NO_CAST_FROM_BYTEARRAY

Browse Source
wilder
Montel Laurent 9 years ago
parent ea174ddccc
commit 66357f0974
6 changed files with 49 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/filter/filteractions/filteractionaddheader.cpp
  2. 4
      src/search/searchpattern.cpp
  3. 4
      src/search/searchrule/searchrule.cpp
  4. 8
      src/search/searchrule/searchrulenumerical.cpp
  5. 76
      src/search/searchrule/searchrulestring.cpp
  6. 4
      src/snippets/snippetsmanager.cpp

2
src/filter/filteractions/filteractionaddheader.cpp
Unescape View File

@ -59,7 +59,7 @@ FilterAction::ReturnCode FilterActionAddHeader::process(ItemContext &context, bo
KMime::Headers::Base *header = KMime::Headers::createHeader(mParameter.toLatin1());
if (!header) {
header = new KMime::Headers::Generic(mParameter.toLatin1());
header = new KMime::Headers::Generic(mParameter.toLatin1().constData());
}
header->fromUnicodeString(mValue, "utf-8");

4
src/search/searchpattern.cpp
Unescape View File

@ -178,7 +178,7 @@ void SearchPattern::importLegacyConfig(const KConfigGroup &config)
SearchRule::Ptr rule =
SearchRule::createInstance(
config.readEntry("fieldA").toLatin1(),
config.readEntry("funcA").toLatin1(),
config.readEntry("funcA").toLatin1().constData(),
config.readEntry("contentsA"));
if (rule->isEmpty()) {
@ -196,7 +196,7 @@ void SearchPattern::importLegacyConfig(const KConfigGroup &config)
rule =
SearchRule::createInstance(
config.readEntry("fieldB").toLatin1(),
config.readEntry("funcB").toLatin1(),
config.readEntry("funcB").toLatin1().constData(),
config.readEntry("contentsB"));
if (rule->isEmpty()) {

4
src/search/searchrule/searchrule.cpp
Unescape View File

@ -119,7 +119,7 @@ SearchRule::Ptr SearchRule::createInstanceFromConfig(const KConfigGroup &config,
static const QString contents = QStringLiteral("contents");
const QByteArray &field2 = config.readEntry(field + cIdx, QString()).toLatin1();
Function func2 = configValueToFunc(config.readEntry(func + cIdx, QString()).toLatin1());
Function func2 = configValueToFunc(config.readEntry(func + cIdx, QString()).toLatin1().constData());
const QString &contents2 = config.readEntry(contents + cIdx, QString());
if (field2 == "<To or Cc>") { // backwards compat
@ -135,7 +135,7 @@ SearchRule::Ptr SearchRule::createInstance(QDataStream &s)
s >> field;
QString function;
s >> function;
Function func = configValueToFunc(function.toUtf8());
Function func = configValueToFunc(function.toUtf8().constData());
QString contents;
s >> contents;
return createInstance(field, func, contents);

8
src/search/searchrule/searchrulenumerical.cpp
Unescape View File

@ -58,11 +58,11 @@ bool SearchRuleNumerical::matches(const Akonadi::Item &item) const
qint64 numericalMsgContents = 0;
qint64 numericalValue = 0;
if (qstricmp(field(), "<size>") == 0) {
if (qstricmp(field().constData(), "<size>") == 0) {
numericalMsgContents = item.size();
numericalValue = contents().toLongLong();
msgContents.setNum(numericalMsgContents);
} else if (qstricmp(field(), "<age in days>") == 0) {
} else if (qstricmp(field().constData(), "<age in days>") == 0) {
QDateTime msgDateTime = msg->date()->dateTime();
numericalMsgContents = msgDateTime.daysTo(QDateTime::currentDateTime());
numericalValue = contents().toInt();
@ -141,11 +141,11 @@ void SearchRuleNumerical::addQueryTerms(Akonadi::SearchTerm &groupTerm, bool &em
{
using namespace Akonadi;
emptyIsNotAnError = false;
if (qstricmp(field(), "<size>") == 0) {
if (qstricmp(field().constData(), "<size>") == 0) {
EmailSearchTerm term(EmailSearchTerm::ByteSize, contents().toInt(), akonadiComparator());
term.setIsNegated(isNegated());
groupTerm.addSubTerm(term);
} else if (qstricmp(field(), "<age in days>") == 0) {
} else if (qstricmp(field().constData(), "<age in days>") == 0) {
QDate date(QDate::currentDate());
date = date.addDays(contents().toInt());
EmailSearchTerm term(EmailSearchTerm::HeaderOnlyDate, date, akonadiComparator());

76
src/search/searchrule/searchrulestring.cpp
Unescape View File

@ -73,23 +73,23 @@ SearchRule::RequiredPart SearchRuleString::requiredPart() const
{
const QByteArray f = field();
SearchRule::RequiredPart part = Header;
if (qstricmp(f, "<recipients>") == 0 ||
qstricmp(f, "<status>") == 0 ||
qstricmp(f, "<tag>") == 0 ||
qstricmp(f, "subject") == 0 ||
qstricmp(f, "from") == 0 ||
qstricmp(f, "sender") == 0 ||
qstricmp(f, "reply-to") == 0 ||
qstricmp(f, "to") == 0 ||
qstricmp(f, "cc") == 0 ||
qstricmp(f, "bcc") == 0 ||
qstricmp(f, "in-reply-to") == 0 ||
qstricmp(f, "message-id") == 0 ||
qstricmp(f, "references") == 0) {
if (qstricmp(f.constData(), "<recipients>") == 0 ||
qstricmp(f.constData(), "<status>") == 0 ||
qstricmp(f.constData(), "<tag>") == 0 ||
qstricmp(f.constData(), "subject") == 0 ||
qstricmp(f.constData(), "from") == 0 ||
qstricmp(f.constData(), "sender") == 0 ||
qstricmp(f.constData(), "reply-to") == 0 ||
qstricmp(f.constData(), "to") == 0 ||
qstricmp(f.constData(), "cc") == 0 ||
qstricmp(f.constData(), "bcc") == 0 ||
qstricmp(f.constData(), "in-reply-to") == 0 ||
qstricmp(f.constData(), "message-id") == 0 ||
qstricmp(f.constData(), "references") == 0) {
// these fields are directly provided by KMime::Message, no need to fetch the whole Header part
part = Envelope;
} else if (qstricmp(f, "<message>") == 0 ||
qstricmp(f, "<body>") == 0) {
} else if (qstricmp(f.constData(), "<message>") == 0 ||
qstricmp(f.constData(), "<body>") == 0) {
part = CompleteMessage;
}
@ -117,16 +117,16 @@ bool SearchRuleString::matches(const Akonadi::Item &item) const
// Overwrite the value for complete messages and all headers!
bool logContents = true;
if (qstricmp(field(), "<message>") == 0) {
if (qstricmp(field().constData(), "<message>") == 0) {
msgContents = msg->encodedContent();
logContents = false;
} else if (qstricmp(field(), "<body>") == 0) {
} else if (qstricmp(field().constData(), "<body>") == 0) {
msgContents = msg->body();
logContents = false;
} else if (qstricmp(field(), "<any header>") == 0) {
} else if (qstricmp(field().constData(), "<any header>") == 0) {
msgContents = msg->head();
logContents = false;
} else if (qstricmp(field(), "<recipients>") == 0) {
} else if (qstricmp(field().constData(), "<recipients>") == 0) {
// (mmutz 2001-11-05) hack to fix "<recipients> !contains foo" to
// meet user's expectations. See FAQ entry in KDE 2.2.2's KMail
// handbook
@ -141,7 +141,7 @@ bool SearchRuleString::matches(const Akonadi::Item &item) const
msgContents = msg->to()->asUnicodeString();
msgContents += ", " + msg->cc()->asUnicodeString();
msgContents += ", " + msg->bcc()->asUnicodeString();
} else if (qstricmp(field(), "<tag>") == 0) {
} else if (qstricmp(field().constData(), "<tag>") == 0) {
//port?
// const Nepomuk2::Resource res( item.url() );
// foreach ( const Nepomuk2::Tag &tag, res.tags() ) {
@ -152,7 +152,7 @@ bool SearchRuleString::matches(const Akonadi::Item &item) const
// make sure to treat messages with multiple header lines for
// the same header correctly
msgContents = "";
if (auto hrd = msg->headerByType(field())) {
if (auto hrd = msg->headerByType(field().constData())) {
msgContents = hrd->asUnicodeString();
}
}
@ -161,7 +161,7 @@ bool SearchRuleString::matches(const Akonadi::Item &item) const
function() == FuncIsNotInAddressbook) {
// I think only the "from"-field makes sense.
msgContents = "";
if (auto hrd = msg->headerByType(field())) {
if (auto hrd = msg->headerByType(field().constData())) {
msgContents = hrd->asUnicodeString();
}
@ -195,43 +195,43 @@ void SearchRuleString::addQueryTerms(Akonadi::SearchTerm &groupTerm, bool &empty
using namespace Akonadi;
emptyIsNotAnError = false;
SearchTerm termGroup(SearchTerm::RelOr);
if (qstricmp(field(), "subject") == 0) {
if (qstricmp(field().constData(), "subject") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Subject, contents(), akonadiComparator()));
} else if (qstricmp(field(), "reply-to") == 0) {
} else if (qstricmp(field().constData(), "reply-to") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderReplyTo, contents(), akonadiComparator()));
} else if (qstricmp(field(), "<message>") == 0) {
} else if (qstricmp(field().constData(), "<message>") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Message, contents(), akonadiComparator()));
} else if (field() == "<body>") {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Body, contents(), akonadiComparator()));
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Attachment, contents(), akonadiComparator()));
} else if (qstricmp(field(), "<recipients>") == 0) {
} else if (qstricmp(field().constData(), "<recipients>") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderTo, contents(), akonadiComparator()));
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderCC, contents(), akonadiComparator()));
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderBCC, contents(), akonadiComparator()));
} else if (qstricmp(field(), "<any header>") == 0) {
} else if (qstricmp(field().constData(), "<any header>") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Headers, contents(), akonadiComparator()));
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::Subject, contents(), akonadiComparator()));
} else if (qstricmp(field(), "to") == 0) {
} else if (qstricmp(field().constData(), "to") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderTo, contents(), akonadiComparator()));
} else if (qstricmp(field(), "cc") == 0) {
} else if (qstricmp(field().constData(), "cc") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderCC, contents(), akonadiComparator()));
} else if (qstricmp(field(), "bcc") == 0) {
} else if (qstricmp(field().constData(), "bcc") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderBCC, contents(), akonadiComparator()));
} else if (qstricmp(field(), "from") == 0) {
} else if (qstricmp(field().constData(), "from") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderFrom, contents(), akonadiComparator()));
} else if (qstricmp(field(), "list-id") == 0) {
} else if (qstricmp(field().constData(), "list-id") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderListId, contents(), akonadiComparator()));
} else if (qstricmp(field(), "resent-from") == 0) {
} else if (qstricmp(field().constData(), "resent-from") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderResentFrom, contents(), akonadiComparator()));
} else if (qstricmp(field(), "x-loop") == 0) {
} else if (qstricmp(field().constData(), "x-loop") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderXLoop, contents(), akonadiComparator()));
} else if (qstricmp(field(), "x-mailing-list") == 0) {
} else if (qstricmp(field().constData(), "x-mailing-list") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderXMailingList, contents(), akonadiComparator()));
} else if (qstricmp(field(), "x-spam-flag") == 0) {
} else if (qstricmp(field().constData(), "x-spam-flag") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderXSpamFlag, contents(), akonadiComparator()));
} else if (qstricmp(field(), "organization") == 0) {
} else if (qstricmp(field().constData(), "organization") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::HeaderOrganization, contents(), akonadiComparator()));
} else if (qstricmp(field(), "<tag>") == 0) {
} else if (qstricmp(field().constData(), "<tag>") == 0) {
termGroup.addSubTerm(EmailSearchTerm(EmailSearchTerm::MessageTag, contents(), akonadiComparator()));
}

4
src/snippets/snippetsmanager.cpp
Unescape View File

@ -366,7 +366,7 @@ void SnippetsManager::Private::insertSelectedSnippet()
}
const QString text = replaceVariables(index.data(SnippetsModel::TextRole).toString());
QMetaObject::invokeMethod(mEditor, mEditorInsertMethod, Qt::DirectConnection,
QMetaObject::invokeMethod(mEditor, mEditorInsertMethod.constData(), Qt::DirectConnection,
Q_ARG(QString, text));
}
@ -382,7 +382,7 @@ void SnippetsManager::Private::insertActionSnippet()
}
const QString text = replaceVariables(action->property("snippetText").toString());
QMetaObject::invokeMethod(mEditor, mEditorInsertMethod, Qt::DirectConnection,
QMetaObject::invokeMethod(mEditor, mEditorInsertMethod.constData(), Qt::DirectConnection,
Q_ARG(QString, text));
}

Write Preview
Loading…
Cancel
Save