diff --git a/qt/IconCache.cc b/qt/IconCache.cc index 87d386641..307d12f51 100644 --- a/qt/IconCache.cc +++ b/qt/IconCache.cc @@ -133,7 +133,7 @@ QIcon IconCache::getMimeTypeIcon(QString const& mime_type_name, bool multifile) #ifdef _WIN32 -void IconCache::addAssociatedFileIcon(QFileInfo const& file_info, UINT icon_size, QIcon& icon) const +void IconCache::addAssociatedFileIcon(QFileInfo const& file_info, unsigned int icon_size, QIcon& icon) const { QString const pixmap_cache_key = QStringLiteral("tr_file_ext_") + QString::number(icon_size) + QLatin1Char('_') + file_info.suffix(); diff --git a/qt/IconCache.h b/qt/IconCache.h index cc4d80693..bbfa8f35e 100644 --- a/qt/IconCache.h +++ b/qt/IconCache.h @@ -8,18 +8,21 @@ #pragma once -#if defined(_WIN32) -#include // UINT -class QFileInfo; -#else -#include +#if !defined(_WIN32) #include -#include "Utils.h" // std::hash() #endif +#include + #include #include +#include "Utils.h" // std::hash() + +#if defined(_WIN32) +class QFileInfo; +#endif + class QModelIndex; class IconCache @@ -43,7 +46,7 @@ private: mutable std::unordered_map name_to_emblem_icon_; #if defined(_WIN32) - void addAssociatedFileIcon(QFileInfo const& file_info, UINT icon_size, QIcon& icon) const; + void addAssociatedFileIcon(QFileInfo const& file_info, unsigned int icon_size, QIcon& icon) const; #else mutable std::unordered_set suffixes_; mutable std::unordered_map ext_to_icon_;