From eadb1dedf3bbf95a5240b095bc0fe36d5471223d Mon Sep 17 00:00:00 2001
From: "facat@lab.com" <facat@lab.com>
Date: Fri, 12 Dec 2014 16:41:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=A7ACLineSegment=E7=9A=84lineName?=
 =?UTF-8?q?=E6=8D=A2=E4=B9=98=E4=BA=86namingDescription?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: facat@lab.com <facat@lab.com>
---
 testHasttable/aclinesegment.cpp    | 6 +++---
 testHasttable/aclinesegment.h      | 4 ++--
 testHasttable/topologyrecorder.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/testHasttable/aclinesegment.cpp b/testHasttable/aclinesegment.cpp
index 5c55f8c..db58023 100644
--- a/testHasttable/aclinesegment.cpp
+++ b/testHasttable/aclinesegment.cpp
@@ -32,14 +32,14 @@ bool ACLineSegment::derivedParse(QXmlStreamReader &reader)
     {
 //        std::cout<<"Nd"<<std::endl;
 //        std::cout<<reader.readElementText().toLocal8Bit().data()<<std::endl;
-        this->lineName=reader.readElementText();
+        this->namingDescription=reader.readElementText();
     }
     return true;
 }
 
-QString ACLineSegment::getLineName()
+QString ACLineSegment::getNamingDescription()
 {
-    return this->lineName;
+    return this->namingDescription;
 }
 
 QString ACLineSegment::getTerminalA()
diff --git a/testHasttable/aclinesegment.h b/testHasttable/aclinesegment.h
index 12846f5..96a8ef6 100644
--- a/testHasttable/aclinesegment.h
+++ b/testHasttable/aclinesegment.h
@@ -8,12 +8,12 @@ public:
     virtual bool parse(QXmlStreamReader &reader);
     QString getTerminalA();
     QString getTerminalB();
-    QString getLineName();
+    QString getNamingDescription();
 protected:
     QString terminalA;
     QString terminalB;
     QString containsOfSubstation;
-    QString lineName;
+    QString namingDescription;
     virtual bool derivedParse(QXmlStreamReader &reader);
 private:
     bool isTerminalA;
diff --git a/testHasttable/topologyrecorder.cpp b/testHasttable/topologyrecorder.cpp
index 012cdfd..eb3bb3c 100644
--- a/testHasttable/topologyrecorder.cpp
+++ b/testHasttable/topologyrecorder.cpp
@@ -47,7 +47,7 @@ bool TopologyRecorder::startWithNode(const QString& node)
             terminalA=AC->getTerminalA();
             terminalB=AC->getTerminalB();
             std::cout<<"find"<<AC->getID().toStdString()<<std::endl;
-            std::cout<<AC->getLineName().toStdString()<<std::endl;
+            std::cout<<AC->getNamingDescription().toStdString()<<std::endl;
             foundCate=true;
         }
         if(ce.startsWith("SW"))