author | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-02-19 16:07:58 (UTC) |
commit | b7bf9c7acdc010eb30bc246372efb0d1b394166a (patch) (unidiff) | |
tree | 8dde116603cd8ddf439a881fc4a1d8f413af617b /qt/qt-2.3.7.patch/qte237-encoding.patch | |
parent | 298d0d244ca724405ca0651775ed61a22ce7a5ae (diff) | |
download | opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.zip opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.gz opie-b7bf9c7acdc010eb30bc246372efb0d1b394166a.tar.bz2 |
hello qte2.3.10 patches
bye bye old patches
Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-encoding.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-encoding.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-encoding.patch b/qt/qt-2.3.7.patch/qte237-encoding.patch deleted file mode 100644 index c2f5c08..0000000 --- a/qt/qt-2.3.7.patch/qte237-encoding.patch +++ b/dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | German umlaute quite likely french, italian, spanish did | ||
2 | not work due QFile::[decode,encode]Name did call QString | ||
3 | local8Bit,fromLocal8Bit which plainly tried to use utf8 | ||
4 | encoding even if not useful. So a filename got changed | ||
5 | and QFileInfo recognized the file not beeing present anymore... | ||
6 | which lead to files not be shown. | ||
7 | Also with Year-Names problem exists as the base system sent | ||
8 | it encoded upstream. | ||
9 | |||
10 | If you want to have UTF-8 encoding use LC_CTYPE as always and | ||
11 | QTextCodec::codecForLocale will use the right UTF-8 encoding. | ||
12 | |||
13 | As fallback the old behaviour was preserved | ||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | --- qt-2.3.7-old/src/tools/qstring.cpp2004-07-23 14:33:02.000000000 +0200 | ||
22 | +++ qt-2.3.7/src/tools/qstring.cpp2004-07-23 14:32:31.000000000 +0200 | ||
23 | @@ -14469,7 +14469,11 @@ | ||
24 | return qt_winQString2MB( *this ); | ||
25 | #endif | ||
26 | #ifdef _WS_QWS_ | ||
27 | - return utf8(); // ##### if there is ANY 8 bit format supported? | ||
28 | + QTextCodec* codec = QTextCodec::codecForLocale(); | ||
29 | + return codec | ||
30 | + ? codec->fromUnicode(*this) | ||
31 | + : utf8(); | ||
32 | + //return latin1(); // ##### if there is ANY 8 bit format supported? | ||
33 | #endif | ||
34 | #endif | ||
35 | } | ||
36 | @@ -14515,7 +14519,12 @@ | ||
37 | return qt_winMB2QString( local8Bit ); | ||
38 | #endif | ||
39 | #ifdef _WS_QWS_ | ||
40 | - return fromUtf8(local8Bit,len); | ||
41 | + QTextCodec* codec = QTextCodec::codecForLocale(); | ||
42 | + if( len < 0) len = qstrlen(local8Bit); | ||
43 | + return codec | ||
44 | + ? codec->toUnicode(local8Bit, len) | ||
45 | + : QString::fromUtf8(local8Bit,len); | ||
46 | +// return fromLatin1(local8Bit,len); | ||
47 | #endif | ||
48 | #endif // QT_NO_TEXTCODEC | ||
49 | } | ||