Browse Source

Merge pull request #9611 from Chocobo1/fixes

Fix minor defects
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
commit
649798c989
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/base/search/searchpluginmanager.cpp
  2. 2
      src/base/unicodestrings.h
  3. 4
      src/gui/categoryfilterwidget.h
  4. 2
      src/gui/transferlistmodel.h

4
src/base/search/searchpluginmanager.cpp

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

2
src/base/unicodestrings.h

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

4
src/gui/categoryfilterwidget.h

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

2
src/gui/transferlistmodel.h

@ -86,7 +86,7 @@ public:
int rowCount(const QModelIndex& index = QModelIndex()) const override; int rowCount(const QModelIndex& index = QModelIndex()) const override;
int columnCount(const QModelIndex &parent=QModelIndex()) const override; int columnCount(const QModelIndex &parent=QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) 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; QVariant headerData(int section, Qt::Orientation orientation, int role) const override;
Qt::ItemFlags flags(const QModelIndex &index) const override; Qt::ItemFlags flags(const QModelIndex &index) const override;

Loading…
Cancel
Save