github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-31 12:00:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up usage of static keyword

Browse source 
They are either misused or redundant, so remove it.
This commit is contained in:
Chocobo1 2022-05-27 03:46:14 +08:00
parent c2c17fd053
commit 73faf67084
No known key found for this signature in database
GPG key ID: 210D9C873253A68C
14 changed files with 106 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/gui/torrentcontentmodel.cpp
View file

@ -69,14 +69,20 @@ namespace
class UnifiedFileIconProvider : public QFileIconProvider
{
public:
UnifiedFileIconProvider()
: m_textPlainIcon {UIThemeManager::instance()->getIcon(u"text-plain"_qs)}
{
}
using QFileIconProvider::icon;
QIcon icon(const QFileInfo &info) const override
QIcon icon(const QFileInfo &) const override
{
Q_UNUSED(info);
static QIcon cached = UIThemeManager::instance()->getIcon(u"text-plain"_qs);
return cached;
return m_textPlainIcon;
}
private:
QIcon m_textPlainIcon;
};
#ifdef QBT_PIXMAP_CACHE_FOR_FILE_ICONS
@ -185,15 +191,14 @@ namespace
TorrentContentModel::TorrentContentModel(QObject *parent)
: QAbstractItemModel(parent)
, m_rootItem(new TorrentContentModelFolder(QVector<QString>({ tr("Name"), tr("Total Size"), tr("Progress"), tr("Download Priority"), tr("Remaining"), tr("Availability") })))
{
#if defined(Q_OS_WIN)
m_fileIconProvider = new WinShellFileIconProvider();
, m_fileIconProvider {new WinShellFileIconProvider}
#elif defined(Q_OS_MACOS)
m_fileIconProvider = new MacFileIconProvider();
, m_fileIconProvider {new MacFileIconProvider}
#else
static bool doesBuiltInProviderWork = doesQFileIconProviderWork();
m_fileIconProvider = doesBuiltInProviderWork ? new QFileIconProvider() : new MimeFileIconProvider();
, m_fileIconProvider {doesQFileIconProviderWork() ? new QFileIconProvider : new MimeFileIconProvider}
#endif
{
}
TorrentContentModel::~TorrentContentModel()