From 06c8656b9ed4d82313855bc62838fe9ece1a4eb1 Mon Sep 17 00:00:00 2001
From: Dennis Luxen <luxen@kit.edu>
Date: Wed, 14 Aug 2013 13:41:23 +0200
Subject: [PATCH] Moving DataStructures out of Plugin directory

---
 {Plugins => DataStructures}/RawRouteData.h           | 4 ++++
 Plugins/BasePlugin.h                                 | 2 +-
 Plugins/HelloWorldPlugin.h                           | 1 -
 Plugins/LocatePlugin.h                               | 1 -
 Plugins/NearestPlugin.h                              | 1 -
 Plugins/TimestampPlugin.h                            | 1 -
 Plugins/ViaRoutePlugin.h                             | 1 -
 RoutingAlgorithms/BasicRoutingInterface.h            | 2 +-
 {Plugins => Server/DataStructures}/RouteParameters.h | 4 ++--
 9 files changed, 8 insertions(+), 9 deletions(-)
 rename {Plugins => DataStructures}/RawRouteData.h (93%)
 rename {Plugins => Server/DataStructures}/RouteParameters.h (97%)

diff --git a/Plugins/RawRouteData.h b/DataStructures/RawRouteData.h
similarity index 93%
rename from Plugins/RawRouteData.h
rename to DataStructures/RawRouteData.h
index e43e22c62..7607e3300 100644
--- a/Plugins/RawRouteData.h
+++ b/DataStructures/RawRouteData.h
@@ -21,8 +21,12 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef RAWROUTEDATA_H_
 #define RAWROUTEDATA_H_
 
+#include "../DataStructures/Coordinate.h"
+#include "../DataStructures/PhantomNodes.h"
 #include "../typedefs.h"
 
+#include <vector>
+
 struct _PathData {
     _PathData(NodeID no, unsigned na, unsigned tu, unsigned dur) : node(no), nameID(na), durationOfSegment(dur), turnInstruction(tu) { }
     NodeID node;
diff --git a/Plugins/BasePlugin.h b/Plugins/BasePlugin.h
index 4985719b5..f359942af 100644
--- a/Plugins/BasePlugin.h
+++ b/Plugins/BasePlugin.h
@@ -21,9 +21,9 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef BASEPLUGIN_H_
 #define BASEPLUGIN_H_
 
-#include "RouteParameters.h"
 #include "../DataStructures/Coordinate.h"
 #include "../Server/BasicDatastructures.h"
+#include "../Server/DataStructures/RouteParameters.h"
 
 #include <string>
 #include <vector>
diff --git a/Plugins/HelloWorldPlugin.h b/Plugins/HelloWorldPlugin.h
index 546789b1e..7c2987ecf 100644
--- a/Plugins/HelloWorldPlugin.h
+++ b/Plugins/HelloWorldPlugin.h
@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define HELLOWORLDPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include <sstream>
 
diff --git a/Plugins/LocatePlugin.h b/Plugins/LocatePlugin.h
index 8a1c9af91..c1c69c009 100644
--- a/Plugins/LocatePlugin.h
+++ b/Plugins/LocatePlugin.h
@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define LOCATEPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 #include "../DataStructures/NodeInformationHelpDesk.h"
 #include "../Server/DataStructures/QueryObjectsStorage.h"
 #include "../Util/StringUtil.h"
diff --git a/Plugins/NearestPlugin.h b/Plugins/NearestPlugin.h
index a1ca3537e..89bbc86e5 100644
--- a/Plugins/NearestPlugin.h
+++ b/Plugins/NearestPlugin.h
@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define NearestPlugin_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include "../DataStructures/NodeInformationHelpDesk.h"
 #include "../Server/DataStructures/QueryObjectsStorage.h"
diff --git a/Plugins/TimestampPlugin.h b/Plugins/TimestampPlugin.h
index 6142cb825..ba0510c3e 100644
--- a/Plugins/TimestampPlugin.h
+++ b/Plugins/TimestampPlugin.h
@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define TIMESTAMPPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 class TimestampPlugin : public BasePlugin {
 public:
diff --git a/Plugins/ViaRoutePlugin.h b/Plugins/ViaRoutePlugin.h
index 46f17bb3b..847a32a9f 100644
--- a/Plugins/ViaRoutePlugin.h
+++ b/Plugins/ViaRoutePlugin.h
@@ -22,7 +22,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #define VIAROUTEPLUGIN_H_
 
 #include "BasePlugin.h"
-#include "RouteParameters.h"
 
 #include "../Algorithms/ObjectToBase64.h"
 #include "../DataStructures/HashTable.h"
diff --git a/RoutingAlgorithms/BasicRoutingInterface.h b/RoutingAlgorithms/BasicRoutingInterface.h
index 67615a89d..cb956b504 100644
--- a/RoutingAlgorithms/BasicRoutingInterface.h
+++ b/RoutingAlgorithms/BasicRoutingInterface.h
@@ -23,7 +23,7 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef BASICROUTINGINTERFACE_H_
 #define BASICROUTINGINTERFACE_H_
 
-#include "../Plugins/RawRouteData.h"
+#include "../DataStructures/RawRouteData.h"
 #include "../Util/ContainerUtils.h"
 #include "../Util/SimpleLogger.h"
 
diff --git a/Plugins/RouteParameters.h b/Server/DataStructures/RouteParameters.h
similarity index 97%
rename from Plugins/RouteParameters.h
rename to Server/DataStructures/RouteParameters.h
index ecef68f24..f46a20a10 100644
--- a/Plugins/RouteParameters.h
+++ b/Server/DataStructures/RouteParameters.h
@@ -21,8 +21,8 @@ or see http://www.gnu.org/licenses/agpl.txt.
 #ifndef ROUTE_PARAMETERS_H
 #define ROUTE_PARAMETERS_H
 
-#include "../DataStructures/Coordinate.h"
-#include "../DataStructures/HashTable.h"
+#include "../../DataStructures/Coordinate.h"
+#include "../../DataStructures/HashTable.h"
 
 #include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>