mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace Q_OS_MAC with Q_OS_MACOS

Browse Source
This commit is contained in:
Luis Ángel San Martín
2023-06-04 20:55:11 +02:00
parent 072f73b986
commit 68ece533e1
27 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/comic.cpp
View File

@ -795,7 +795,7 @@ bool PDFComic::load(const QString &path, const ComicDB &comic)
void PDFComic::process()
{
#if defined Q_OS_MAC && defined USE_PDFKIT
#if defined Q_OS_MACOS && defined USE_PDFKIT
pdfComic = std::make_unique<MacOSXPDFComic>();
if (!pdfComic->openComic(_path)) {
emit errorOpening();
@ -875,7 +875,7 @@ void PDFComic::process()
void PDFComic::renderPage(int page)
{
#if defined Q_OS_MAC && defined USE_PDFKIT
#if defined Q_OS_MACOS && defined USE_PDFKIT
QImage img = pdfComic->getPage(page);
if (!img.isNull()) {
#elif defined USE_PDFIUM

2
common/comic.h
View File

@ -164,7 +164,7 @@ class PDFComic : public Comic
private:
// pdf
#if defined Q_OS_MAC && defined USE_PDFKIT
#if defined Q_OS_MACOS && defined USE_PDFKIT
std::unique_ptr<MacOSXPDFComic> pdfComic;
#elif defined USE_PDFIUM
std::unique_ptr<PdfiumComic> pdfComic;

4
common/pdf_comic.h
View File

@ -7,7 +7,7 @@
#include <QMutex>
#include <QtGlobal>
#if defined Q_OS_MAC && defined USE_PDFKIT
#if defined Q_OS_MACOS && defined USE_PDFKIT
class MacOSXPDFComic
{
public:
@ -51,5 +51,5 @@ private:
#else
#include "poppler-qt5.h"
#endif // QT_VERSION
#endif // Q_OS_MAC
#endif // Q_OS_MACOS
#endif // PDF_COMIC_H

2
common/yacreader_global.h
View File

@ -19,7 +19,7 @@
#define MAX_LIBRARIES_WARNING_NUM 10
#ifdef Q_OS_MAC
#ifdef Q_OS_MACOS
#define Y_MAC_UI
#endif

2
common/yacreader_global_gui.cpp
View File

@ -57,7 +57,7 @@ QList<qulonglong> YACReader::mimeDataToComicsIds(const QMimeData *data)
QString YACReader::addExtensionToIconPath(const QString &path)
{
#ifdef YACREADER_LIBRARY
#ifdef Q_OS_MAC // TODO_Y_MAC_UI
#ifdef Q_OS_MACOS // TODO_Y_MAC_UI
return path + ".png";
#else
return path + ".svg";