From d2ea60b35821244ae2cab381c7f8b57c5c346aaf Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 9 Oct 2014 19:12:34 +0000
Subject: [PATCH] [ML] Specify full path in includes.

Also removed unnecessary includes.
---
 MeshLib/Elements/Face.h                 |  7 +++----
 MeshLib/Elements/FemElem.h              |  3 ++-
 MeshLib/Elements/TemplateHex-impl.h     |  5 +++--
 MeshLib/Elements/TemplateHex.h          |  2 +-
 MeshLib/Elements/TemplateLine.h         |  8 ++++----
 MeshLib/Elements/TemplatePrism-impl.h   |  7 +++----
 MeshLib/Elements/TemplatePrism.h        |  2 +-
 MeshLib/Elements/TemplatePyramid-impl.h |  7 +++----
 MeshLib/Elements/TemplatePyramid.h      |  2 +-
 MeshLib/Elements/TemplateQuad-impl.h    |  8 +++-----
 MeshLib/Elements/TemplateQuad.h         |  2 +-
 MeshLib/Elements/TemplateTet-impl.h     |  5 ++---
 MeshLib/Elements/TemplateTet.h          |  2 +-
 MeshLib/Elements/TemplateTri-impl.h     |  3 ---
 MeshLib/Elements/TemplateTri.h          | 14 ++++++++------
 15 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/MeshLib/Elements/Face.h b/MeshLib/Elements/Face.h
index d9a5ad0babf..b338d7a2694 100644
--- a/MeshLib/Elements/Face.h
+++ b/MeshLib/Elements/Face.h
@@ -17,12 +17,11 @@
 
 #include <limits>
 
-#include "Element.h"
+#include "GeoLib/Point.h"
 
-// GeoLib
-#include "Point.h"
+#include "MathLib/Vector3.h"
 
-#include "Vector3.h"
+#include "Element.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/FemElem.h b/MeshLib/Elements/FemElem.h
index a7e90822fc1..b604a313e22 100644
--- a/MeshLib/Elements/FemElem.h
+++ b/MeshLib/Elements/FemElem.h
@@ -15,7 +15,8 @@
 #ifndef FEMELEM_H_
 #define FEMELEM_H_
 
-#include "Point.h"
+// GeoLib
+#include "GeoLib/Point.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplateHex-impl.h b/MeshLib/Elements/TemplateHex-impl.h
index 7a462b33579..82b78a80f0f 100644
--- a/MeshLib/Elements/TemplateHex-impl.h
+++ b/MeshLib/Elements/TemplateHex-impl.h
@@ -14,11 +14,12 @@
 
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Quad.h"
 #include "Prism.h"
 
-#include "AnalyticalGeometry.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplateHex.h b/MeshLib/Elements/TemplateHex.h
index 43231955e5c..6566be8670d 100644
--- a/MeshLib/Elements/TemplateHex.h
+++ b/MeshLib/Elements/TemplateHex.h
@@ -16,7 +16,7 @@
 #define TEMPLATEHEX_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateLine.h b/MeshLib/Elements/TemplateLine.h
index 3a3d661baea..11f275e523f 100644
--- a/MeshLib/Elements/TemplateLine.h
+++ b/MeshLib/Elements/TemplateLine.h
@@ -19,12 +19,12 @@
 #include <limits>
 #include <cmath>
 
-#include "MeshEnums.h"
-#include "Element.h"
-#include "Node.h"
+#include "MathLib/MathTools.h"
 
-#include "MathTools.h"
+#include "MeshLib/MeshEnums.h"
+#include "MeshLib/Node.h"
 
+#include "Element.h"
 
 namespace MeshLib {
 
diff --git a/MeshLib/Elements/TemplatePrism-impl.h b/MeshLib/Elements/TemplatePrism-impl.h
index b460682cd20..392220ee8a5 100644
--- a/MeshLib/Elements/TemplatePrism-impl.h
+++ b/MeshLib/Elements/TemplatePrism-impl.h
@@ -15,13 +15,12 @@
 // Thirdparty
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Tri.h"
-#include "Pyramid.h"
 #include "Quad.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLPRISMTYPE>
diff --git a/MeshLib/Elements/TemplatePrism.h b/MeshLib/Elements/TemplatePrism.h
index ea98f9ce71f..28147429f9c 100644
--- a/MeshLib/Elements/TemplatePrism.h
+++ b/MeshLib/Elements/TemplatePrism.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPRISM_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplatePyramid-impl.h b/MeshLib/Elements/TemplatePyramid-impl.h
index a1a3f6ee541..35166030c12 100644
--- a/MeshLib/Elements/TemplatePyramid-impl.h
+++ b/MeshLib/Elements/TemplatePyramid-impl.h
@@ -15,13 +15,12 @@
 // Thirdparty
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
+
 #include "Tri.h"
-#include "Tet.h"
 #include "Quad.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLPYRAMIDTYPE>
diff --git a/MeshLib/Elements/TemplatePyramid.h b/MeshLib/Elements/TemplatePyramid.h
index 620075d88c4..648c0e7ea2f 100644
--- a/MeshLib/Elements/TemplatePyramid.h
+++ b/MeshLib/Elements/TemplatePyramid.h
@@ -16,7 +16,7 @@
 #define TEMPLATEPYRAMID_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateQuad-impl.h b/MeshLib/Elements/TemplateQuad-impl.h
index 23829e4974a..f7df20f2eec 100644
--- a/MeshLib/Elements/TemplateQuad-impl.h
+++ b/MeshLib/Elements/TemplateQuad-impl.h
@@ -14,12 +14,10 @@
 
 #include <array>
 
-#include "Node.h"
-#include "Tri.h"
+#include "MeshLib/Node.h"
 
-// MathLib
-#include "MathTools.h"
-#include "AnalyticalGeometry.h"
+#include "MathLib/MathTools.h"
+#include "GeoLib/AnalyticalGeometry.h"
 
 namespace MeshLib
 {
diff --git a/MeshLib/Elements/TemplateQuad.h b/MeshLib/Elements/TemplateQuad.h
index 407c2b98056..a80230bd430 100644
--- a/MeshLib/Elements/TemplateQuad.h
+++ b/MeshLib/Elements/TemplateQuad.h
@@ -16,7 +16,7 @@
 #define TEMPLATEQUAD_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Face.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTet-impl.h b/MeshLib/Elements/TemplateTet-impl.h
index 5d70c1778a6..67c032850f5 100644
--- a/MeshLib/Elements/TemplateTet-impl.h
+++ b/MeshLib/Elements/TemplateTet-impl.h
@@ -14,11 +14,10 @@
 
 #include "logog/include/logog.hpp"
 
-#include "Node.h"
+#include "GeoLib/AnalyticalGeometry.h"
+#include "MeshLib/Node.h"
 #include "Tri.h"
 
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLTETTYPE>
diff --git a/MeshLib/Elements/TemplateTet.h b/MeshLib/Elements/TemplateTet.h
index 7fee311b348..29bffdde3dc 100644
--- a/MeshLib/Elements/TemplateTet.h
+++ b/MeshLib/Elements/TemplateTet.h
@@ -16,7 +16,7 @@
 #define TEMPLATETET_H_
 
 #include <array>
-#include "MeshEnums.h"
+#include "MeshLib/MeshEnums.h"
 #include "Cell.h"
 
 namespace MeshLib {
diff --git a/MeshLib/Elements/TemplateTri-impl.h b/MeshLib/Elements/TemplateTri-impl.h
index 04f2f581e27..df90c64b73b 100644
--- a/MeshLib/Elements/TemplateTri-impl.h
+++ b/MeshLib/Elements/TemplateTri-impl.h
@@ -12,9 +12,6 @@
  *
  */
 
-// MathLib
-#include "AnalyticalGeometry.h"
-
 namespace MeshLib {
 
 template <unsigned NNODES, CellType CELLTRITYPE>
diff --git a/MeshLib/Elements/TemplateTri.h b/MeshLib/Elements/TemplateTri.h
index 0ddaf498348..4ef0afa2921 100644
--- a/MeshLib/Elements/TemplateTri.h
+++ b/MeshLib/Elements/TemplateTri.h
@@ -16,14 +16,16 @@
 #define TEMPLATETRI_H_
 
 #include <array>
-#include "Line.h"
-#include "Node.h"
-#include "Face.h"
-#include "MeshEnums.h"
 
-#include "MathTools.h"
-#include "AnalyticalGeometry.h"
+#include "GeoLib/AnalyticalGeometry.h"
+
+#include "MathLib/MathTools.h"
 
+#include "MeshLib/MeshEnums.h"
+#include "MeshLib/Node.h"
+
+#include "Face.h"
+#include "Line.h"
 
 namespace MeshLib {
 
-- 
GitLab