Merge branch 'master' into kf6

diff --cc src/dolphinmainwindow.cpp
Simple merge

diff --cc src/kitemviews/kitemlistview.cpp
Simple merge

diff --cc src/kitemviews/kstandarditemlistwidget.cpp
index 52df17ad32ca6b3e495140f5574ee93bc51cdf39,0088e4116b34e2ab732e95d588de393b3b001a52..e37013f95fe88562313c8c42e1bd7cd72c165b9d
--- 1/src/kitemviews/kstandarditemlistwidget.cpp
--- 2/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@@ -1347,8 -1357,8 +1357,8 @@@ void KStandardItemListWidget::updateCom
      const qreal x = option.padding * 3 + iconSize();
      qreal y = qRound((widgetHeight - textLinesHeight) / 2);
      const qreal maxWidth = size().width() - x - option.padding;
 -    for (const QByteArray &role : qAsConst(m_sortedVisibleRoles)) {
 +    for (const QByteArray &role : std::as_const(m_sortedVisibleRoles)) {
-         const QString text = roleText(role, values);
+         const QString text = escapeString(roleText(role, values));
          TextInfo *textInfo = m_textInfo.value(role);
          textInfo->staticText.setText(text);
  

diff --cc src/kitemviews/kstandarditemlistwidget.h
Simple merge

diff --cc src/settings/contextmenu/contextmenusettingspage.cpp
index 68073a16e36ac05178c3fd717b8b111b2e73c961,c81078095c1574e3023faf5a7c80bd41e196afc8..a1fada2adc8c4dde1a6e2d6b29163be2ab18c95f
--- 1/src/settings/contextmenu/contextmenusettingspage.cpp
--- 2/src/settings/contextmenu/contextmenusettingspage.cpp
+++ b/src/settings/contextmenu/contextmenusettingspage.cpp
@@@ -170,11 -176,10 +170,10 @@@ void ContextMenuSettingsPage::applySett
  
      QStringList enabledPlugins;
  
-     const QAbstractItemModel *model = m_listView->model();
-     for (int i = 0; i < model->rowCount(); ++i) {
-         const QModelIndex index = model->index(i, 0);
-         const QString service = model->data(index, ServiceModel::DesktopEntryNameRole).toString();
-         const bool checked = model->data(index, Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked;
+     for (int i = 0; i < m_serviceModel->rowCount(); ++i) {
+         const QModelIndex index = m_serviceModel->index(i, 0);
+         const QString service = m_serviceModel->data(index, ServiceModel::DesktopEntryNameRole).toString();
 -        const bool checked = m_serviceModel->data(index, Qt::CheckStateRole).toBool();
++        const bool checked = m_serviceModel->data(index, Qt::CheckStateRole).value<Qt::CheckState>() == Qt::Checked;
  
          if (service.startsWith(VersionControlServicePrefix)) {
              if (checked) {
@@@ -230,7 -234,7 +228,7 @@@ void ContextMenuSettingsPage::restoreDe
  
          const bool checked =
              !service.startsWith(VersionControlServicePrefix) && service != QLatin1String(DeleteService) && service != QLatin1String(CopyToMoveToService);
-         model->setData(index, checked ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole);
 -        m_serviceModel->setData(index, checked, Qt::CheckStateRole);
++        m_serviceModel->setData(index, checked ? Qt::Checked : Qt::Unchecked, Qt::CheckStateRole);
      }
  }
  

diff --cc src/views/dolphinview.cpp
Simple merge

diff --cc src/views/dolphinviewactionhandler.cpp
Simple merge