squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-19 23:17:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated macro

Browse Source 
Q_OS_MAC is deprecated and the replacement is Q_OS_MACOS.
This commit is contained in:
Chocobo1
2019-09-05 20:11:33 +08:00
parent ef8b37f7fa
commit 0d5b0b9542
37 changed files with 159 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/torrentcontentmodel.cpp
View File

@@ -43,7 +43,7 @@
#include <QMimeType>
#endif
#if defined Q_OS_WIN || defined Q_OS_MAC
#if defined Q_OS_WIN || defined Q_OS_MACOS
#define QBT_PIXMAP_CACHE_FOR_FILE_ICONS
#include <QPixmapCache>
#endif
@@ -57,7 +57,7 @@
#include "torrentcontentmodelitem.h"
#include "uithememanager.h"
#ifdef Q_OS_MAC
#ifdef Q_OS_MACOS
#include "macutilities.h"
#endif
@@ -121,7 +121,7 @@ namespace
return iconPixmap;
}
};
#elif defined(Q_OS_MAC)
#elif defined(Q_OS_MACOS)
// There is a similar bug on macOS, to be reported to Qt
// https://github.com/qbittorrent/qBittorrent/pull/6156#issuecomment-316302615
class MacFileIconProvider final : public CachingFileIconProvider
@@ -184,7 +184,7 @@ TorrentContentModel::TorrentContentModel(QObject *parent)
{
#if defined(Q_OS_WIN)
m_fileIconProvider = new WinShellFileIconProvider();
#elif defined(Q_OS_MAC)
#elif defined(Q_OS_MACOS)
m_fileIconProvider = new MacFileIconProvider();
#else
static bool doesBuiltInProviderWork = doesQFileIconProviderWork();