From 8328bd7be216b445c19fc9e330d3c94f58c7dc76 Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Wed, 16 Jun 2021 19:00:11 +0200 Subject: [PATCH] HostOS: Migrate from OSX to macOS Apple started calling their operating system macOS, rather than OSX a while ago, and as such, we should follow suit. This introduces `::hostos::MACOS`, and makes `::OSX` an alias of it. All internal users were updated to refer to `::hostos::MACOS`, but the `::OSX` alias is being kept indefinitely. Signed-off-by: Gergely Nagy --- plugins/Kaleidoscope-HostOS/README.md | 9 ++++++--- .../Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h | 5 +++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/plugins/Kaleidoscope-HostOS/README.md b/plugins/Kaleidoscope-HostOS/README.md index 35534c1b..77fca3be 100644 --- a/plugins/Kaleidoscope-HostOS/README.md +++ b/plugins/Kaleidoscope-HostOS/README.md @@ -25,8 +25,8 @@ void someFunction(void) { if (HostOS.os() == kaleidoscope::hostos::LINUX) { // do something linux-y } - if (HostOS.os() == kaleidoscope::hostos::OSX) { - // do something OSX-y + if (HostOS.os() == kaleidoscope::hostos::MACOS) { + // do something macOS-y } } @@ -55,10 +55,13 @@ The extension provides the following methods on the `HostOS` singleton: The OS type (i.e. the return type of `.os()` and the arguments to `.os(type)`) will be one of the following: - `kaleidoscope::hostos::LINUX` - - `kaleidoscope::hostos::OSX` + - `kaleidoscope::hostos::MACOS` - `kaleidoscope::hostos::WINDOWS` - `kaleidoscope::hostos::OTHER` +For compability reasons, `kaleidoscope::hostos::OSX` is an alias to +`kaleidoscope::hostos::MACOS`. + ## Focus commands The plugin provides the `FocusHostOSCommand` object, which, when enabled, diff --git a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h index 3d9b4c36..bfff6944 100644 --- a/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h +++ b/plugins/Kaleidoscope-HostOS/src/kaleidoscope/plugin/HostOS.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-HostOS -- Host OS detection and tracking for Kaleidoscope - * Copyright (C) 2016, 2017, 2018 Keyboard.io, Inc + * Copyright (C) 2016-2021 Keyboard.io, Inc * * This program is free software: you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software @@ -25,7 +25,8 @@ namespace hostos { typedef enum { LINUX, - OSX, + MACOS, + OSX = MACOS, WINDOWS, OTHER,