Use official name for macOS

.github/workflows/build.yml

@@ -126,7 +126,7 @@ jobs:
             cmake_flags: "-DGENERATE_APPDATA=ON"
             cmake_env: {}
 
-          - name: mac
+          - name: macos
             os: macos-latest
             ninja_platform: mac
             qt_platform: mac
@@ -232,21 +232,21 @@ jobs:
         if: matrix.env.ninja_platform == 'win'
         uses: ilammy/setup-nasm@v1.2.0
 
-      - name: Build OpenSSL (linux)
+      - name: Build OpenSSL (Linux)
         if: matrix.env.ninja_platform == 'linux'
         run: |
           cd dep/openssl/openssl
           ./config -fPIC
           make
 
-      - name: Build OpenSSL (mac)
+      - name: Build OpenSSL (macOS)
         if: matrix.env.ninja_platform == 'mac'
         run: |
           cd dep/openssl/openssl
           ./Configure ${{ matrix.env.openssl_arch }} no-shared
           make
 
-      - name: Build OpenSSL (win)
+      - name: Build OpenSSL (Windows)
         if: matrix.env.ninja_platform == 'win'
         run: |
           cd dep/openssl/openssl
@@ -370,7 +370,7 @@ jobs:
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
             **/artifacts/Gittyup win32/Gittyup*.exe
-            **/artifacts/Gittyup mac/Gittyup*.dmg
+            **/artifacts/Gittyup macos/Gittyup*.dmg
             **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
             **/Gittyup-x86_64/*.flatpak
 

README.md

@@ -76,12 +76,12 @@ How to Build
     # Start from root of gittyup repo.
     cd dep/openssl/openssl
 
-Win:
+Windows:
 
     perl Configure VC-WIN64A
     nmake
 
-Mac:
+macOS:
 
     ./Configure darwin64-x86_64-cc no-shared
     make

docs/changelog.md

@@ -5,7 +5,7 @@ Bug fix release
 #### Added
 * Distinguish between commit author and committer
 * Show image preview also for deleted files
-* Official macOS X release
+* Official macOS release
 
 #### Changed
 * Fix single line staging if not all hunks are loaded

docs/index.md

@@ -10,7 +10,7 @@ The release version is available for
 The [development version](https://github.com/Murmele/Gittyup/releases) is available either as pre-built for
 - [flatpak for Linux](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup.flatpak),
 - [32](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win32-1.1.0-dev.exe) / [64](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-win64-1.1.0-dev.exe) binary for Windows,
-- [macOS X](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-1.1.0-dev.dmg)
+- [macOS](https://github.com/Murmele/Gittyup/releases/download/latest/Gittyup-1.1.0-dev.dmg)
 
 or, can be built from source by following the directions in the [Gittyup Repository](https://github.com/Murmele/Gittyup#how-to-build).
 

pack/CMakeLists.txt

@@ -200,7 +200,7 @@ if(NOT APPLE)
   endif()
 endif()
 
-# Sign bundle on Mac.
+# Sign bundle on macOS.
 if(APPLE AND CODESIGN_IDENTITY)
   install(
     CODE "execute_process(COMMAND

src/app/Application.cpp

@@ -187,7 +187,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
 
   // Do platform-specific initialization.
 #if defined(Q_OS_MAC)
-  // Register service on Mac.
+  // Register service on macOS.
   registerService();
 
   // Load SF Mono font from Terminal.app.
@@ -198,7 +198,7 @@ Application::Application(int &argc, char **argv, bool haltOnParseError)
   foreach (const QString &name, dir.entryList({"SF*Mono-*.otf"}, QDir::Files))
     QFontDatabase::addApplicationFont(dir.filePath(name));
 
-  // Create shared menu bar on Mac.
+  // Create shared menu bar on macOS.
   (void)MenuBar::instance(nullptr);
 
 #elif defined(Q_OS_WIN)

src/editor/ScintillaQt.cpp

@@ -168,7 +168,7 @@ void ScintillaQt::paintEvent(QPaintEvent *event) {
 
   if (paintState == paintAbandoned) {
     // FIXME: Failure to paint the requested rectangle in each
-    // paint event causes flicker on some platforms (Mac?)
+    // paint event causes flicker on some platforms (macOS?)
     // Paint rect immediately.
     paintState = painting;
     paintingAllText = true;
@@ -318,9 +318,9 @@ void ScintillaQt::keyPressEvent(QKeyEvent *event) {
     // it was pressed in conjunction with alt for AltGr emulation.
     bool input = (!ctrl || alt);
 
-    // Additionally, on non-mac platforms, don't insert text
+    // Additionally, on non-macOS platforms, don't insert text
     // if the alt key was pressed unless control is also present.
-    // On mac alt can be used to insert special characters.
+    // On macOS alt can be used to insert special characters.
 #ifndef Q_OS_MAC
     input &= (!alt || ctrl);
 #endif

src/update/Updater.cpp

@@ -29,7 +29,7 @@
 #include <QVersionNumber>
 
 #if defined(Q_OS_MAC)
-#define PLATFORM "mac"
+#define PLATFORM "macos"
 #elif defined(Q_OS_WIN)
 #if defined(Q_OS_WIN64)
 #define PLATFORM "win64"
@@ -163,7 +163,7 @@ void Updater::update(bool spontaneous) {
     // The bundle does not have any version in its filename
     QString link = kLinkFmt.arg(platformArg, "", extension);
 #else
-	if (platform == "mac") {
+	if (platform == "macos") {
 	  extension = "dmg";
 	} else if (platform.startsWith("win")) {
 	  platformArg = QString("-%1").arg(platform);

test/editor.cpp

@@ -58,7 +58,7 @@ void TestEditor::copyPaste() {
 }
 
 void TestEditor::find() {
-  // It's difficult to trigger the shortcut on Mac.
+  // It's difficult to trigger the shortcut on macOS.
   MenuBar *menuBar = MenuBar::instance(mWindow);
   QAction *findAction = menuBar->findChild<QAction *>("Find");
   QVERIFY(findAction);