diff --git a/src/ProcessInfo.cpp b/src/ProcessInfo.cpp index f3b48033..d38dac83 100644 --- a/src/ProcessInfo.cpp +++ b/src/ProcessInfo.cpp @@ -45,11 +45,11 @@ #include #include -#if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_MAC) +#if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_OSX) #include #endif -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) #include #include #endif @@ -878,7 +878,7 @@ private: } }; -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) class MacProcessInfo : public UnixProcessInfo { public: @@ -1184,7 +1184,7 @@ ProcessInfo* ProcessInfo::newInstance(int aPid, const QString& titleFormat, bool return new LinuxProcessInfo(aPid, titleFormat, enableEnvironmentRead); #elif defined(Q_OS_SOLARIS) return new SolarisProcessInfo(aPid, titleFormat, enableEnvironmentRead); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) return new MacProcessInfo(aPid, titleFormat, enableEnvironmentRead); #elif defined(Q_OS_FREEBSD) return new FreeBSDProcessInfo(aPid, titleFormat, enableEnvironmentRead); diff --git a/src/Session.h b/src/Session.h index 566e0f63..397b5156 100644 --- a/src/Session.h +++ b/src/Session.h @@ -56,7 +56,7 @@ class HistoryType; * Platform-specific main shortcut "opcode": */ enum Modifier { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX ACCEL = Qt::META #else ACCEL = Qt::CTRL diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index ee79f7e2..8e43b7ee 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -726,7 +726,7 @@ void TerminalDisplay::drawBackground(QPainter& painter, const QRect& rect, const if (useOpacitySetting && !_wallpaper->isNull() && _wallpaper->draw(painter, contentsRect, _opacity)) { } else if (qAlpha(_blendColor) < 0xff && useOpacitySetting) { -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) // TODO - On MacOS, using CompositionMode doesn't work. Altering the // transparency in the color scheme alters the brightness. painter.fillRect(contentsRect, backgroundColor); diff --git a/src/main.cpp b/src/main.cpp index 1aa725c0..7dd80ead 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -81,7 +81,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[]) // enable high dpi support app->setAttribute(Qt::AA_UseHighDpiPixmaps, true); -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) // this ensures that Ctrl and Meta are not swapped, so CTRL-C and friends // will work correctly in the terminal app->setAttribute(Qt::AA_MacDontSwapCtrlAndMeta);