Overall cleaning of landr library according to coding style

Author: Jean-Christophe Fabre

GdalCompat.cpp

@@ -26,7 +26,7 @@
   license, and requires a written agreement between You and INRA.
   Licensees for Other Usage of OpenFLUID may use this file in accordance
   with the terms contained in the written agreement between You and INRA.
-  
+
 */
 
 
@@ -36,7 +36,9 @@
   @author Jean-Christophe FABRE <jean-christophe.fabre@supagro.inra.fr>
 */
 
+
 #include <gdal_version.h>
+
 #include <openfluid/landr/GdalCompat.hpp>
 
 
@@ -74,4 +76,3 @@ OGRGeometry* convertGEOSGeometryToOGR(const GEOSGeom Geometry)
 
 
 } }  // namespaces
-

GdalCompat.hpp

@@ -26,7 +26,7 @@
   license, and requires a written agreement between You and INRA.
   Licensees for Other Usage of OpenFLUID may use this file in accordance
   with the terms contained in the written agreement between You and INRA.
-  
+
 */
 
 /**
@@ -42,7 +42,9 @@
 
 
 #include <geos/geom/GeometryFactory.h>
+
 #include <ogrsf_frmts.h>
+
 #include <openfluid/dllexport.hpp>
 
 

GeosCompat.hpp

@@ -26,7 +26,7 @@
   license, and requires a written agreement between You and INRA.
   Licensees for Other Usage of OpenFLUID may use this file in accordance
   with the terms contained in the written agreement between You and INRA.
-  
+
 */
 
 
@@ -44,15 +44,17 @@
 
 #include <openfluid/config.hpp>
 
+
 namespace openfluid { namespace landr {
 
 #if GEOS_VERSION_GREATER_OR_EQUAL_3_3_0
   #define GET_DANGLES(P,D) \
     D = P->getDangles();
 #else
   #define GET_DANGLES(P,D) \
-    std::vector<const geos::geom::LineString*>* TheDangles = P->getDangles(); \
-    if (TheDangles) D = *TheDangles;
+    std::vector<const geos::geom::LineString*>* _M_TheDangles = P->getDangles(); \
+    if (_M_TheDangles) \
+      D = *_M_TheDangles;
 #endif
 
 #if GEOS_VERSION_GREATER_OR_EQUAL_3_3_2
@@ -62,7 +64,7 @@ namespace openfluid { namespace landr {
 #endif
 
 
-}}
+} }  // namespaces
 
 
 #endif /* __OPENFLUID_LANDR_GEOSCOMPAT_HPP__ */

LandREntity.cpp

@@ -26,7 +26,7 @@
   license, and requires a written agreement between You and INRA.
   Licensees for Other Usage of OpenFLUID may use this file in accordance
   with the terms contained in the written agreement between You and INRA.
-  
+
 */
 
 /**
@@ -36,18 +36,17 @@
   @author Michael RABOTIN <michael.rabotin@supagro.inra.fr>
  */
 
-#include "LandREntity.hpp"
 
-#include <openfluid/core/Value.hpp>
+#include <algorithm>
+
 #include <geos/geom/Geometry.h>
 #include <geos/geom/Point.h>
-#include <algorithm>
 
-namespace openfluid { namespace landr {
+#include <openfluid/landr/LandREntity.hpp>
+#include <openfluid/core/Value.hpp>
 
 
-// =====================================================================
-// =====================================================================
+namespace openfluid { namespace landr {
 
 
 LandREntity::LandREntity(const geos::geom::Geometry* Geom, unsigned int OfldId) :
@@ -146,8 +145,7 @@ std::set<LandREntity*>* LandREntity::neighbours()
 bool LandREntity::getAttributeValue(const std::string& AttributeName,
                                     core::Value& Value) const
 {
-  std::map<std::string, core::Value*>::const_iterator it = m_Attributes.find(
-      AttributeName);
+  std::map<std::string, core::Value*>::const_iterator it = m_Attributes.find(AttributeName);
 
   if (it != m_Attributes.end() && it->second)
   {
@@ -166,17 +164,17 @@ bool LandREntity::getAttributeValue(const std::string& AttributeName,
 bool LandREntity::setAttributeValue(const std::string& AttributeName,
                                     const core::Value* Value)
 {
-  std::map<std::string, core::Value*>::const_iterator it = m_Attributes.find(
-      AttributeName);
+  std::map<std::string, core::Value*>::const_iterator it = m_Attributes.find(AttributeName);
 
   if (it != m_Attributes.end())
   {
     if (it->second)
       delete it->second;
+
     m_Attributes[AttributeName] = const_cast<core::Value*>(Value);
+
     return true;
   }
-
   return false;
 }
 
@@ -212,17 +210,10 @@ LandREntity* LandREntity::neighbour_MinDistCentroCentro()
     NeighByDist[Dist] = Neigh;
   }
 
-  std::map<double, LandREntity*>::iterator itMin = std::min_element(
-      NeighByDist.begin(), NeighByDist.end());
+  std::map<double, LandREntity*>::iterator itMin = std::min_element(NeighByDist.begin(), NeighByDist.end());
 
-  return
-      (itMin != NeighByDist.end() && itMin->first > 0) ? itMin->second :
-                                                         (LandREntity*) 0;
+  return (itMin != NeighByDist.end() && itMin->first > 0) ? itMin->second : nullptr;
 }
 
 
-// =====================================================================
-// =====================================================================
-
-
-} }// namespaces landr, openfluid
+} }  // namespaces

LandREntity.hpp

@@ -26,7 +26,7 @@
   license, and requires a written agreement between You and INRA.
   Licensees for Other Usage of OpenFLUID may use this file in accordance
   with the terms contained in the written agreement between You and INRA.
-  
+
 */
 
 /**
@@ -36,15 +36,20 @@
   @author Michael RABOTIN <michael.rabotin@supagro.inra.fr>
  */
 
+
 #ifndef __OPENFLUID_LANDR_LANDRENTITY_HPP__
 #define __OPENFLUID_LANDR_LANDRENTITY_HPP__
 
-#include <geos/planargraph/GraphComponent.h>
+
 #include <map>
 #include <set>
 #include <string>
+
+#include <geos/planargraph/GraphComponent.h>
+
 #include <openfluid/dllexport.hpp>
 
+
 namespace geos { namespace geom {
 class Geometry;
 class Point;
@@ -53,8 +58,9 @@ class Point;
 namespace openfluid {
 namespace core {
 class Value;
-
 }
+
+
 namespace landr {
 
 /**