summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2015-08-28 13:24:05 +0200
committerMontel Laurent <[email protected]>2015-08-28 13:59:35 +0200
commit5581d418c219dae7a78d38ef6eed62391e13dbc7 (patch)
tree748ac8553d992faaa2ac0c0235fef20ddd6f95c4
parent6f59339d66e2f34d8de6e43aed0d07b535e129d3 (diff)
Remove not gui settings
-rw-r--r--messageviewer/grantleefilters/messageheaderfilter.cpp9
-rw-r--r--messageviewer/header/fancyheaderstyle.cpp9
-rw-r--r--messageviewer/header/grantleeheaderformatter.cpp9
3 files changed, 9 insertions, 18 deletions
diff --git a/messageviewer/grantleefilters/messageheaderfilter.cpp b/messageviewer/grantleefilters/messageheaderfilter.cpp
index 2863c82..02b729e 100644
--- a/messageviewer/grantleefilters/messageheaderfilter.cpp
+++ b/messageviewer/grantleefilters/messageheaderfilter.cpp
@@ -53,18 +53,15 @@ QVariant MessageHeaderEmailExpandable::doFilter(const QVariant &input, const QVa
Q_UNUSED(argument);
if (input.value<KMime::Headers::Cc *>()) {
const QVariant val = MessageCore::StringUtil::emailAddrAsAnchor(input.value<KMime::Headers::Cc *>(), MessageCore::StringUtil::DisplayFullAddress, QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList")
- /*GlobalSettings::self()->numberOfAddressesToShow()*/);
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
return val;
} else if (input.value<KMime::Headers::To *>()) {
const QVariant val = MessageCore::StringUtil::emailAddrAsAnchor(input.value<KMime::Headers::To *>(), MessageCore::StringUtil::DisplayFullAddress, QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList")
- /*GlobalSettings::self()->numberOfAddressesToShow()*/);
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
return val;
} else if (input.value<KMime::Headers::Bcc *>()) {
const QVariant val = MessageCore::StringUtil::emailAddrAsAnchor(input.value<KMime::Headers::Bcc *>(), MessageCore::StringUtil::DisplayFullAddress, QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList")
- /*GlobalSettings::self()->numberOfAddressesToShow()*/);
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
return val;
} else {
qDebug() << " invalid pointer";
diff --git a/messageviewer/header/fancyheaderstyle.cpp b/messageviewer/header/fancyheaderstyle.cpp
index 7b4a170..2fd67c0 100644
--- a/messageviewer/header/fancyheaderstyle.cpp
+++ b/messageviewer/header/fancyheaderstyle.cpp
@@ -138,13 +138,11 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
if (message->headerByType("Resent-To")) {
to = StringUtil::emailAddrAsAnchor(resentTo, StringUtil::DisplayFullAddress) + QLatin1Char(' ') + i18n("(receiver was %1)", StringUtil::emailAddrAsAnchor(message->to(), StringUtil::DisplayFullAddress,
QString(), StringUtil::ShowLink, StringUtil::ExpandableAddresses,
- QStringLiteral("FullToAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow()));
+ QStringLiteral("FullToAddressList")));
} else {
to = StringUtil::emailAddrAsAnchor(message->to(), StringUtil::DisplayFullAddress,
QString(), StringUtil::ShowLink, StringUtil::ExpandableAddresses,
- QStringLiteral("FullToAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow());
+ QStringLiteral("FullToAddressList"));
}
headerStr.append(QStringLiteral("<tr><th>%1</th>\n"
@@ -160,8 +158,7 @@ QString FancyHeaderStyle::format(KMime::Message *message) const
.arg(i18n("CC: "))
.arg(StringUtil::emailAddrAsAnchor(message->cc(), StringUtil::DisplayFullAddress,
QString(), StringUtil::ShowLink, StringUtil::ExpandableAddresses,
- QStringLiteral("FullCcAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow())));
+ QStringLiteral("FullCcAddressList"))));
// Bcc line, if any
if (strategy->showHeader(QStringLiteral("bcc")) && message->bcc(false))
diff --git a/messageviewer/header/grantleeheaderformatter.cpp b/messageviewer/header/grantleeheaderformatter.cpp
index eb4c597..3ba3099 100644
--- a/messageviewer/header/grantleeheaderformatter.cpp
+++ b/messageviewer/header/grantleeheaderformatter.cpp
@@ -114,8 +114,7 @@ QString GrantleeHeaderFormatter::format(const QString &absolutePath, Grantlee::T
headerObject.insert(QStringLiteral("toStr"), message->to()->asUnicodeString());
const QString val = MessageCore::StringUtil::emailAddrAsAnchor(message->to(), MessageCore::StringUtil::DisplayFullAddress,
QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow());
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
headerObject.insert(QStringLiteral("toExpandable"), val);
headerObject.insert(QStringLiteral("toMailbox"), QVariant::fromValue(message->to()));
@@ -132,8 +131,7 @@ QString GrantleeHeaderFormatter::format(const QString &absolutePath, Grantlee::T
headerObject.insert(QStringLiteral("ccMailbox"), QVariant::fromValue(message->cc()));
const QString val = MessageCore::StringUtil::emailAddrAsAnchor(message->cc(), MessageCore::StringUtil::DisplayFullAddress,
QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow());
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
headerObject.insert(QStringLiteral("ccExpandable"), val);
}
@@ -144,8 +142,7 @@ QString GrantleeHeaderFormatter::format(const QString &absolutePath, Grantlee::T
headerObject.insert(QStringLiteral("bccMailbox"), QVariant::fromValue(message->bcc()));
const QString val = MessageCore::StringUtil::emailAddrAsAnchor(message->bcc(), MessageCore::StringUtil::DisplayFullAddress,
QString(), MessageCore::StringUtil::ShowLink,
- MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"),
- GlobalSettings::self()->numberOfAddressesToShow());
+ MessageCore::StringUtil::ExpandableAddresses, QStringLiteral("FullToAddressList"));
headerObject.insert(QStringLiteral("bccExpandable"), val);
}
headerObject.insert(QStringLiteral("fromi18n"), i18n("From:"));