diff options
author | Will Andrews <will@FreeBSD.org> | 2001-02-04 04:43:14 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2001-02-04 04:43:14 +0000 |
commit | a29b48245893af789aa5115dde514b19153785d8 (patch) | |
tree | 4074580f8ff1da41c8c581b6ed3f0751374ef1d1 /x11-toolkits/qt23/files/patch-an | |
parent | f503cd9bcc28c62bcd161fa7829a8e368e0952fa (diff) | |
download | ports-a29b48245893af789aa5115dde514b19153785d8.tar.gz ports-a29b48245893af789aa5115dde514b19153785d8.zip |
Notes
Diffstat (limited to 'x11-toolkits/qt23/files/patch-an')
-rw-r--r-- | x11-toolkits/qt23/files/patch-an | 44 |
1 files changed, 14 insertions, 30 deletions
diff --git a/x11-toolkits/qt23/files/patch-an b/x11-toolkits/qt23/files/patch-an index 74b1d0cfa126..b3a5f30703bb 100644 --- a/x11-toolkits/qt23/files/patch-an +++ b/x11-toolkits/qt23/files/patch-an @@ -1,6 +1,5 @@ -diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp ---- src/kernel/qfont_x11.cpp Wed Oct 4 13:48:48 2000 -+++ src/kernel/qfont_x11.cpp Mon Oct 9 11:59:36 2000 +--- src/kernel/qfont_x11.cpp Wed Jan 31 21:26:40 2001 ++++ src/kernel/qfont_x11.cpp.new Sat Feb 3 16:22:47 2001 @@ -324,6 +324,9 @@ { "ISO 8859-14", QFont::ISO_8859_14 }, { "ISO 8859-15", QFont::ISO_8859_15 }, @@ -11,15 +10,7 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp { "eucJP", QFont::Set_Ja }, { "SJIS", QFont::Set_Ja }, { "JIS7", QFont::Set_Ja }, -@@ -337,7 +340,6 @@ - { "Big5", QFont::Set_Big5 }, - { "ta_TA.TSCII", QFont::TSCII }, - { "TSCII", QFont::TSCII }, -- { "KOI8-U", QFont::KOI8U }, - { 0, /* anything */ QFont::ISO_8859_1 } - }; - -@@ -513,6 +515,12 @@ +@@ -522,6 +525,12 @@ } else if( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && strcmp( tokens[CharsetEncoding], "u" ) == 0) { fd->charSet = QFont::KOI8U; @@ -32,29 +23,22 @@ diff -ur src/kernel/qfont_x11.cpp src/kernel/qfont_x11.cpp } else if( qstrcmp( tokens[CharsetRegistry], "tscii" ) == 0 && qstrcmp( tokens[CharsetEncoding], "0" ) == 0 ) { fd->charSet = QFont::TSCII; -@@ -1424,11 +1432,23 @@ - else - exactMatch = FALSE; - } else if ( charSet() == KOI8U ) { -- if ( strcmp( tokens[CharsetRegistry], "koi8" ) == 0 && -- strcmp( tokens[CharsetEncoding], "u" ) == 0 ) -+ if ( qstrcmp( tokens[CharsetRegistry], "koi8" ) == 0 && -+ qstrcmp( tokens[CharsetEncoding], "u" ) == 0 ) +@@ -1435,6 +1444,18 @@ score |= CharSetScore; else exactMatch = FALSE; + } else if ( charSet() == CP_1251 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; ++ if (qstrcmp( tokens[CharsetEncoding], "cp1251" ) == 0 || ++ qstrcmp( tokens[CharsetEncoding], "1251" ) == 0) ++ score |= CharSetScore; ++ else ++ exactMatch = FALSE; + } else if ( charSet() == PT_154 ) { -+ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || -+ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) -+ score |= CharSetScore; -+ else -+ exactMatch = FALSE; ++ if (qstrcmp( tokens[CharsetEncoding], "cp154" ) == 0 || ++ qstrcmp( tokens[CharsetEncoding], "154" ) == 0) ++ score |= CharSetScore; ++ else ++ exactMatch = FALSE; } else if ( qstrcmp( tokens[CharsetRegistry], "iso8859" ) == 0 && charSet() >= ISO_8859_1 && charSet() <= ISO_8859_15 ) { int i = 0; |