Merge pull request #12662 from fwcd/rename-macosversion

MacOsVersion: Rename to AppleOsVersion
mixxxdj · Jan 28, 2024 · cca0663 · cca0663
2 parents b131de5 + 35aba64
commit cca0663
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1551,8 +1551,8 @@ if(APPLE)
   target_compile_definitions(mixxx-lib PUBLIC GL_SILENCE_DEPRECATION)
 
   target_sources(mixxx-lib PRIVATE
+    src/util/appleosversion.mm
     src/util/darkappearance.mm
-    src/util/macosversion.mm
   )
 
   option(MACOS_ITUNES_LIBRARY "Native macOS iTunes/Music.app library integration" ON)

diff --git a/src/sources/soundsourcecoreaudio.cpp b/src/sources/soundsourcecoreaudio.cpp
@@ -2,8 +2,8 @@
 
 #include "engine/engine.h"
 #include "sources/mp3decoding.h"
+#include "util/appleosversion.h"
 #include "util/logger.h"
-#include "util/macosversion.h"
 #include "util/math.h"
 
 namespace mixxx {
@@ -50,7 +50,7 @@ SoundSourceProviderPriority SoundSourceProviderCoreAudio::getPriorityHint(
 }
 
 QString SoundSourceProviderCoreAudio::getVersionString() const {
-    return getMacOsVersion();
+    return getAppleOsVersion();
 }
 
 SoundSourceCoreAudio::SoundSourceCoreAudio(QUrl url)

diff --git a/src/util/macosversion.h → src/util/appleosversion.h b/src/util/macosversion.h → src/util/appleosversion.h
@@ -2,4 +2,4 @@
 
 #include <QString>
 
-QString getMacOsVersion();
+QString getAppleOsVersion();
diff --git a/src/util/macosversion.mm → src/util/appleosversion.mm b/src/util/macosversion.mm → src/util/appleosversion.mm
@@ -1,8 +1,8 @@
-#include "util/macosversion.h"
+#include "util/appleosversion.h"
 
 #import <Foundation/Foundation.h>
 
-QString getMacOsVersion() {
+QString getAppleOsVersion() {
     NSProcessInfo* processInfo = [NSProcessInfo processInfo];
     NSString* osVer = processInfo.operatingSystemVersionString;
     return QString::fromCFString((__bridge CFStringRef)osVer);