Verified Commit 9293ba6e authored by Jonah Brüchert's avatar Jonah Brüchert 🌳
Browse files

Port QSet related deprecation warnings


Reviewed-by: Alexander Akulich's avatarAlexander Akulich <akulichalexander@gmail.com>
parent 5c912eda
......@@ -211,7 +211,7 @@ void KTp::ContactsListModel::onContactsChanged(const Tp::Contacts &added, const
if (added.size() > 0) {
beginInsertRows(QModelIndex(), d->contacts.size(), d->contacts.size() + added.size() -1);
d->contacts.append(added.toList());
d->contacts.append(added.values());
endInsertRows();
}
......
......@@ -47,7 +47,11 @@ QSet<QString> KTp::GroupsTreeProxyModel::groupsForIndex(const QModelIndex &sourc
groups.append(QLatin1String("_unsorted"));
}
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
return groups.toSet();
#else
return QSet<QString>(groups.begin(), groups.end());
#endif
}
......
......@@ -172,10 +172,8 @@ bool KPeopleTranslationProxy::filterAcceptsRow(int source_row, const QModelIndex
return !sourceIndex.data(KPeople::PersonsModel::PersonVCardRole).value<KPeople::AbstractContact::Ptr>()->customProperty(S_KPEOPLE_PROPERTY_PRESENCE).isNull();
}
QVariant KPeopleTranslationProxy::translatePresence(const QVariant &presenceName) const
QVariant KPeopleTranslationProxy::translatePresence(const QVariant &/*presenceName*/) const
{
return Tp::ConnectionPresenceTypeOffline;
}
......
......@@ -94,12 +94,12 @@ MessageFilterConfigManager::~MessageFilterConfigManager()
KPluginInfo::List MessageFilterConfigManager::allPlugins() const
{
return d->all.toList();
return d->all.values();
}
KPluginInfo::List MessageFilterConfigManager::enabledPlugins() const
{
return d->enabled.toList();
return d->enabled.values();
}
KConfigGroup MessageFilterConfigManager::configGroup() const
......
......@@ -84,7 +84,7 @@ void MainWindow::onAccountManagerBecameReady(Tp::PendingOperation* op)
void MainWindow::initConnectionManagerTabs(const QSet<QString>& connectionManagerSet)
{
QStringList connectionManagerStringList = connectionManagerSet.toList();
QStringList connectionManagerStringList = connectionManagerSet.values();
std::sort(connectionManagerStringList.begin(), connectionManagerStringList.end());
Q_FOREACH(QString connectionManager, connectionManagerStringList) {
......
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