feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

avoid QChar::unicode() calls in debug builds

Browse Source 
in release mode they expand to nothing ... not so in debug mode.
This commit is contained in:
Oswald Buddenhagen
2010-01-22 16:20:44 +01:00
parent 714e981c69
commit cc635e2642
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/shared/proparser/profileevaluator.cpp
View File

@@ -1476,7 +1476,7 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
const ushort DOUBLEQUOTE = '"'; const ushort DOUBLEQUOTE = '"';
ushort unicode, quote = 0; ushort unicode, quote = 0;
const QChar *str_data = str.data(); const ushort *str_data = (const ushort *)str.data();
const int str_len = str.length(); const int str_len = str.length();
QString var, args; QString var, args;
@@ -1488,23 +1488,23 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
QString pending; // Buffer for string segments from variables QString pending; // Buffer for string segments from variables
// Only one of the above buffers can be filled at a given time. // Only one of the above buffers can be filled at a given time.
for (int i = 0; i < str_len; ++i) { for (int i = 0; i < str_len; ++i) {
unicode = str_data[i].unicode(); unicode = str_data[i];
if (unicode == DOLLAR) { if (unicode == DOLLAR) {
if (str_len > i+2 && str_data[i+1].unicode() == DOLLAR) { if (str_len > i+2 && str_data[i+1] == DOLLAR) {
++i; ++i;
ushort term = 0; ushort term = 0;
enum { VAR, ENVIRON, FUNCTION, PROPERTY } var_type = VAR; enum { VAR, ENVIRON, FUNCTION, PROPERTY } var_type = VAR;
unicode = str_data[++i].unicode(); unicode = str_data[++i];
if (unicode == LSQUARE) { if (unicode == LSQUARE) {
unicode = str_data[++i].unicode(); unicode = str_data[++i];
term = RSQUARE; term = RSQUARE;
var_type = PROPERTY; var_type = PROPERTY;
} else if (unicode == LCURLY) { } else if (unicode == LCURLY) {
unicode = str_data[++i].unicode(); unicode = str_data[++i];
var_type = VAR; var_type = VAR;
term = RCURLY; term = RCURLY;
} else if (unicode == LPAREN) { } else if (unicode == LPAREN) {
unicode = str_data[++i].unicode(); unicode = str_data[++i];
var_type = ENVIRON; var_type = ENVIRON;
term = RPAREN; term = RPAREN;
} }
@@ -1518,10 +1518,10 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
break; break;
if (++i == str_len) if (++i == str_len)
break; break;
unicode = str_data[i].unicode(); unicode = str_data[i];
// at this point, i points to either the 'term' or 'next' character (which is in unicode) // at this point, i points to either the 'term' or 'next' character (which is in unicode)
} }
var = QString::fromRawData(str_data + name_start, i - name_start); var = QString::fromRawData((QChar*)str_data + name_start, i - name_start);
if (var_type == VAR && unicode == LPAREN) { if (var_type == VAR && unicode == LPAREN) {
var_type = FUNCTION; var_type = FUNCTION;
name_start = i + 1; name_start = i + 1;
@@ -1529,7 +1529,7 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
forever { forever {
if (++i == str_len) if (++i == str_len)
break; break;
unicode = str_data[i].unicode(); unicode = str_data[i];
if (unicode == LPAREN) { if (unicode == LPAREN) {
depth++; depth++;
} else if (unicode == RPAREN) { } else if (unicode == RPAREN) {
@@ -1538,9 +1538,9 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
--depth; --depth;
} }
} }
args = QString(str_data + name_start, i - name_start); args = QString((QChar*)str_data + name_start, i - name_start);
if (++i < str_len) if (++i < str_len)
unicode = str_data[i].unicode(); unicode = str_data[i];
else else
unicode = 0; unicode = 0;
// at this point i is pointing to the 'next' character (which is in unicode) // at this point i is pointing to the 'next' character (which is in unicode)
@@ -1592,7 +1592,7 @@ QStringList ProFileEvaluator::Private::expandVariableReferences(
} }
} else if (unicode == BACKSLASH) { } else if (unicode == BACKSLASH) {
static const char symbols[] = "[]{}()$\\'\""; static const char symbols[] = "[]{}()$\\'\"";
ushort unicode2 = str_data[i+1].unicode(); ushort unicode2 = str_data[i+1];
if (!(unicode2 & 0xff00) && strchr(symbols, unicode2)) { if (!(unicode2 & 0xff00) && strchr(symbols, unicode2)) {
unicode = unicode2; unicode = unicode2;
++i; ++i;