From 32a8dfe26207df2e1da13b43dc2cdb08a0228e9d Mon Sep 17 00:00:00 2001 From: sergm Date: Wed, 5 Aug 2020 19:03:25 +0300 Subject: [PATCH] Fixed a typo in the newly introduced function cfStringToQString in CoreAudioDriver.cpp (thanks to davidhsilaban). Also changed linkage to static for the related function qStringToCFString. --- mt32emu_qt/src/audiodrv/CoreAudioDriver.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mt32emu_qt/src/audiodrv/CoreAudioDriver.cpp b/mt32emu_qt/src/audiodrv/CoreAudioDriver.cpp index ead7be3..9f3ee24 100644 --- a/mt32emu_qt/src/audiodrv/CoreAudioDriver.cpp +++ b/mt32emu_qt/src/audiodrv/CoreAudioDriver.cpp @@ -23,7 +23,7 @@ static const uint DEFAULT_CHUNK_MS = 20; static const uint DEFAULT_AUDIO_LATENCY = 60; static const uint DEFAULT_MIDI_LATENCY = 30; -CFStringRef qStringToCFString(QString qString) { +static CFStringRef qStringToCFString(QString qString) { #if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) return CFStringCreateWithCharacters(0, reinterpret_cast(qString.unicode()), qString.length()); #else @@ -32,7 +32,7 @@ CFStringRef qStringToCFString(QString qString) { } static QString cfStringToQString(CFStringRef string) { -#if QT_VERSION < QT_VERSION_CHECK(5, 20, 0) +#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0) // Taken from Qt 5.2 source code // File: qtbase/src/corelib/tools/qstring_mac.mm if (!string)