From eae6f7408751bd5dbde4cd004cbaa2e2d6ffad0f Mon Sep 17 00:00:00 2001
From: "Sean C. Rhea" <sean.c.rhea@gmail.com>
Date: Fri, 7 Mar 2008 21:37:51 +0000
Subject: [PATCH] Use "CP" instead of "FTP" in power.zones to be more
 compatible with Skiba's terminology, but still allow "FTP" for backwards
 compatibility.

---
 src/gui/Zones.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/Zones.cpp b/src/gui/Zones.cpp
index d320ffcc7..5aba46b39 100644
--- a/src/gui/Zones.cpp
+++ b/src/gui/Zones.cpp
@@ -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) {