From 0761ef3c62e43ffed5a81854b7b45e579016f5b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 6 Aug 2010 19:48:06 +0000
Subject: Locked down more ambiguous datatypes

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1160010 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdecore/kcharsets.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'kdecore/kcharsets.cpp')

diff --git a/kdecore/kcharsets.cpp b/kdecore/kcharsets.cpp
index f4ae826f5..52cf87849 100644
--- a/kdecore/kcharsets.cpp
+++ b/kdecore/kcharsets.cpp
@@ -372,13 +372,13 @@ TQChar KCharsets::fromEntity(const TQString &str)
     TQChar res = TQChar::null;
 
     int pos = 0;
-    if(str[pos] == '&') pos++;
+    if(str[pos] == (QChar)'&') pos++;
 
     // Check for '&#000' or '&#x0000' sequence
-    if (str[pos] == '#' && str.length()-pos > 1) {
+    if (str[pos] == (QChar)'#' && str.length()-pos > 1) {
         bool ok;
         pos++;
-        if (str[pos] == 'x' || str[pos] == 'X') {
+        if (str[pos] == (QChar)'x' || str[pos] == (QChar)'X') {
             pos++;
             // '&#x0000', hexadeciaml character reference
             TQString tmp(str.unicode()+pos, str.length()-pos);
@@ -412,7 +412,7 @@ TQChar KCharsets::fromEntity(const TQString &str, int &len)
     {
         TQString tmp = str.left(len);
         TQChar res = fromEntity(tmp);
-        if( res != TQChar::null ) return res;
+        if( res != (QChar)TQChar::null ) return res;
         len--;
     }
     return TQChar::null;
@@ -437,13 +437,13 @@ TQString KCharsets::resolveEntities( const TQString &input )
     for ( ; p < end; ++p ) {
         const TQChar ch = *p;
 
-        if ( ch == '&' ) {
+        if ( ch == (QChar)'&' ) {
             ampersand = p;
             scanForSemicolon = true;
             continue;
         }
 
-        if ( ch != ';' || scanForSemicolon == false )
+        if ( ch != (QChar)';' || scanForSemicolon == false )
             continue;
 
         assert( ampersand );
-- 
cgit v1.2.1