Make various small changes

src/konqfactory.cpp

@@ -183,7 +183,7 @@ void KonqFactory::getOffers(const QString &serviceType, QVector<KPluginMetaData>
     }
 
     if (partServiceOffers) {
-        QVector<KPluginMetaData> offers = KParts::PartLoader::partsForMimeType(serviceType);
+        const QVector<KPluginMetaData> offers = KParts::PartLoader::partsForMimeType(serviceType);
 
         //If a part has both JSON metadata and a .desktop file, partsForMimeType return the plugin twice. To avoid this, we remove the duplicate entries
         //We can't use std::unique because it requires the vector to be sorted but we can't do that because the entries are sorted according to user
@@ -191,7 +191,10 @@ void KonqFactory::getOffers(const QString &serviceType, QVector<KPluginMetaData>
         //TODO: remove when .desktop files for parts aren't supported anymore (KF6)
         QVector<KPluginMetaData> uniqueOffers;
         for (const KPluginMetaData &md : offers) {
-            if (!std::any_of(uniqueOffers.constBegin(), uniqueOffers.constEnd(), [md](const KPluginMetaData &md2){return md.pluginId() == md2.pluginId();})) {
+            auto comparison = [md](const KPluginMetaData &md2){
+                return md.pluginId() == md2.pluginId();
+            };
+            if (!std::any_of(uniqueOffers.constBegin(), uniqueOffers.constEnd(), comparison)) {
                 uniqueOffers.append(md);
             }
         }

src/konqguiclients.cpp

@@ -48,14 +48,14 @@ PopupMenuGUIClient::PopupMenuGUIClient(const QVector<KPluginMetaData> &embedding
         QList<QAction *> previewActions;
         if (embeddingServices.count() == 1) {
             KPluginMetaData service = embeddingServices.first();
-            QAction *act = addEmbeddingService(0, i18n("Preview &in %1", service.name()), service);
+            QAction *act = addEmbeddingPlugin(0, i18n("Preview &in %1", service.name()), service);
             previewActions.append(act);
         } else if (embeddingServices.count() > 1) {
             QVector<KPluginMetaData>::ConstIterator it = embeddingServices.begin();
             const QVector<KPluginMetaData>::ConstIterator end = embeddingServices.end();
             int idx = 0;
             for (; it != end; ++it, ++idx) {
-                QAction *act = addEmbeddingService(idx, (*it).name(), *it);
+                QAction *act = addEmbeddingPlugin(idx, (*it).name(), *it);
                 previewActions.append(act);
             }
         }
@@ -68,11 +68,11 @@ PopupMenuGUIClient::~PopupMenuGUIClient()
 {
 }
 
-QAction *PopupMenuGUIClient::addEmbeddingService(int idx, const QString &name, const KPluginMetaData &service)
+QAction *PopupMenuGUIClient::addEmbeddingPlugin(int idx, const QString &name, const KPluginMetaData &plugin)
 {
     QAction *act = m_actionCollection.addAction(QByteArray::number(idx));
     act->setText(name);
-    act->setIcon(QIcon::fromTheme(service.iconName()));
+    act->setIcon(QIcon::fromTheme(plugin.iconName()));
     QObject::connect(act, &QAction::triggered, this, &PopupMenuGUIClient::slotOpenEmbedded);
     return act;
 }

src/konqguiclients.h

@@ -47,7 +47,7 @@ private slots:
     void slotOpenEmbedded();
 
 private:
-    QAction *addEmbeddingService(int idx, const QString &name, const KPluginMetaData &service);
+    QAction *addEmbeddingPlugin(int idx, const QString &name, const KPluginMetaData &plugin);
 
     KActionCollection m_actionCollection;
     QVector<KPluginMetaData>  m_embeddingServices;

src/konqmainwindow.cpp

@@ -40,6 +40,7 @@
 #include "konqurl.h"
 #include "konqbrowserinterface.h"
 #include "urlloader.h"
+#include "pluginmetadatautils.h"
 
 #include <konq_events.h>
 #include <konqpixmapprovider.h>
@@ -4704,7 +4705,7 @@ void KonqMainWindow::updateViewModeActions()
         //If a view provide several actions, its metadata contains an X-Konqueror-Actions-File entry
         //with the path of a .desktop file where the actions are described. The contents of this file
         //are the same as the action-related part of the old part .desktop file
-        QString actionDesktopFile = md.value("X-Konqueror-Actions-File", QString());
+        QString actionDesktopFile = md.value("X-Konqueror-Actions-File");
 
         if (!actionDesktopFile.isEmpty()) {
             KDesktopFile df(QStandardPaths::DataLocation, actionDesktopFile);
@@ -4714,7 +4715,7 @@ void KonqMainWindow::updateViewModeActions()
                 KConfigGroup grp = df.actionGroup(name);
                 QString text = grp.readEntry("Name", QString());
                 QString exec = grp.readEntry("Exec", QString());
-                if (name.isEmpty()) {
+                if (text.isEmpty()) {
                     qCDebug(KONQUEROR_LOG) << "File" << df.fileName() << "doesn't contain a \"name\" entry";
                     continue;
                 }
@@ -5426,10 +5427,9 @@ void KonqMainWindow::updateProxyForWebEngine(bool updateProtocolManager)
         KProtocolManager::reparseConfiguration();
     }
 
-    QVector<KPluginMetaData> parts = KParts::PartLoader::partsForMimeType(QStringLiteral("text/html"));
-    KPluginMetaData part = !parts.isEmpty() ? parts.first() : KPluginMetaData();
-    Q_ASSERT(part.isValid());
-    const bool webengineIsDefault = part.pluginId() == QStringLiteral("webenginepart");
+    KPluginMetaData part = preferredPart(QStringLiteral("text/html"));
+    Q_ASSERT(!part.isValid());
+    const bool webengineIsDefault = part.pluginId() == QLatin1String("webenginepart");
     if (!webengineIsDefault) {
         return;
     }

src/pluginmetadatautils.cpp

@@ -8,6 +8,8 @@
 
 #include "pluginmetadatautils.h"
 
+#include <KParts/PartLoader>
+
 #include <QStringLiteral>
 
 KPluginMetaData findPartById(const QString& id)
@@ -15,6 +17,15 @@ KPluginMetaData findPartById(const QString& id)
     return KPluginMetaData::findPluginById(QStringLiteral("kf5/parts"), id);
 }
 
+KPluginMetaData preferredPart(const QString &mimeType) {
+    QVector<KPluginMetaData> plugins = KParts::PartLoader::partsForMimeType(mimeType);
+    if (!plugins.isEmpty()) {
+        return plugins.first();
+    } else {
+        return KPluginMetaData();
+    }
+}
+
 QDebug operator<<(QDebug debug, const KPluginMetaData& md)
 {
     QDebugStateSaver saver(debug);

src/pluginmetadatautils.h

@@ -15,6 +15,14 @@
 
 KPluginMetaData findPartById(const QString &id);
 
+/**
+ * @brief Finds the meta data for the preferred part to display the given mime type
+ * @param mimeType the mime type
+ * @return the plugin meta data for the preferred part to display @p mimeType or an
+ * invalid @c KPluginMetaData if no part is available for the mime type
+ */
+KPluginMetaData preferredPart(const QString &mimeType);
+
 QDebug operator<<(QDebug debug, const KPluginMetaData &md);
 
 QDebug operator<<(QDebug debug, const QVector<KPluginMetaData> &vec);

src/urlloader.cpp

@@ -33,15 +33,6 @@
 #include <QWebEngineProfile>
 #include <QFileDialog>
 
-static KPluginMetaData preferredPart(const QString &mimeType) {
-    QVector<KPluginMetaData> plugins = KParts::PartLoader::partsForMimeType(mimeType);
-    if (!plugins.isEmpty()) {
-        return plugins.first();
-    } else {
-        return KPluginMetaData();
-    }
-}
-
 bool UrlLoader::embedWithoutAskingToSave(const QString &mimeType)
 {
     static QStringList s_mimeTypes;
@@ -202,7 +193,7 @@ bool UrlLoader::decideEmbedOrSave()
      */
     if (m_dontPassToWebEnginePart && m_part.pluginId() == webEngineName) {
         QVector<KPluginMetaData> parts = KParts::PartLoader::partsForMimeType(m_mimeType);
-        auto findPart = [webEngineName](const KPluginMetaData &md){return md.pluginId() != webEngineName;};
+        auto findPart = [&webEngineName](const KPluginMetaData &md){return md.pluginId() != webEngineName;};
         QVector<KPluginMetaData>::const_iterator partToUse = std::find_if(parts.constBegin(), parts.constEnd(), findPart);
         if (partToUse != parts.constEnd()) {
             m_part = *partToUse;

src/urlloader.h

@@ -65,6 +65,7 @@ public:
     UrlLoader(KonqMainWindow *mainWindow, KonqView *view, const QUrl &url, const QString &mimeType, const KonqOpenURLRequest &req, bool trustedSource, bool forceOpen=false);
     ~UrlLoader();
 
+
     /** @brief Enum describing the possible actions to be taken*/
     enum class OpenUrlAction{
         UnknwonAction, /**< The action hasn't been decided yet */