[pal] Clean up header includes

qgis · Jun 29, 2015 · dcc25fe · dcc25fe
1 parent e0b9f53
commit dcc25fe
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 51 deletions.
diff --git a/src/core/pal/costcalculator.cpp b/src/core/pal/costcalculator.cpp
@@ -19,14 +19,12 @@
 #include <cstring>
 #include <cfloat>
 
-#include <pal/layer.h>
-#include <pal/pal.h>
-
+#include "layer.h"
+#include "pal.h"
 #include "feature.h"
 #include "geomfunction.h"
 #include "labelposition.h"
 #include "util.h"
-
 #include "costcalculator.h"
 
 namespace pal

diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -40,9 +40,8 @@
 #include <cstring>
 #include <cfloat>
 
-#include <pal/pal.h>
-#include <pal/layer.h>
-
+#include "pal.h"
+#include "layer.h"
 #include "linkedlist.hpp"
 #include "feature.h"
 #include "geomfunction.h"

diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
@@ -36,8 +36,7 @@
 
 #include <geos_c.h>
 
-#include <pal/palgeometry.h>
-
+#include "palgeometry.h"
 #include "pointset.h"
 #include "util.h"
 #include "labelposition.h"

diff --git a/src/core/pal/geomfunction.cpp b/src/core/pal/geomfunction.cpp
@@ -28,9 +28,6 @@
  */
 
 #include "geomfunction.h"
-
-//#include <pal/Layer.h>
-
 #include "feature.h"
 #include "util.h"
 

diff --git a/src/core/pal/labelposition.cpp b/src/core/pal/labelposition.cpp
@@ -35,9 +35,8 @@
 #include <cstring>
 #include <cfloat>
 
-#include <pal/layer.h>
-#include <pal/pal.h>
-
+#include "layer.h"
+#include "pal.h"
 #include "costcalculator.h"
 #include "feature.h"
 #include "geomfunction.h"

diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
@@ -37,14 +37,12 @@
 #include <cmath>
 #include <vector>
 
-#include <pal/pal.h>
-#include <pal/layer.h>
-#include <pal/palexception.h>
-#include <pal/internalexception.h>
-
+#include "pal.h"
+#include "layer.h"
+#include "palexception.h"
+#include "internalexception.h"
 #include "linkedlist.hpp"
 #include "hashtable.hpp"
-
 #include "feature.h"
 #include "geomfunction.h"
 #include "util.h"

diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
@@ -32,8 +32,8 @@
 
 #include <fstream>
 
-#include <pal/pal.h>
-#include <pal/palgeometry.h>
+#include "pal.h"
+#include "palgeometry.h"
 #include <QMutex>
 
 namespace pal

diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp
@@ -42,14 +42,12 @@
 //#include <geos/geom/Geometry.h>
 #include <geos_c.h>
 
-#include <pal/pal.h>
-#include <pal/layer.h>
-#include <pal/palexception.h>
-#include <pal/palstat.h>
-
+#include "pal.h"
+#include "layer.h"
+#include "palexception.h"
+#include "palstat.h"
 #include "linkedlist.hpp"
 #include "rtree.hpp"
-
 #include "costcalculator.h"
 #include "feature.h"
 #include "geomfunction.h"

diff --git a/src/core/pal/palstat.cpp b/src/core/pal/palstat.cpp
@@ -28,7 +28,7 @@
  */
 
 #include <iostream>
-#include <pal/palstat.h>
+#include "palstat.h"
 
 namespace pal
 {

diff --git a/src/core/pal/pointset.cpp b/src/core/pal/pointset.cpp
@@ -38,10 +38,7 @@
 
 #include "pointset.h"
 #include "util.h"
-
-#include <pal/pal.h>
-
-
+#include "pal.h"
 #include "geomfunction.h"
 
 namespace pal

diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
@@ -41,10 +41,9 @@
 #include <list>
 #include <limits.h> //for INT_MAX
 
-#include <pal/pal.h>
-#include <pal/palstat.h>
-#include <pal/layer.h>
-
+#include "pal.h"
+#include "palstat.h"
+#include "layer.h"
 #include "linkedlist.hpp"
 #include "rtree.hpp"
 #include "feature.h"

diff --git a/src/core/pal/problem.h b/src/core/pal/problem.h
@@ -31,7 +31,7 @@
 #define _PROBLEM_H
 
 #include <list>
-#include <pal/pal.h>
+#include "pal.h"
 #include "rtree.hpp"
 
 namespace pal

diff --git a/src/core/pal/rtree.hpp b/src/core/pal/rtree.hpp
@@ -27,14 +27,9 @@
 #include <cmath>
 #include <cassert>
 #include <cstdlib>
+#include <QtGlobal>
 
 #define ASSERT assert // RTree uses ASSERT( condition )
-#ifndef Min
-#define Min(a,b) (a<b?a:b)
-#endif //Min
-#ifndef Max
-#define Max(a,b) (a>b?a:b)
-#endif //Max
 
 //
 // RTree.h
@@ -1084,8 +1079,8 @@ namespace pal
 
     for ( int index = 0; index < NUMDIMS; ++index )
     {
-      newRect.m_min[index] = Min( a_rectA->m_min[index], a_rectB->m_min[index] );
-      newRect.m_max[index] = Max( a_rectA->m_max[index], a_rectB->m_max[index] );
+      newRect.m_min[index] = qMin( a_rectA->m_min[index], a_rectB->m_min[index] );
+      newRect.m_max[index] = qMax( a_rectA->m_max[index], a_rectB->m_max[index] );
     }
 
     return newRect;

diff --git a/src/core/pal/util.cpp b/src/core/pal/util.cpp
@@ -38,8 +38,7 @@
 #include <cstdarg>
 #include <ctime>
 
-#include <pal/layer.h>
-
+#include "layer.h"
 #include "internalexception.h"
 #include "util.h"
 #include "labelposition.h"

diff --git a/src/core/pal/util.h b/src/core/pal/util.h
@@ -35,8 +35,7 @@
 #include <stddef.h>
 #include <geos_c.h>
 
-#include <pal/pal.h>
-
+#include "pal.h"
 #include "rtree.hpp"
 #include "pointset.h"