summaryrefslogtreecommitdiffstats
path: root/src/codecs/qutfcodec.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:38 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-08-03 08:49:38 -0500
commit7d22e97622a6b963382b88aac6dfde06a2cd8f03 (patch)
tree231f5c31f279d3e798702fe61e9b6bcef52b089b /src/codecs/qutfcodec.cpp
parent6d0157ea558089bb957f35263424a405e42a6931 (diff)
parentfe7969ef886d7287fa959929ddd33fbad8407884 (diff)
downloadtqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.tar.gz
tqt3-7d22e97622a6b963382b88aac6dfde06a2cd8f03.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
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 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;