chore(build): Q_OS_MAC becomes Q_OS_MACOS, silencing the Qt 6.12 clang deprecation. Principle VIII.

.github/copilot-instructions.md

@@ -54,7 +54,7 @@ priority must-knows that fit in Copilot's chat context window.
 
 - C++20, Qt6, no `QSettings`, no naked `new`/`delete`, no `goto`,
   braces on all control flow.
-- Platform guards prefer `Q_OS_WIN` / `Q_OS_MAC` / `Q_OS_LINUX`.
+- Platform guards prefer `Q_OS_WIN` / `Q_OS_MACOS` / `Q_OS_LINUX`.
 - For new files: classes `PascalCase`, methods `camelCase`, member
   vars `m_camelCase`, constants `kPascalCase`.
 

.github/workflows/ci.yml

@@ -356,7 +356,7 @@ jobs:
   # Cross-platform build check — runs on every PR (no path gating).
   #
   # History: previously gated by a `check-paths` job on a hand-maintained
-  # allow-list of files known to carry `#ifdef Q_OS_WIN` / `Q_OS_MAC`
+  # allow-list of files known to carry `#ifdef Q_OS_WIN` / `Q_OS_MACOS`
   # branches (CMakeLists, third_party/, workflows, MainWindow,
   # AudioEngine).  The allow-list was a chronic leaker — every time a
   # new platform-guarded path got added to a different file, the gap
@@ -876,7 +876,7 @@ jobs:
           key: sccache-windows-${{ github.run_id }}
 
   # macOS build check — runs on every PR (no path gating), same rationale
-  # as check-windows above.  Catches Q_OS_MAC / CoreAudio / Cocoa-bridge
+  # as check-windows above.  Catches Q_OS_MACOS / CoreAudio / Cocoa-bridge
   # breakage that Linux clang misses, which is otherwise only discovered
   # at release tag time by macos-dmg.yml.  Build-only (no code signing,
   # no DMG, no notarization — those stay in macos-dmg.yml on tag push).

AGENTS.md

@@ -199,7 +199,7 @@ contributors.
 - **Braces on all control flow** — even single-line `if`/`else`/`for`/`while`
 - **`auto` sparingly** — use explicit types unless the type is obvious from context (e.g. `auto* ptr = new Foo` is fine, `auto x = foo()` is not)
 - **Naming**: classes `PascalCase`, methods/variables `camelCase`, constants `kPascalCase`, member variables `m_camelCase`
-- **Platform guards**: prefer `Q_OS_WIN` / `Q_OS_MAC` / `Q_OS_LINUX` for new code. Existing `_WIN32`/`__APPLE__` guards can be migrated opportunistically — don't do a blanket rewrite.
+- **Platform guards**: prefer `Q_OS_WIN` / `Q_OS_MACOS` / `Q_OS_LINUX` for new code. Existing `_WIN32`/`__APPLE__` guards can be migrated opportunistically — don't do a blanket rewrite.
 - **Don't remove code you didn't add** — if rebasing, ensure upstream changes are preserved. Review the diff before submitting.
 - **Atomic parameters for cross-thread DSP** — main thread writes via `std::atomic`, audio thread reads. Never hold a mutex in the audio callback for parameter updates.
 - **Error handling**: log with `qCWarning(lcCategory)`, don't throw exceptions

GEMINI.md

@@ -54,7 +54,7 @@ the must-knows that fit in Gemini's chat context efficiently.
 
 - C++20, Qt6, no `QSettings`, no naked `new`/`delete`, no `goto`,
   braces on all control flow.
-- Platform guards prefer `Q_OS_WIN` / `Q_OS_MAC` / `Q_OS_LINUX`.
+- Platform guards prefer `Q_OS_WIN` / `Q_OS_MACOS` / `Q_OS_LINUX`.
 - Naming: classes `PascalCase`, methods `camelCase`, member vars
   `m_camelCase`, constants `kPascalCase`.
 

src/aetherd/main.cpp

@@ -15,7 +15,7 @@
 
 int main(int argc, char* argv[])
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // QtKeychain's Apple backend delivers completions on the native main
     // dispatch queue. Qt's default QCoreApplication UNIX dispatcher does not
     // service that queue. Select CoreFoundation only for credential runs;
@@ -28,7 +28,7 @@ int main(int argc, char* argv[])
     }
 #endif
     QCoreApplication app(argc, argv);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     if (credentialDispatcher) {
         if (hadDispatcherSetting) {
             qputenv("QT_EVENT_DISPATCHER_CORE_FOUNDATION", dispatcherSetting);

src/core/AppSettings.cpp

@@ -171,7 +171,7 @@ void AppSettings::migrateSettingsPath()
         return;  // already at the correct location
     }
 
-#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
     // On Windows and macOS, Qt 6's ConfigLocation resolves to AppConfigLocation
     // (%LOCALAPPDATA%/AetherSDR/AetherSDR on Windows,
     //  ~/Library/Preferences/AetherSDR/AetherSDR on macOS), so appending

src/core/AudioEngine.cpp

@@ -56,7 +56,7 @@
 #include "Resampler.h"
 #include "TxVoiceProcessor.h"
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 #include <CoreAudio/CoreAudio.h>
 #include <CoreFoundation/CoreFoundation.h>
 #endif
@@ -404,7 +404,7 @@ void logAudioOpenFailure(const QString& path,
     AudioSummaryLogger::logOpenFailure(summary);
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 AudioObjectPropertyAddress macAudioAddress(AudioObjectPropertySelector selector,
                                            AudioObjectPropertyScope scope = kAudioObjectPropertyScopeGlobal)
 {
@@ -2889,7 +2889,7 @@ QJsonArray AudioEngine::audioEndpointDiagnostics() const
     endpoints.append(rx);
 
     const bool txRunning = m_audioSource != nullptr;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     const bool txDeviceOpen = m_micBuffer && m_micBuffer->isOpen();
 #else
     const bool txDeviceOpen = !m_micDevice.isNull() && m_micDevice->isOpen();
@@ -4181,7 +4181,7 @@ bool AudioEngine::openRxSinkDevice(int producerRate)
         }
     }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     if (!m_allowBluetoothTelephonyOutput.load()) {
         // Only override devices that look like Bluetooth telephony routes.
         // Telephony-only (HFP/SCO) routes cap out at 8-16 kHz and cannot
@@ -8677,7 +8677,7 @@ TxCaptureHealthTracker::CaptureState AudioEngine::txCaptureState(QAudio::State s
 
 qint64 AudioEngine::txCaptureBufferedBytes() const
 {
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     return m_micBuffer ? m_micBuffer->size() : 0;
 #else
     return m_micDevice ? m_micDevice->bytesAvailable() : 0;
@@ -8931,7 +8931,7 @@ bool AudioEngine::startTxStream(const QHostAddress& radioAddress, quint16 radioP
 #else
     bool txBluetoothHfp = false;
     int  txPreferredOverride = 0;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // CoreAudio-HAL detection the factory can't derive from QAudioDevice: if this
     // is a Bluetooth-HFP capture route, put its native low rate first (#2615).
     if (const auto nativeRate = macBluetoothNativeInputRate(dev)) {
@@ -9022,7 +9022,7 @@ bool AudioEngine::startTxStream(const QHostAddress& radioAddress, quint16 radioP
              << (m_txInputRate != TxVoiceProcessor::kDspRate)
              << "RADE resample to 24k:" << m_radeTxNeedsResample;
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     // macOS: QAudioSource pull mode broken — use push mode with QBuffer
     const quint64 txLifecycleGeneration = ++m_txLifecycleGeneration;
     m_micBuffer = new QBuffer(this);
@@ -9274,7 +9274,7 @@ void AudioEngine::stopTxStream()
         logTxCaptureHealthSummary(QStringLiteral("source lifecycle ended"), false);
     }
     ++m_txLifecycleGeneration;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     QTimer* pollTimer = m_txPollTimer;
     m_txPollTimer = nullptr;
     QBuffer* micBuffer = m_micBuffer;
@@ -9284,7 +9284,7 @@ void AudioEngine::stopTxStream()
     m_audioSource = nullptr;
     m_micDevice = nullptr;
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     if (pollTimer) {
         pollTimer->stop();
         delete pollTimer;
@@ -9299,7 +9299,7 @@ void AudioEngine::stopTxStream()
         }
         delete audioSource;
     }
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     if (micBuffer) {
         delete micBuffer;
     }
@@ -9466,7 +9466,7 @@ void AudioEngine::onTxAudioReady()
         }
         // Capture must keep being consumed while TCI owns TX audio, on every
         // platform — all three backends accumulate, just in different memory.
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
         // Push mode: QAudioSource writes into m_micBuffer, which only the
         // unsuppressed path below clears. Left alone it grows for the whole TCI
         // session (~192 KB/s at 48 kHz stereo Int16) — the same multi-GB
@@ -9505,7 +9505,7 @@ void AudioEngine::onTxAudioReady()
         }
         return;
     }
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     if (!m_micBuffer || !m_audioSource) return;
     if (m_audioSource->state() == QAudio::StoppedState) return;
     if (!m_micBuffer->isOpen()) return;
@@ -9976,7 +9976,7 @@ void AudioEngine::setInputDevice(const QAudioDevice& dev, AudioDeviceSelection s
     emit inputDeviceChanged();
 }
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 void AudioEngine::setAllowBluetoothTelephonyOutput(bool on)
 {
     const bool changed = (m_allowBluetoothTelephonyOutput.exchange(on) != on);

src/core/AudioEngine.h

@@ -677,7 +677,7 @@ class AudioEngine : public QObject {
                          AudioDeviceSelection selection = AudioDeviceSelection::OperatorChoice);
     void setInputDevice(const QAudioDevice& dev,
                         AudioDeviceSelection selection = AudioDeviceSelection::OperatorChoice);
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     void setAllowBluetoothTelephonyOutput(bool on);
 #endif
     QAudioDevice outputDevice() const { return m_outputDevice; }
@@ -1125,7 +1125,7 @@ private slots:
     QUdpSocket    m_txSocket;
     QAudioSource* m_audioSource{nullptr};
     QPointer<QIODevice> m_micDevice;
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     QTimer*       m_txPollTimer{nullptr};
     QBuffer*      m_micBuffer{nullptr};
 #endif
@@ -1173,7 +1173,7 @@ private slots:
     // Channel count of the stage-0 open, so the ladder stays stable across
     // reopens even though fmt.channelCount() changes underneath it.
     int                m_txSilentOpenInitialChannels{2};
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     std::atomic<bool>  m_allowBluetoothTelephonyOutput{false};
 #endif
     std::atomic<bool>  m_daxTxUseRadioRoute{false}; // false = low-latency route (dax=0)

src/core/AudioFormatNegotiator.cpp

@@ -295,7 +295,7 @@ TargetOs hostTargetOs()
 {
 #if defined(Q_OS_WIN)
     return TargetOs::Windows;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
     return TargetOs::MacOS;
 #else
     return TargetOs::Linux;

src/core/AutomationServer.cpp

@@ -35,13 +35,13 @@
 #include <QLocalServer>
 #include <QScopeGuard>
 #include <QLocalSocket>
 #include <QApplication>
 #include <QScreen>
 #include <QWidget>
 #include <QMainWindow>
 #include <QMenu>
 #include <QMenuBar>
 #include <QTabBar>
 #include <QEnterEvent>
 #include <QMouseEvent>
 #include <QWheelEvent>
@@ -78,12 +78,12 @@
 #include <utility>
 
 // Best-effort value extraction for common control types.
 #include <QAbstractButton>
 #include <QAbstractSlider>
 #include <QAbstractItemView>
 #include <QPersistentModelIndex>
 #include <QItemSelectionModel>
 #include <QComboBox>
 #include <QLineEdit>
 #include "AutomationSensitiveLineEdit.h"
 #include <QLabel>
@@ -2013,7 +2013,7 @@
                                    false},
 #endif
         {"MNR",  a->mnrEnabled(),
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
                                    true},
 #else
                                    false},

src/core/CatPort.cpp

@@ -19,7 +19,7 @@
 #include <fcntl.h>
 #include <termios.h>
 #include <sys/stat.h>
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 #include <util.h>
 #else
 #include <pty.h>

src/core/DaxTxPolicy.h

@@ -82,7 +82,7 @@ inline DaxTxPlatform currentDaxTxPlatform()
 {
 #if defined(Q_OS_WIN)
     return DaxTxPlatform::Windows;
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
     return DaxTxPlatform::MacOS;
 #elif defined(Q_OS_LINUX)
     return DaxTxPlatform::Linux;
@@ -93,7 +93,7 @@ inline DaxTxPlatform currentDaxTxPlatform()
 
 inline bool currentBuildHasHostedDax()
 {
-#if defined(Q_OS_MAC) || defined(HAVE_PIPEWIRE)
+#if defined(Q_OS_MACOS) || defined(HAVE_PIPEWIRE)
     return true;
 #else
     return false;
@@ -104,7 +104,7 @@ inline DaxTxMode currentDaxTxMode()
 {
 #if defined(Q_OS_WIN)
     return DaxTxMode::ExternalDax2;
-#elif defined(Q_OS_MAC) || defined(HAVE_PIPEWIRE)
+#elif defined(Q_OS_MACOS) || defined(HAVE_PIPEWIRE)
     return DaxTxMode::HostedDax;
 #else
     return DaxTxMode::None;

src/core/FreeDvClient.cpp

@@ -184,7 +184,7 @@ void FreeDvClient::handleEngineIO(const QString& raw)
             auth["rx_only"]          = false;
 #if defined(Q_OS_WIN)
             auth["os"]               = QString("windows");
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
             auth["os"]               = QString("macos");
 #else
             auth["os"]               = QString("linux");

src/core/MacMicPermission.h

@@ -3,7 +3,7 @@
 // Request microphone permission on macOS at app startup.
 // Shows the system permission dialog on first launch.
 // No-op on non-macOS platforms.
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 void requestMicrophonePermission();
 #else
 inline void requestMicrophonePermission() {}

src/core/MemoryTelemetry.cpp

@@ -18,7 +18,7 @@
 #endif
 #include <windows.h>
 #include <psapi.h>
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
 #include <mach/mach.h>
 #include <mach/task.h>
 #include <mach/task_info.h>
@@ -89,7 +89,7 @@ ProcessMemorySnapshot ProcessMemorySnapshot::capture()
     if (GetProcessHandleCount(GetCurrentProcess(), &handles)) {
         snapshot.handleCount = static_cast<qint64>(handles);
     }
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
     task_vm_info_data_t info{};
     mach_msg_type_number_t count = TASK_VM_INFO_COUNT;
     if (task_info(mach_task_self(), TASK_VM_INFO,

src/core/SleepInhibitor.cpp

@@ -1,7 +1,7 @@
 #include "SleepInhibitor.h"
 #include <QDebug>
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 #include <IOKit/pwr_mgt/IOPMLib.h>
 #endif
 
@@ -67,7 +67,7 @@ void SleepInhibitor::acquire(const QString& reason)
     if (m_held)
         return;
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     CFStringRef cfReason = reason.toCFString();
     IOReturn ret = IOPMAssertionCreateWithName(
         kIOPMAssertionTypeNoIdleSleep,
@@ -155,7 +155,7 @@ void SleepInhibitor::release()
     if (!m_held)
         return;
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     IOPMAssertionRelease(m_assertionId);
     m_assertionId = 0;
     qDebug() << "SleepInhibitor: released (macOS)";

src/core/SleepInhibitor.h

@@ -55,7 +55,7 @@ class SleepInhibitor {
 private:
     bool m_held{false};
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     uint32_t m_assertionId{0};
 #endif
 #if defined(Q_OS_LINUX) && defined(HAVE_DBUS)

src/core/SystemInfo.cpp

@@ -24,7 +24,7 @@
 extern "C" __declspec(dllimport) HRESULT WINAPI
     GetThreadDescription(HANDLE hThread, PWSTR* ppszThreadDescription);
 #endif
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
 #include <mach/mach.h>
 #include <mach/thread_act.h>
 #include <mach/thread_info.h>
@@ -41,7 +41,7 @@ namespace AetherSDR {
 
 namespace {
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
 // thread_extended_info's pth_run_state, in the shared vocabulary. The constants
 // are TH_STATE_* from <mach/thread_info.h>; anything outside that set is Unknown
 // rather than mapped to whichever neighbour looks closest.
@@ -130,7 +130,7 @@ QVector<ThreadTimes> SystemInfo::enumerateThreads()
 {
     QVector<ThreadTimes> result;
 
-#if defined(Q_OS_MAC)
+#if defined(Q_OS_MACOS)
     MachThreadArray threads;
     if (!threads.acquire()) {
         return result;

src/core/UlanziDialBackend.h

@@ -14,7 +14,7 @@
 #elif defined(Q_OS_WIN) && defined(HAVE_HIDAPI)
     #include "core/UlanziDialWindowsManager.h"
     namespace AetherSDR { using UlanziDialBackend = UlanziDialWindowsManager; }
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MACOS)
     #include "core/UlanziDialMacOSManager.h"
     namespace AetherSDR { using UlanziDialBackend = UlanziDialMacOSManager; }
 #else

src/core/UlanziDialMacOSManager.cpp

@@ -1,5 +1,5 @@
 #include <QtGlobal>
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
 
 #include "UlanziDialMacOSManager.h"
 #include "core/LogManager.h"
@@ -769,4 +769,4 @@ void UlanziDialMacOSManager::emitKeyTransition(int linuxKey, int value)
 
 } // namespace AetherSDR
 
-#endif // Q_OS_MAC
+#endif // Q_OS_MACOS