diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-28 15:51:58 -0500 |
| commit | fe7969ef886d7287fa959929ddd33fbad8407884 (patch) | |
| tree | 589aacc109d27561a5188bb46bce27c78bad8f5b /src/codecs | |
| parent | dba8a853b65e5707e48450e5085e0ff0513b4203 (diff) | |
| download | tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.tar.gz tqt3-fe7969ef886d7287fa959929ddd33fbad8407884.zip | |
Automated update from Qt3
Diffstat (limited to 'src/codecs')
| -rw-r--r-- | src/codecs/qjpunicode.cpp | 4 | ||||
| -rw-r--r-- | src/codecs/qtextcodec.cpp | 2 | ||||
| -rw-r--r-- | src/codecs/qutfcodec.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index e3b08f8fa..500dab385 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -10555,7 +10555,7 @@ uint TQJpUnicodeConv::unicodeToSjisibmvdc(uint h, uint l) const if (!sjis208ibmvdc_unicode[i]) return 0; if (u==sjis208ibmvdc_unicode[i]){ - return ((0x00fa +(i/189))<<8 | 0x0040+(i%189)); + return ((0x00fa +(i/189))<<8 | (0x0040+(i%189))); } } } @@ -10660,7 +10660,7 @@ uint TQJpUnicodeConv::unicodeToCp932(uint h, uint l) const if (!cp932_ed_ee_unicode[j]) return 0; if (u==cp932_ed_ee_unicode[j]){ - return ((0x00ed +(j/189))<<8 | 0x0040+(j%189)); + return ((0x00ed +(j/189))<<8 | (0x0040+(j%189))); } } } diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 331688da7..6de93356b 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -2844,7 +2844,7 @@ static void setupLocaleMapper() localeMapper = checkForCodec( lang ); // 5. "@euro" - if ( !localeMapper && ctype && strstr( ctype, "@euro" ) || lang && strstr( lang, "@euro" ) ) + if ( ( !localeMapper && ctype && strstr( ctype, "@euro" ) ) || (lang && strstr( lang, "@euro" ) ) ) localeMapper = TQTextCodec::codecForName( "ISO 8859-15" ); // 6. guess locale from ctype unless ctype is "C" diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp index 4943ac8c2..9c9f4283f 100644 --- a/src/codecs/qutfcodec.cpp +++ b/src/codecs/qutfcodec.cpp @@ -254,8 +254,8 @@ const char* TQUtf16Codec::name() const int TQUtf16Codec::heuristicContentMatch(const char* chars, int len) const { uchar* uchars = (uchar*)chars; - if ( len >= 2 && (uchars[0] == 0xff && uchars[1] == 0xfe || - uchars[1] == 0xff && uchars[0] == 0xfe) ) + if ( len >= 2 && ((uchars[0] == 0xff && uchars[1] == 0xfe) || + (uchars[1] == 0xff && uchars[0] == 0xfe)) ) return len; else return 0; |