From e9e087c102a93f0363c4f44365b2f4d07756f7ec Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Tue, 24 Feb 2015 17:52:46 +0100
Subject: [PATCH] Correct MeshGeoTools references to MeshGeoToolsLib.
---
MeshGeoToolsLib/BoundaryElementsAlongPolyline.cpp | 2 +-
MeshGeoToolsLib/BoundaryElementsAlongPolyline.h | 2 +-
MeshGeoToolsLib/BoundaryElementsOnSurface.cpp | 2 +-
MeshGeoToolsLib/BoundaryElementsOnSurface.h | 2 +-
MeshGeoToolsLib/BoundaryElementsSearcher.cpp | 2 +-
MeshGeoToolsLib/BoundaryElementsSearcher.h | 2 +-
MeshGeoToolsLib/MeshNodeSearcher.cpp | 2 +-
MeshGeoToolsLib/MeshNodeSearcher.h | 6 +++---
MeshGeoToolsLib/MeshNodesAlongPolyline.cpp | 2 +-
MeshGeoToolsLib/MeshNodesAlongSurface.cpp | 2 +-
NumLib/Function/LinearInterpolationAlongPolyline.h | 5 -----
NumLib/Function/LinearInterpolationOnSurface.h | 5 -----
12 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/MeshGeoToolsLib/BoundaryElementsAlongPolyline.cpp b/MeshGeoToolsLib/BoundaryElementsAlongPolyline.cpp
index c17f7c40d90..5398b975c16 100644
--- a/MeshGeoToolsLib/BoundaryElementsAlongPolyline.cpp
+++ b/MeshGeoToolsLib/BoundaryElementsAlongPolyline.cpp
@@ -97,5 +97,5 @@ MeshLib::Element* BoundaryElementsAlongPolyline::modifyEdgeNodeOrdering(const Me
return new_edge;
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/BoundaryElementsAlongPolyline.h b/MeshGeoToolsLib/BoundaryElementsAlongPolyline.h
index 7bfd10ce016..502b0885f05 100644
--- a/MeshGeoToolsLib/BoundaryElementsAlongPolyline.h
+++ b/MeshGeoToolsLib/BoundaryElementsAlongPolyline.h
@@ -84,6 +84,6 @@ private:
std::vector<MeshLib::Element*> _boundary_elements;
};
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
#endif /* BOUNDARYELEMENTSALONGPOLYLINE_H_ */
diff --git a/MeshGeoToolsLib/BoundaryElementsOnSurface.cpp b/MeshGeoToolsLib/BoundaryElementsOnSurface.cpp
index b955896c374..4e3fdd5aca5 100644
--- a/MeshGeoToolsLib/BoundaryElementsOnSurface.cpp
+++ b/MeshGeoToolsLib/BoundaryElementsOnSurface.cpp
@@ -58,5 +58,5 @@ BoundaryElementsOnSurface::~BoundaryElementsOnSurface()
delete p;
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/BoundaryElementsOnSurface.h b/MeshGeoToolsLib/BoundaryElementsOnSurface.h
index 42c371ea848..a6ea84be1a8 100644
--- a/MeshGeoToolsLib/BoundaryElementsOnSurface.h
+++ b/MeshGeoToolsLib/BoundaryElementsOnSurface.h
@@ -64,6 +64,6 @@ private:
std::vector<MeshLib::Element*> _boundary_elements;
};
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
#endif /* BOUNDARYELEMENTSONSURFACE_H_ */
diff --git a/MeshGeoToolsLib/BoundaryElementsSearcher.cpp b/MeshGeoToolsLib/BoundaryElementsSearcher.cpp
index f61ccb44532..3f24ec002e3 100644
--- a/MeshGeoToolsLib/BoundaryElementsSearcher.cpp
+++ b/MeshGeoToolsLib/BoundaryElementsSearcher.cpp
@@ -80,5 +80,5 @@ std::vector<MeshLib::Element*> const& BoundaryElementsSearcher::getBoundaryEleme
return _boundary_elements_along_surfaces.back()->getBoundaryElements();
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/BoundaryElementsSearcher.h b/MeshGeoToolsLib/BoundaryElementsSearcher.h
index 9f9e6d2c4b5..4e126f65dfa 100644
--- a/MeshGeoToolsLib/BoundaryElementsSearcher.h
+++ b/MeshGeoToolsLib/BoundaryElementsSearcher.h
@@ -76,6 +76,6 @@ private:
std::vector<BoundaryElementsOnSurface*> _boundary_elements_along_surfaces;
};
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
#endif /* BOUNDARYELEMENTSSEARCHER_H_ */
diff --git a/MeshGeoToolsLib/MeshNodeSearcher.cpp b/MeshGeoToolsLib/MeshNodeSearcher.cpp
index ff2ec42cff7..6c3c8836fb8 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.cpp
+++ b/MeshGeoToolsLib/MeshNodeSearcher.cpp
@@ -139,4 +139,4 @@ MeshNodeSearcher::getMeshNodeSearcher(MeshLib::Mesh const& mesh)
return *_mesh_node_searchers[mesh_id];
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/MeshNodeSearcher.h b/MeshGeoToolsLib/MeshNodeSearcher.h
index c5d24a80016..c456059c59b 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.h
+++ b/MeshGeoToolsLib/MeshNodeSearcher.h
@@ -78,7 +78,7 @@ public:
* Searches for the nearest mesh nodes along a GeoLib::Polyline.
* The search for mesh nodes along a specific polyline will be performed
* only once. The result ids will be stored inside an object
- * (@see class MeshGeoTools::MeshNodesAlongPolyline).
+ * (@see class MeshGeoToolsLib::MeshNodesAlongPolyline).
* @param ply the GeoLib::Polyline the nearest mesh nodes are searched for
* @return a vector of mesh node ids
*/
@@ -88,7 +88,7 @@ public:
* Searches for the nearest mesh nodes along a GeoLib::Surface.
* The search for mesh nodes along a specific surface will be performed
* only once. The result ids will be stored inside an object
- * (@see class MeshGeoTools::MeshNodesAlongSurface).
+ * (@see class MeshGeoToolsLib::MeshNodesAlongSurface).
* @param sfc the GeoLib::Surface the nearest mesh nodes are searched for
* @return a vector of mesh node ids
*/
@@ -127,6 +127,6 @@ private:
static std::vector<std::unique_ptr<MeshNodeSearcher>> _mesh_node_searchers;
};
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
#endif /* MESHNODESEARCHER_H_ */
diff --git a/MeshGeoToolsLib/MeshNodesAlongPolyline.cpp b/MeshGeoToolsLib/MeshNodesAlongPolyline.cpp
index 4476bd50aed..2795f044615 100644
--- a/MeshGeoToolsLib/MeshNodesAlongPolyline.cpp
+++ b/MeshGeoToolsLib/MeshNodesAlongPolyline.cpp
@@ -65,4 +65,4 @@ std::vector<double> const& MeshNodesAlongPolyline::getDistOfProjNodeFromPlyStart
{
return _dist_of_proj_node_from_ply_start;
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/MeshGeoToolsLib/MeshNodesAlongSurface.cpp b/MeshGeoToolsLib/MeshNodesAlongSurface.cpp
index a2e3ba4cdaa..79b61cd03c7 100644
--- a/MeshGeoToolsLib/MeshNodesAlongSurface.cpp
+++ b/MeshGeoToolsLib/MeshNodesAlongSurface.cpp
@@ -55,4 +55,4 @@ GeoLib::Surface const& MeshNodesAlongSurface::getSurface () const
return _sfc;
}
-} // end namespace MeshGeoTools
+} // end namespace MeshGeoToolsLib
diff --git a/NumLib/Function/LinearInterpolationAlongPolyline.h b/NumLib/Function/LinearInterpolationAlongPolyline.h
index 78473eef730..904ddf6e4e3 100644
--- a/NumLib/Function/LinearInterpolationAlongPolyline.h
+++ b/NumLib/Function/LinearInterpolationAlongPolyline.h
@@ -29,11 +29,6 @@ namespace MeshLib
class Mesh;
}
-namespace MeshGeoTools
-{
-class MeshNodesAlongPolyline;
-}
-
namespace NumLib
{
/**
diff --git a/NumLib/Function/LinearInterpolationOnSurface.h b/NumLib/Function/LinearInterpolationOnSurface.h
index 25774873a29..f40f0e1a3a6 100644
--- a/NumLib/Function/LinearInterpolationOnSurface.h
+++ b/NumLib/Function/LinearInterpolationOnSurface.h
@@ -29,11 +29,6 @@ namespace MeshLib
class Mesh;
}
-namespace MeshGeoTools
-{
-class MeshNodesAlongSurface;
-}
-
namespace NumLib
{
/**
--
GitLab