aboutsummaryrefslogtreecommitdiff
path: root/devel/qt4-corelib/files/patch-src_corelib_codecs_qiconvcodec.cpp
blob: 6a7c231eef99667c097722d85616ac172c27977d (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
--- src/corelib/codecs/qiconvcodec.cpp.orig	2014-04-10 18:37:11 UTC
+++ src/corelib/codecs/qiconvcodec.cpp
@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(co
     IconvState *state = *pstate;
     size_t inBytesLeft = len;
     // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
-#ifdef GNU_LIBICONV
-    // GNU doesn't disagree with POSIX :/
-    const char *inBytes = chars;
-#else
     char *inBytes = const_cast<char *>(chars);
-#endif
 
     QByteArray in;
     if (remainingCount) {
@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd)
     size_t outBytesLeft = sizeof buf;
     size_t inBytesLeft = sizeof bom;
 
-#if defined(GNU_LIBICONV)
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
-#else
     char **inBytesPtr = &inBytes;
-#endif
 
     if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
         return false;
@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnico
     char *outBytes;
     size_t inBytesLeft;
 
-#if defined(GNU_LIBICONV)
-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
-#else
     char **inBytesPtr = &inBytes;
-#endif
 
     IconvState *temporaryState = 0;
     QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();