summaryrefslogtreecommitdiffstats
path: root/src/codecs/qutfcodec.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-28 15:50:52 -0500
committerSlávek Banko <slavek.banko@axis.cz>2012-08-04 14:53:35 +0200
commit5ae82a06c308960c66757b0a956500b05b83f002 (patch)
treee73bef929c230d306f377880042ce09894812ccd /src/codecs/qutfcodec.cpp
parente9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff)
downloadqt3-3.5.13.1.tar.gz
qt3-3.5.13.1.zip
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch! (cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'src/codecs/qutfcodec.cpp')
-rw-r--r--src/codecs/qutfcodec.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp
index bc1abce..4e02fe5 100644
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/qutfcodec.cpp
@@ -254,8 +254,8 @@ const char* QUtf16Codec::name() const
int QUtf16Codec::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;