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

Merge remote-tracking branch 'origin/release/20.08' into master

parents a981ab1a e91ddcc8
Pipeline #31866 passed with stage
in 11 minutes and 29 seconds
......@@ -111,7 +111,7 @@ void ConfigurePluginsListWidget::fillTopItems(const QVector<PimCommon::PluginUti
{
itemsList.clear();
if (!lst.isEmpty()) {
QTreeWidgetItem *topLevel = new QTreeWidgetItem(mListWidget, QStringList() << topLevelItemName);
QTreeWidgetItem *topLevel = new QTreeWidgetItem(mListWidget, {topLevelItemName});
topLevel->setFlags(topLevel->flags() & ~Qt::ItemIsSelectable);
const QPair<QStringList, QStringList> pair = PimCommon::PluginUtil::loadPluginSetting(groupName, prefixKey);
for (const PimCommon::PluginUtilData &data : lst) {
......
......@@ -421,7 +421,7 @@ void AddresseeLineEdit::groupExpandResult(KJob *job)
const KContacts::Addressee::List contacts = expandJob->contacts();
for (const KContacts::Addressee &addressee : contacts) {
if (d->expandIntern() || text().trimmed().isEmpty()) {
insertEmails(QStringList() << addressee.fullEmail());
insertEmails({addressee.fullEmail()});
} else {
Q_EMIT addAddress(addressee.fullEmail());
}
......@@ -646,7 +646,7 @@ void AddresseeLineEdit::loadContacts()
}
addr.setNameFromString(name);
addr.insertEmail(email, true);
addContact(QStringList() << email, addr, weight, idx);
addContact({email}, addr, weight, idx);
}
} else {
removeCompletionSource(recentAddressGroupName);
......
......@@ -42,7 +42,7 @@ void BlackListBalooEmailListTest::shouldFillListEmail()
void BlackListBalooEmailListTest::shouldFillListWithAlreadyBlackListedEmail()
{
PimCommon::BlackListBalooEmailList blackList;
QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("bla@kde.org") << QStringLiteral("bli@kde.org");
const QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("bla@kde.org") << QStringLiteral("bli@kde.org");
blackList.setEmailBlackList(emails);
QCOMPARE(blackList.setEmailFound(emails), 3);
......@@ -73,7 +73,7 @@ void BlackListBalooEmailListTest::shouldReturnChangedItems()
void BlackListBalooEmailListTest::shouldNotAddDuplicateEmails()
{
PimCommon::BlackListBalooEmailList blackList;
QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("bli@kde.org") << QStringLiteral("bli@kde.org");
const QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("bli@kde.org") << QStringLiteral("bli@kde.org");
blackList.setEmailBlackList(emails);
QCOMPARE(blackList.setEmailFound(emails), 2);
......@@ -100,7 +100,7 @@ void BlackListBalooEmailListTest::shouldExcludeDomain()
void BlackListBalooEmailListTest::shouldAvoidSameEmailWithDifferentCase()
{
PimCommon::BlackListBalooEmailList blackList;
QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("Foo@kde.org") << QStringLiteral("foo@kde.ORG");
const QStringList emails = QStringList() << QStringLiteral("foo@kde.org") << QStringLiteral("Foo@kde.org") << QStringLiteral("foo@kde.ORG");
QCOMPARE(blackList.setEmailFound(emails), 1);
QCOMPARE(blackList.count(), 1);
......@@ -109,7 +109,7 @@ void BlackListBalooEmailListTest::shouldAvoidSameEmailWithDifferentCase()
void BlackListBalooEmailListTest::shouldAvoidSameEmailWithDisplayNameOrNot()
{
PimCommon::BlackListBalooEmailList blackList;
QStringList emails = QStringList() << QStringLiteral("foo@kde.org")
const QStringList emails = QStringList() << QStringLiteral("foo@kde.org")
<< QStringLiteral("Bla Blo <Foo@kde.org>");
QCOMPARE(blackList.setEmailFound(emails), 1);
......
......@@ -357,8 +357,7 @@ void CompletionOrderWidget::loadCompletionItems()
descendantsProxy->setSourceModel(model);
Akonadi::CollectionFilterProxyModel *mimeTypeProxy = new Akonadi::CollectionFilterProxyModel(this);
mimeTypeProxy->addMimeTypeFilters(QStringList() << KContacts::Addressee::mimeType()
<< KContacts::ContactGroup::mimeType());
mimeTypeProxy->addMimeTypeFilters({KContacts::Addressee::mimeType(), KContacts::ContactGroup::mimeType()});
mimeTypeProxy->setSourceModel(descendantsProxy);
mimeTypeProxy->setExcludeVirtualCollections(true);
......
......@@ -57,7 +57,7 @@ CheckedCollectionWidget::CheckedCollectionWidget(const QString &mimetype, QWidge
Akonadi::CollectionFilterProxyModel *mimeTypeProxy = new Akonadi::CollectionFilterProxyModel(this);
mimeTypeProxy->setExcludeVirtualCollections(true);
mimeTypeProxy->addMimeTypeFilters(QStringList() << mimetype);
mimeTypeProxy->addMimeTypeFilters({mimetype});
mimeTypeProxy->setSourceModel(d->mEntityTreeModel);
// Create the Check proxy model.
......
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