Port away from deprecated KBookmarksmenu API

[dolphin.git] / src / settings / services / servicessettingspage.cpp

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 45acccd9fd1f6ec6624aeefab15512488ef3b32d..1f8310dfc74a5fc8ea63423403992f2a475cff71 100644 (file)
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -36,6 +36,7 @@
 #include <QGridLayout>
 #include <QLabel>
 #include <QListWidget>
+#include <QShowEvent>
 #include <QSortFilterProxyModel>
 
 namespace
@@ -82,7 +83,7 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
     topLayout->addWidget(downloadButton);
 
     m_enabledVcsPlugins = VersionControlSettings::enabledPlugins();
-    qSort(m_enabledVcsPlugins);
+    std::sort(m_enabledVcsPlugins.begin(), m_enabledVcsPlugins.end());
 }
 
 ServicesSettingsPage::~ServicesSettingsPage()
@@ -222,7 +223,7 @@ void ServicesSettingsPage::loadServices()
 
     // Load JSON-based plugins that implement the KFileItemActionPlugin interface
     const auto jsonPlugins = KPluginLoader::findPlugins(QStringLiteral("kf5/kfileitemaction"), [](const KPluginMetaData& metaData) {
-        return metaData.serviceTypes().contains(QStringLiteral("KFileItemAction/Plugin"));
+        return metaData.serviceTypes().contains(QLatin1String("KFileItemAction/Plugin"));
     });
 
     foreach (const auto& jsonMetadata, jsonPlugins) {