[Kst] branches/work/kst/portto4/kst/src/libkstmath
Adam Treat
treat at kde.org
Fri Feb 16 23:03:46 CET 2007
SVN commit 634335 by treat:
* stripWhiteSpace -> trimmed
M +3 -3 enodes.cpp
M +1 -1 kstdataobjectcollection.cpp
M +2 -2 labelparser.cpp
--- branches/work/kst/portto4/kst/src/libkstmath/enodes.cpp #634334:634335
@@ -775,10 +775,10 @@
: Node(), _isEquation(false), _equation(0L) {
//printf("%p: New Data Object: [%s]\n", (void*)this, name);
if (name[0] == '=') {
- _tagName = QString(&name[1]).stripWhiteSpace();
+ _tagName = QString(&name[1]).trimmed();
_isEquation = true;
} else if (strchr(name, '[')) {
- _tagName = QString(name).stripWhiteSpace();
+ _tagName = QString(name).trimmed();
QRegExp re("(.*)\\[(.*)\\]");
int hit = re.search(_tagName);
if (hit > -1 && re.numCaptures() == 2) {
@@ -788,7 +788,7 @@
}
}
} else {
- _tagName = QString(name).stripWhiteSpace();
+ _tagName = QString(name).trimmed();
_vector = *KST::vectorList.findTag(_tagName);
if (!_vector) {
_scalar = *KST::scalarList.findTag(_tagName);
--- branches/work/kst/portto4/kst/src/libkstmath/kstdataobjectcollection.cpp #634334:634335
@@ -31,7 +31,7 @@
Q_UNUSED(p)
Q_UNUSED(warn)
/* verify that the tag name is not empty */
- if (tag.stripWhiteSpace().isEmpty()) {
+ if (tag.trimmed().isEmpty()) {
return true;
}
--- branches/work/kst/portto4/kst/src/libkstmath/labelparser.cpp #634334:634335
@@ -613,11 +613,11 @@
}
if (vector) {
- ctail->text = txt.mid(i + 1, vectorIndexStart - i - 2).stripWhiteSpace();
+ ctail->text = txt.mid(i + 1, vectorIndexStart - i - 2).trimmed();
ctail->expression = txt.mid(vectorIndexStart, vectorIndexEnd - vectorIndexStart + 1);
ctail->vector = true;
} else {
- ctail->text = txt.mid(i + 1, pos - i - 1).stripWhiteSpace();
+ ctail->text = txt.mid(i + 1, pos - i - 1).trimmed();
ctail->scalar = true;
}
i = uint(pos);
More information about the Kst
mailing list