Index: branches/FEPSimulator/HighwaysParser.h
===================================================================
--- branches/FEPSimulator/HighwaysParser.h	(revision 198)
+++ branches/FEPSimulator/HighwaysParser.h	(revision 202)
@@ -13,4 +13,6 @@
 #include <iostream>
 #include <sstream>
+#include <stdio.h>
+#include "DataPacker.h"
 
 class HighwaysParser {
@@ -18,16 +20,9 @@
     HighwaysParser(char * highwaysData);
     
-    vector<FEP_LINE*> getLines();
-    vector<STATION*> getStations();
-    
+    vector<FEP_LINE*> lines;
+    vector<STATION*> stations;
     virtual ~HighwaysParser();
 private:
-    vector<FEP_LINE*> lines;
-    vector<STATION*> stations;
-    
-    FEP_LINE * parseLine(istringstream highwaysData);
-    STATION * parseStation(istringstream highwaysData);
-    LOOP * parseLoop(istringstream highwaysData);
-    void parseLines(istringstream highwaysData);
+    void parseLines(char * highwaysData);
 };