Merge pull request #9611 from Chocobo1/fixes

Fix minor defects

src/base/search/searchpluginmanager.cpp

@@ -145,8 +145,8 @@ QStringList SearchPluginManager::getPluginCategories(const QString &pluginName)
         plugins << pluginName.trimmed();
 
     QSet<QString> categories;
-    for (const QString &pluginName : qAsConst(plugins)) {
-        const PluginInfo *plugin = pluginInfo(pluginName);
+    for (const QString &name : qAsConst(plugins)) {
+        const PluginInfo *plugin = pluginInfo(name);
         if (!plugin) continue; // plugin wasn't found
         for (const QString &category : plugin->supportedCategories)
             categories << category;

src/base/unicodestrings.h

@@ -26,6 +26,8 @@
  * exception statement from your version.
  */
 
+#pragma once
+
 // This file must be encoded in "UTF-8 with BOM"
 #ifdef _MSC_VER
 #pragma execution_character_set("utf-8")

src/gui/categoryfilterwidget.h

@@ -26,6 +26,8 @@
  * exception statement from your version.
  */
 
+#pragma once
+
 #include <QTreeView>
 
 class CategoryFilterWidget : public QTreeView

src/gui/transferlistmodel.h

@@ -86,7 +86,7 @@ public:
     int rowCount(const QModelIndex& index = QModelIndex()) const override;
     int columnCount(const QModelIndex &parent=QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::DisplayRole) override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
     QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;