From 0761ef3c62e43ffed5a81854b7b45e579016f5b7 Mon Sep 17 00:00:00 2001 From: tpearson 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/kmacroexpander.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'kdecore/kmacroexpander.cpp') diff --git a/kdecore/kmacroexpander.cpp b/kdecore/kmacroexpander.cpp index 3c421574e..5516c1b61 100644 --- a/kdecore/kmacroexpander.cpp +++ b/kdecore/kmacroexpander.cpp @@ -55,7 +55,7 @@ void KMacroExpanderBase::expandMacros( TQString &str ) TQString rsts; for (pos = 0; pos < str.length(); ) { - if (ec != (char)0) { + if (ec != (QChar)0) { if (str.unicode()[pos] != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -110,7 +110,7 @@ bool KMacroExpanderBase::expandMacrosShellQuote( TQString &str, uint &pos ) while (pos < str.length()) { TQChar cc( str.unicode()[pos] ); - if (ec != (char)0) { + if (ec != (QChar)0) { if (cc != ec) goto nohit; if (!(len = expandEscapedMacro( str, pos, rst ))) @@ -315,7 +315,7 @@ static TQStringList &operator+=( TQStringList &s, const TQString &n) { s << n; r static bool isIdentifier( uint c ) { - return c == (QChar)'_' || (c >= (QChar)'A' && c <= (QChar)'Z') || (c >= (QChar)'a' && c <= (QChar)'z') || (c >= (QChar)'0' && c <= (QChar)'9'); + return c == '_' || (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9'); } //////// -- cgit v1.2.1