9.10.2011 - stable backup commit

This commit is contained in:
peri4
2011-10-09 22:23:52 +04:00
parent 29190ea465
commit 39ec9cac5c
39 changed files with 1170 additions and 512 deletions

View File

@@ -8,7 +8,7 @@ PIConfig::Entry PIConfig::Entry::_empty;
PIConfig::Branch PIConfig::Branch::allLeaves() {
Branch b;
b.delim = delim;
piForeachCA (i, *this) {
piForeach (Entry * i, *this) {
if (i->isLeaf()) b << i;
else allLeaves(b, i);
}
@@ -27,7 +27,7 @@ PIConfig::Entry & PIConfig::Branch::getValue(const PIString & vname, const PIStr
PIString name = tree.front();
tree.pop_front();
Entry * ce = 0;
piForeachCA (i, *this)
piForeach (Entry * i, *this)
if (i->_name == name) {
ce = i;
break;
@@ -39,7 +39,7 @@ PIConfig::Entry & PIConfig::Branch::getValue(const PIString & vname, const PIStr
if (exist != 0) *exist = false;
return _empty;
}
piForeachCA (i, tree) {
piForeach (PIString & i, tree) {
ce = ce->findChild(i);
if (ce == 0) {
_empty._name = vname;
@@ -57,12 +57,12 @@ PIConfig::Entry & PIConfig::Branch::getValue(const PIString & vname, const PIStr
PIConfig::Branch PIConfig::Branch::getValues(const PIString & name) {
Branch b;
b.delim = delim;
piForeachA (i, *this) {
piForeach (Entry * i, *this) {
if (i->isLeaf()) {
if (i->_name.find(name) >= 0)
b << i;
} else {
piForeachA (j, i->_children)
piForeach (Entry * j, i->_children)
if (j->_name.find(name) >= 0)
b << j;
}
@@ -74,7 +74,7 @@ PIConfig::Branch PIConfig::Branch::getValues(const PIString & name) {
PIConfig::Branch PIConfig::Branch::getLeaves() {
Branch b;
b.delim = delim;
piForeachA (i, *this)
piForeach (Entry * i, *this)
if (i->isLeaf())
b << i;
return b;
@@ -84,7 +84,7 @@ PIConfig::Branch PIConfig::Branch::getLeaves() {
PIConfig::Branch PIConfig::Branch::getBranches() {
Branch b;
b.delim = delim;
piForeachA (i, *this)
piForeach (Entry * i, *this)
if (!i->isLeaf())
b << i;
return b;
@@ -107,7 +107,7 @@ bool PIConfig::Branch::entryExists(const Entry * e, const PIString & name) const
if (e->_name == name) return true;
else return false;
}
piForeachCA (i, e->_children)
piForeachC (Entry * i, e->_children)
if (entryExists(i, name)) return true;
return false;
}
@@ -116,7 +116,7 @@ bool PIConfig::Branch::entryExists(const Entry * e, const PIString & name) const
PIConfig::Entry & PIConfig::Entry::getValue(const PIString & vname, const PIString & def, bool * exist) {
PIStringList tree = vname.split(delim);
Entry * ce = this;
piForeachCA (i, tree) {
piForeach (PIString & i, tree) {
ce = ce->findChild(i);
if (ce == 0) {
_empty._name = vname;
@@ -134,7 +134,7 @@ PIConfig::Entry & PIConfig::Entry::getValue(const PIString & vname, const PIStri
PIConfig::Branch PIConfig::Entry::getValues(const PIString & vname) {
Branch b;
b.delim = delim;
piForeachA (i, _children)
piForeach (Entry * i, _children)
if (i->_name.find(vname) >= 0)
b << i;
return b;
@@ -146,7 +146,7 @@ bool PIConfig::Entry::entryExists(const Entry * e, const PIString & name) const
if (e->_name == name) return true;
else return false;
}
piForeachCA (i, e->_children)
piForeachC (Entry * i, e->_children)
if (entryExists(i, name)) return true;
return false;
}
@@ -166,7 +166,7 @@ PIConfig::PIConfig(const PIString & path, PIFlags<Mode> mode): PIFile(path, mode
PIConfig::Entry & PIConfig::getValue(const PIString & vname, const PIString & def, bool * exist) {
PIStringList tree = vname.split(delim);
Entry * ce = &root;
piForeachCA (i, tree) {
piForeach (PIString & i, tree) {
ce = ce->findChild(i);
if (ce == 0) {
if (exist != 0) *exist = false;
@@ -184,7 +184,7 @@ PIConfig::Entry & PIConfig::getValue(const PIString & vname, const PIString & de
PIConfig::Branch PIConfig::getValues(const PIString & vname) {
Branch b;
b.delim = delim;
piForeachA (i, root._children)
piForeach (Entry * i, root._children)
if (i->_name.find(vname) >= 0)
b << i;
return b;
@@ -200,7 +200,7 @@ void PIConfig::addEntry(const PIString & name, const PIString & value, const PIS
tree.pop_back();
Entry * te, * ce, * entry = &root;
if (tree.isEmpty()) toRoot = true;
piForeachA (i, tree) {
piForeach (PIString & i, tree) {
te = entry->findChild(i);
if (te == 0) {
ce = new Entry();
@@ -270,7 +270,7 @@ void PIConfig::setValue(const PIString & name, const PIString & value, const PIS
int PIConfig::entryIndex(const PIString & name) {
PIStringList tree = name.split(delim);
Entry * ce = &root;
piForeachCA (i, tree) {
piForeach (PIString & i, tree) {
ce = ce->findChild(i);
if (ce == 0)
return -1;
@@ -395,7 +395,7 @@ bool PIConfig::entryExists(const Entry * e, const PIString & name) const {
if (e->_name == name) return true;
else return false;
}
piForeachCA (i, e->_children)
piForeachC (Entry * i, e->_children)
if (entryExists(i, name)) return true;
return false;
}
@@ -436,7 +436,7 @@ void PIConfig::parse() {
name = tree.back();
tree.pop_back();
entry = &root;
piForeachA (i, tree) {
piForeach (PIString & i, tree) {
te = entry->findChild(i);
if (te == 0) {
ce = new Entry();
@@ -471,4 +471,5 @@ void PIConfig::parse() {
lines++;
}
setEntryDelim(&root, delim);
buildFullNames(&root);
}