d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-11 07:18:08 +00:00
Code Issues Projects Releases Wiki Activity

Revise code

Browse Source
This commit is contained in:
Chocobo1 2022-05-27 03:06:04 +08:00
parent 7eaaa8f92a
commit a9f99aed48
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/base/utils/misc.cpp
View File

@ -500,7 +500,7 @@ QString Utils::Misc::opensslVersionString()
#else #else
static const auto version {QString::fromLatin1(SSLeay_version(SSLEAY_VERSION))}; static const auto version {QString::fromLatin1(SSLeay_version(SSLEAY_VERSION))};
#endif #endif
return QStringView(version).split(u' ', Qt::SkipEmptyParts).at(1).toString(); return version.section(u' ', 1, 1);
} }
QString Utils::Misc::zlibVersionString() QString Utils::Misc::zlibVersionString()

38
src/gui/torrentcontentmodel.cpp
View File

@ -91,7 +91,8 @@ namespace
if (!ext.isEmpty()) if (!ext.isEmpty())
{ {
QPixmap cached; QPixmap cached;
if (QPixmapCache::find(ext, &cached)) return {cached}; if (QPixmapCache::find(ext, &cached))
return {cached};
const QPixmap pixmap = pixmapForExtension(ext); const QPixmap pixmap = pixmapForExtension(ext);
if (!pixmap.isNull()) if (!pixmap.isNull())
@ -115,16 +116,17 @@ namespace
QPixmap pixmapForExtension(const QString &ext) const override QPixmap pixmapForExtension(const QString &ext) const override
{ {
const std::wstring extWStr = QString(u'.' + ext).toStdWString(); const std::wstring extWStr = QString(u'.' + ext).toStdWString();
SHFILEINFO sfi {};
HRESULT hr = ::SHGetFileInfoW(extWStr.c_str(), SHFILEINFOW sfi {};
FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), SHGFI_ICON | SHGFI_USEFILEATTRIBUTES); const HRESULT hr = ::SHGetFileInfoW(extWStr.c_str(),
FILE_ATTRIBUTE_NORMAL, &sfi, sizeof(sfi), (SHGFI_ICON | SHGFI_USEFILEATTRIBUTES));
if (FAILED(hr)) if (FAILED(hr))
return {}; return {};
#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
auto iconPixmap = QPixmap::fromImage(QImage::fromHICON(sfi.hIcon)); const auto iconPixmap = QPixmap::fromImage(QImage::fromHICON(sfi.hIcon));
#else #else
QPixmap iconPixmap = QtWin::fromHICON(sfi.hIcon); const QPixmap iconPixmap = QtWin::fromHICON(sfi.hIcon);
#endif #endif
::DestroyIcon(sfi.hIcon); ::DestroyIcon(sfi.hIcon);
return iconPixmap; return iconPixmap;
@ -158,30 +160,24 @@ namespace
return (!testIcon1.isNull() || !testIcon2.isNull()); return (!testIcon1.isNull() || !testIcon2.isNull());
} }
class MimeFileIconProvider : public UnifiedFileIconProvider class MimeFileIconProvider final : public UnifiedFileIconProvider
{ {
using QFileIconProvider::icon; using QFileIconProvider::icon;
QIcon icon(const QFileInfo &info) const override QIcon icon(const QFileInfo &info) const override
{ {
const QMimeType mimeType = m_db.mimeTypeForFile(info, QMimeDatabase::MatchExtension); const QMimeType mimeType = QMimeDatabase().mimeTypeForFile(info, QMimeDatabase::MatchExtension);
QIcon res = QIcon::fromTheme(mimeType.iconName());
if (!res.isNull())
{
return res;
}
res = QIcon::fromTheme(mimeType.genericIconName()); const auto mimeIcon = QIcon::fromTheme(mimeType.iconName());
if (!res.isNull()) if (!mimeIcon.isNull())
{ return mimeIcon;
return res;
} const auto genericIcon = QIcon::fromTheme(mimeType.genericIconName());
if (!genericIcon.isNull())
return genericIcon;
return UnifiedFileIconProvider::icon(info); return UnifiedFileIconProvider::icon(info);
} }
private:
QMimeDatabase m_db;
}; };
#endif // Q_OS_WIN #endif // Q_OS_WIN
} }