Use "CP" instead of "FTP" in power.zones to be more compatible with Skiba's

terminology, but still allow "FTP" for backwards compatibility.
This commit is contained in:
Sean C. Rhea
2008-03-07 21:37:51 +00:00
parent 2c2d1eedb6
commit eae6f74087

View File

@@ -37,7 +37,7 @@ bool Zones::read(QFile &file)
"((\\d\\d\\d\\d)/(\\d\\d)/(\\d\\d)|BEGIN)"
"\\s+until\\s+"
"((\\d\\d\\d\\d)/(\\d\\d)/(\\d\\d)|END)\\s*"
"(,\\s*FTP\\s*=\\s*(\\d+)\\s*)?:\\s*$",
"(,\\s*(FTP|CP)\\s*=\\s*(\\d+)\\s*)?:\\s*$",
Qt::CaseInsensitive);
QRegExp zonerx("^\\s*([^ ,][^,]*),\\s*([^ ,][^,]*),\\s*"
"(\\d+)\\s*,\\s*(\\d+|MAX)\\s*$",
@@ -93,8 +93,8 @@ bool Zones::read(QFile &file)
ranges.append(range);
}
range = new ZoneRange(begin, end);
if (rangerx.numCaptures() == 10)
range->ftp = rangerx.cap(10).toInt();
if (rangerx.numCaptures() == 11)
range->ftp = rangerx.cap(11).toInt();
}
else if (zonerx.indexIn(line, 0) != -1) {
if (!range) {