[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde4support] src/kdecore: Compile on Mac OS X
From:       Harald Fernengel <harry () kdevelop ! org>
Date:       2014-02-12 13:10:07
Message-ID: E1WDZZn-0004Ux-V8 () scm ! kde ! org
[Download RAW message or body]

Git commit fe98073ef4f164f4958c0c0e44adcc9059425fea by Harald Fernengel.
Committed on 12/02/2014 at 13:07.
Pushed by harald into branch 'master'.

Compile on Mac OS X

M  +1    -14   src/kdecore/klocale_mac.cpp

http://commits.kde.org/kde4support/fe98073ef4f164f4958c0c0e44adcc9059425fea

diff --git a/src/kdecore/klocale_mac.cpp b/src/kdecore/klocale_mac.cpp
index 290b897..226646b 100644
--- a/src/kdecore/klocale_mac.cpp
+++ b/src/kdecore/klocale_mac.cpp
@@ -17,23 +17,10 @@
    Boston, MA 02110-1301, USA.
 */
 
+#include "kkernel_mac.h"
 #include "klocale_mac_p.h"
 #include <CoreFoundation/CFString.h>
 
-// Copied from kkernel_mac.cpp
-QString convert_CFString_to_QString(CFStringRef str)
-{
-    CFIndex length = CFStringGetLength(str);
-    const UniChar *chars = CFStringGetCharactersPtr(str);
-    if (chars) {
-        return QString(reinterpret_cast<const QChar *>(chars), length);
-    }
-
-    QVarLengthArray<UniChar> buffer(length);
-    CFStringGetCharacters(str, CFRangeMake(0, length), buffer.data());
-    return QString(reinterpret_cast<const QChar *>(buffer.constData()), length);
-}
-
 KLocaleMacPrivate::KLocaleMacPrivate(KLocale *q_ptr, KSharedConfig::Ptr config)
     : KLocalePrivate(q_ptr)
 {
[prev in list] [next in list] [prev in thread] [next in thread]