diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-04 02:22:38 +0000 |
commit | 98a12d05a48814bec3870b9a6d5865475cfa1c95 (patch) | |
tree | a711801e47696fb0cf162abd7330e0b5b480ba39 /kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | |
parent | 421a1845137c7c396b5d03bce53237fcb149d602 (diff) | |
download | tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.tar.gz tdeedu-98a12d05a48814bec3870b9a6d5865475cfa1c95.zip |
Automated conversion for enhanced compatibility with TQt for Qt4 3.4.0 TP1
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1211429 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp')
-rw-r--r-- | kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp index e4906935..8d72ee87 100644 --- a/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp +++ b/kvoctrain/kvoctrain/kvt-core/kvd_csv.cpp @@ -138,42 +138,42 @@ bool kvoctrainDoc::loadFromCsv (TQTextStream& is) // autodetect utf8 if (!utf8_mode) { for (int i = 0; !utf8_mode && i < (int) s.length(); ++i) { - ushort trigger = s[i].unicode(); + ushort trigger = s[i].tqunicode(); if (trigger >= 0x80) { int remain = s.length() - i; if ((trigger & 0xE0) == 0xC0){ // 110x xxxx if ( (remain > 1) - && (s[i+1].unicode() & 0xC0) == 0x80) + && (s[i+1].tqunicode() & 0xC0) == 0x80) utf8_mode = true; } else if ((trigger & 0xF0) == 0xE0) { // 1110 xxxx if ( remain > 2 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xF8) == 0xF0) { // 1111 0xxx if ( remain > 3 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFC) == 0xF8) { // 1111 10xx if ( remain > 4 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } else if ((trigger & 0xFE) == 0xFC) { // 1111 110x if ( remain > 5 - && s[i+1].unicode() & 0xC0 == 0x80 - && s[i+2].unicode() & 0xC0 == 0x80 - && s[i+3].unicode() & 0xC0 == 0x80 - && s[i+4].unicode() & 0xC0 == 0x80 - && s[i+5].unicode() & 0xC0 == 0x80) + && s[i+1].tqunicode() & 0xC0 == 0x80 + && s[i+2].tqunicode() & 0xC0 == 0x80 + && s[i+3].tqunicode() & 0xC0 == 0x80 + && s[i+4].tqunicode() & 0xC0 == 0x80 + && s[i+5].tqunicode() & 0xC0 == 0x80) utf8_mode = true; } } |