summaryrefslogtreecommitdiffstats
path: root/qtools
diff options
context:
space:
mode:
Diffstat (limited to 'qtools')
-rw-r--r--qtools/qcstring.cpp42
1 files changed, 21 insertions, 21 deletions
diff --git a/qtools/qcstring.cpp b/qtools/qcstring.cpp
index 2d2e0c5..44324c2 100644
--- a/qtools/qcstring.cpp
+++ b/qtools/qcstring.cpp
@@ -666,8 +666,8 @@ int QCString::find( char c, int index, bool cs ) const
d = strchr( data()+index, c );
} else {
d = data()+index;
- c = tolower( c );
- while ( *d && tolower(*d) != c )
+ c = tolower( (uchar) c );
+ while ( *d && tolower((uchar) *d) != c )
d++;
if ( !*d && c ) // not found
d = 0;
@@ -740,8 +740,8 @@ int QCString::findRev( char c, int index, bool cs ) const
while ( d >= b && *d != c )
d--;
} else { // case insensitive
- c = tolower( c );
- while ( d >= b && tolower(*d) != c )
+ c = tolower( (uchar) c );
+ while ( d >= b && tolower((uchar) *d) != c )
d--;
}
return d >= b ? (int)(d - b) : -1;
@@ -801,9 +801,9 @@ int QCString::contains( char c, bool cs ) const
if ( *d++ == c )
count++;
} else { // case insensitive
- c = tolower( c );
+ c = tolower( (uchar) c );
while ( *d ) {
- if ( tolower(*d) == c )
+ if ( tolower((uchar) *d) == c )
count++;
d++;
}
@@ -1031,7 +1031,7 @@ QCString QCString::lower() const
register char *p = s.data();
if ( p ) {
while ( *p ) {
- *p = tolower(*p);
+ *p = tolower((uchar) *p);
p++;
}
}
@@ -1059,7 +1059,7 @@ QCString QCString::upper() const
register char *p = s.data();
if ( p ) {
while ( *p ) {
- *p = toupper(*p);
+ *p = toupper((uchar)*p);
p++;
}
}
@@ -1089,19 +1089,19 @@ QCString QCString::stripWhiteSpace() const
register char *s = data();
QCString result = s;
int reslen = result.length();
- if ( !isspace(s[0]) && !isspace(s[reslen-1]) )
+ if ( !isspace((uchar) s[0]) && !isspace((uchar) s[reslen-1]) )
return result; // returns a copy
s = result.data();
int start = 0;
int end = reslen - 1;
- while ( isspace(s[start]) ) // skip white space from start
+ while ( isspace((uchar) s[start]) ) // skip white space from start
start++;
if ( s[start] == '\0' ) { // only white space
result.resize( 1 );
return result;
}
- while ( end && isspace(s[end]) ) // skip white space from end
+ while ( end && isspace((uchar) s[end]) ) // skip white space from end
end--;
end -= start - 1;
memmove( result.data(), &s[start], end );
@@ -1134,9 +1134,9 @@ QCString QCString::simplifyWhiteSpace() const
char *to = result.data();
char *first = to;
while ( TRUE ) {
- while ( *from && isspace(*from) )
+ while ( *from && isspace((uchar) *from) )
from++;
- while ( *from && !isspace(*from) )
+ while ( *from && !isspace((uchar)*from) )
*to++ = *from++;
if ( *from )
*to++ = 0x20; // ' '
@@ -1367,7 +1367,7 @@ long QCString::toLong( bool *ok ) const
int neg = 0;
if ( !p )
goto bye;
- while ( isspace(*p) ) // skip leading space
+ while ( isspace((uchar)*p) ) // skip leading space
p++;
if ( *p == '-' ) {
p++;
@@ -1375,16 +1375,16 @@ long QCString::toLong( bool *ok ) const
} else if ( *p == '+' ) {
p++;
}
- if ( !isdigit(*p) )
+ if ( !isdigit((uchar)*p) )
goto bye;
- while ( isdigit(*p) ) {
+ while ( isdigit((uchar)*p) ) {
if ( val > max_mult || (val == max_mult && (*p-'0') > 7+neg) )
goto bye;
val = 10*val + (*p++ - '0');
}
if ( neg )
val = -val;
- while ( isspace(*p) ) // skip trailing space
+ while ( isspace((uchar)*p) ) // skip trailing space
p++;
if ( *p == '\0' )
is_ok = TRUE;
@@ -1411,18 +1411,18 @@ ulong QCString::toULong( bool *ok ) const
bool is_ok = FALSE;
if ( !p )
goto bye;
- while ( isspace(*p) ) // skip leading space
+ while ( isspace((uchar)*p) ) // skip leading space
p++;
if ( *p == '+' )
p++;
- if ( !isdigit(*p) )
+ if ( !isdigit((uchar)*p) )
goto bye;
- while ( isdigit(*p) ) {
+ while ( isdigit((uchar)*p) ) {
if ( val > max_mult || (val == max_mult && (*p-'0') > 5) )
goto bye;
val = 10*val + (*p++ - '0');
}
- while ( isspace(*p) ) // skip trailing space
+ while ( isspace((uchar)*p) ) // skip trailing space
p++;
if ( *p == '\0' )
is_ok = TRUE;