diff --git a/YACReaderLibrary/library_comic_opener.cpp b/YACReaderLibrary/library_comic_opener.cpp index 18ac16b5..0a4d3a02 100644 --- a/YACReaderLibrary/library_comic_opener.cpp +++ b/YACReaderLibrary/library_comic_opener.cpp @@ -18,7 +18,7 @@ bool YACReader::openComic(const ComicDB &comic, labelParam = QString("--readingListId=%1").arg(source.sourceId); } -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS QStringList possiblePaths { QDir::cleanPath(QCoreApplication::applicationDirPath() + "/../../../") }; possiblePaths += QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); diff --git a/YACReaderLibrary/main.cpp b/YACReaderLibrary/main.cpp index a1ddcae0..afedc607 100644 --- a/YACReaderLibrary/main.cpp +++ b/YACReaderLibrary/main.cpp @@ -21,7 +21,7 @@ #include "yacreader_libraries.h" #include "exit_check.h" #include "opengl_checker.h" -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS #include "trayhandler.h" #endif @@ -268,7 +268,7 @@ int main(int argc, char **argv) if (!settings->value(START_TO_TRAY, false).toBool() || !settings->value(CLOSE_TO_TRAY, false).toBool()) { mw->show(); } -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS else { OSXHideDockIcon(); } diff --git a/YACReaderLibrary/trayicon_controller.cpp b/YACReaderLibrary/trayicon_controller.cpp index ad35d9dd..efb17490 100644 --- a/YACReaderLibrary/trayicon_controller.cpp +++ b/YACReaderLibrary/trayicon_controller.cpp @@ -7,7 +7,7 @@ #include #include -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS #include "trayhandler.h" #endif @@ -26,7 +26,7 @@ TrayIconController::TrayIconController(QSettings *settings, LibraryWindow *windo #ifdef Q_OS_WIN trayIcon.setIcon(QIcon(":/icon.ico")); #else -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS auto icon = QIcon(":/macostrayicon.svg"); icon.setIsMask(true); trayIcon.setIcon(icon); @@ -69,7 +69,7 @@ void TrayIconController::updateIconVisibility() bool TrayIconController::handleCloseToTrayIcon(QCloseEvent *event) { -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS if (!event->spontaneous() || !window->isVisible()) { return false; } @@ -83,7 +83,7 @@ bool TrayIconController::handleCloseToTrayIcon(QCloseEvent *event) "of the system tray icon.")); settings->setValue(CLOSE_TO_TRAY_NOTIFIED, true); } -#ifdef Q_OS_OSX +#ifdef Q_OS_MACOS OSXHideDockIcon(); #endif window->hide(); @@ -96,7 +96,7 @@ bool TrayIconController::handleCloseToTrayIcon(QCloseEvent *event) void TrayIconController::showWindow() { -#ifdef Q_OS_MACOSOS +#ifdef Q_OS_MACOS OSXShowDockIcon(); window->showNormal(); #else