diff --git a/src/util/screensaver.cpp b/src/util/screensaver.cpp index 613210455c0..caf91e4d1ce 100644 --- a/src/util/screensaver.cpp +++ b/src/util/screensaver.cpp @@ -19,7 +19,9 @@ With the help of the following source codes: #include -#if defined(__APPLE__) +#include "util/assert.h" + +#if defined(Q_OS_MACOS) # include "util/mac.h" #elif defined(_WIN32) # include @@ -56,8 +58,7 @@ void ScreenSaverHelper::uninhibit() } } - -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS IOPMAssertionID ScreenSaverHelper::s_systemSleepAssertionID=0; IOPMAssertionID ScreenSaverHelper::s_userActivityAssertionID=0; @@ -334,7 +335,6 @@ void ScreenSaverHelper::uninhibitInternal() { DEBUG_ASSERT(!"Screensaver suspending not implemented"); } -#endif // Q_OS_MAC - +#endif // Q_OS_MACOS } // namespace mixxx diff --git a/src/util/screensaver.h b/src/util/screensaver.h index 57e47122f13..a1f5048d6ab 100644 --- a/src/util/screensaver.h +++ b/src/util/screensaver.h @@ -2,9 +2,9 @@ #include -#ifdef Q_OS_MAC +#ifdef Q_OS_MACOS #include -#endif // Q_OS_MAC +#endif // Q_OS_MACOS namespace mixxx { @@ -25,14 +25,14 @@ class ScreenSaverHelper { static bool s_enabled; static bool s_sendActivity; -#if defined(Q_OS_MAC) - /* sleep management */ - static IOPMAssertionID s_systemSleepAssertionID; - static IOPMAssertionID s_userActivityAssertionID; +#if defined(Q_OS_MACOS) + /* sleep management */ + static IOPMAssertionID s_systemSleepAssertionID; + static IOPMAssertionID s_userActivityAssertionID; #elif defined(Q_OS_LINUX) static uint32_t s_cookie; static int s_saverindex; -#endif // Q_OS_MAC +#endif // Q_OS_MACOS }; }