SHS/cd
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove PIString operator <<

Browse Source
This commit is contained in:
Бычков Андрей
2022-07-22 14:34:11 +03:00
parent b4bd6646b4
commit be1ccc4f0a
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/core/cdutils_core.cpp
View File

@@ -558,7 +558,7 @@ PIString CDCore::pathToString(const PIDeque<int> & p) {
PIString ret; PIString ret;
for (int i = 0; i < p.size_s(); ++i) { for (int i = 0; i < p.size_s(); ++i) {
if (!ret.isEmpty()) ret += "."; if (!ret.isEmpty()) ret += ".";
ret << p[i]; ret += PIString::fromNumber(p[i]);
} }
return ret; return ret;
} }

2
libs/core/cdutils_parser.cpp
View File

@@ -150,7 +150,7 @@ CDSection CDParser::parse(PIIODevice * d, int cdsection_type) {
ts.section(evals[i]).alias = enames[i]; ts.section(evals[i]).alias = enames[i];
} }
ts.name = is.name; ts.name = is.name;
ts.name.insert(ibpos, PIString("[") << a << "]"); ts.name.insert(ibpos, PIString('[') + a + ']');
is = ts; is = ts;
ts = CDSection(et); ts = CDSection(et);
} }

30
libs/core/cdutils_types.cpp
View File

@@ -183,9 +183,10 @@ void CDType::writeX(PIByteArray & ba) {
bool CDType::calculate(PIEvaluator * e, PIVector<const CDType * > stack) { bool CDType::calculate(PIEvaluator * e, PIVector<const CDType * > stack) {
if (stack.contains(this)) { if (stack.contains(this)) {
error_ = "Circular dependencies: "; error_ = "Circular dependencies: ";
piForeachC (CDType * k, stack) for (const CDType * k : stack) {
error_ << k->name() << " -> "; error_ += k->name() + " -> ";
error_ << name(); }
error_ += name();
//piCout << error_; //piCout << error_;
return false; return false;
} }
@@ -452,33 +453,34 @@ void CDSection::write(PIIODevice * d, const PIString & prefix) {
switch (cd_type_) { switch (cd_type_) {
case CDType::cdNull: break; case CDType::cdNull: break;
case CDType::cdK: case CDType::cdK:
l.clear(); l << ck.index() << ".f = " << ck.formula() << " #s " << ck.comment() << " \n"; l = PIString::fromNumber(ck.index()) + ".f = " + ck.formula() + " #s " + ck.comment() + " \n";
d->write(l.toUTF8()); d->write(l.toUTF8());
l.clear(); l << ck.index() << ".v = " << ck.value() << " #" << ck.type() << " " << ck.name() << " \n"; l = PIString::fromNumber(ck.index()) + ".v = " + ck.value() + " #" + ck.type() + " " + ck.name() + " \n";
d->write(l.toUTF8()); d->write(l.toUTF8());
if (!ck.enumValues().enum_list.isEmpty()) { if (!ck.enumValues().enum_list.isEmpty()) {
l.clear(); l << ck.index() << ".ev = {"; l = PIString::fromNumber(ck.index()) + ".ev = {";
//PIVector<CDType::Enumerator> el = ck.enumValues(); //PIVector<CDType::Enumerator> el = ck.enumValues();
piForeachC (PIVariantTypes::Enumerator & e, ck.enumValues().enum_list) for (const PIVariantTypes::Enumerator & e : ck.enumValues().enum_list) {
l << e.value << " - " << e.name << ", "; l += e.value + " - " + e.name + ", ";
}
l.cutRight(2); l.cutRight(2);
l << "} \n"; l += "} \n";
d->write(l.toUTF8()); d->write(l.toUTF8());
} }
break; break;
case CDType::cdX: case CDType::cdX:
l.clear(); l << ck.index() << ".name = " << ck.name() << " #s " << ck.comment() << " \n"; l = PIString::fromNumber(ck.index()) + ".name = " + ck.name() + " #s " + ck.comment() + " \n";
d->write(l.toUTF8()); d->write(l.toUTF8());
l.clear(); l << ck.index() << ".mode = " << ck.xmode() << " #e (0 - cur, 1 - all_avg) " << "\n"; l = PIString::fromNumber(ck.index()) + ".mode = " + ck.xmode() + " #e (0 - cur, 1 - all_avg) " + "\n";
d->write(l.toUTF8()); d->write(l.toUTF8());
l.clear(); l << ck.index() << ".avg = " << ck.avg() << " #n " << "\n"; l = PIString::fromNumber(ck.index()) + ".avg = " + ck.avg() + " #n " + "\n";
d->write(l.toUTF8()); d->write(l.toUTF8());
l.clear(); l << ck.index() << ".sel = " << (ck.isSelectedX() ? "1" : "0") << " #n " << "\n"; l = PIString::fromNumber(ck.index()) + ".sel = " + (ck.isSelectedX() ? "1" : "0") + " #n " + "\n";
d->write(l.toUTF8()); d->write(l.toUTF8());
break; break;
case CDType::cdC: case CDType::cdC:
case CDType::cdM: case CDType::cdM:
l.clear(); l << ck.index() << ".name = " << ck.name() << " #s " << ck.comment() << " \n"; l = PIString::fromNumber(ck.index()) + ".name = " + ck.name() + " #s " + ck.comment() + " \n";
d->write(l.toUTF8()); d->write(l.toUTF8());
break; break;
} }