Index: branches/FEPSimulator/HighwaysParser.cpp
===================================================================
--- branches/FEPSimulator/NetworkReader.cpp	(revision 156)
+++ branches/FEPSimulator/HighwaysParser.cpp	(revision 177)
@@ -1,10 +1,10 @@
 #include "NetworkReader.h"
 
-NetworkReader::NetworkReader(const char * xml) {
+HighwaysParser::HighwaysParser(const char * xml) {
     ldsIndex = 0;
     loadLines(xml);
 }
 
-LOOP * NetworkReader::parseLoop(TiXmlElement * loopElem) {
+LOOP * HighwaysParser::parseLoop(TiXmlElement * loopElem) {
     LOOP *loop = new LOOP;
 
@@ -24,5 +24,5 @@
 }
 
-STATION * NetworkReader::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
+STATION * HighwaysParser::parseStation(TiXmlElement *stationElem, FEP_LINE *line) {
     STATION *station = new STATION;
 
@@ -62,5 +62,5 @@
 }
 
-FEP_LINE * NetworkReader::parseLine(TiXmlElement * lineElem) {
+FEP_LINE * HighwaysParser::parseLine(TiXmlElement * lineElem) {
     FEP_LINE *line = new FEP_LINE;
 
@@ -89,5 +89,5 @@
 }
 
-void NetworkReader::loadLines(const char * xml) {
+void HighwaysParser::loadLines(const char * xml) {
     // Load network xml file
     TiXmlDocument doc;
@@ -107,15 +107,15 @@
 }
 
-vector<FEP_LINE*> NetworkReader::getLines() {
+vector<FEP_LINE*> HighwaysParser::getLines() {
 
     return lines;
 }
 
-vector<STATION*> NetworkReader::getStations() {
+vector<STATION*> HighwaysParser::getStations() {
 
     return stations;
 }
 
-NetworkReader::~NetworkReader() {
+HighwaysParser::~HighwaysParser() {
 
 }