Skip to content

Commit dcc25fe

Browse files
nyalldawsonnyalldawson
committedJun 29, 2015
[pal] Clean up header includes
·
ltr-3_40archive/master_2
1 parent e0b9f53 commit dcc25fe

File tree

15 files changed

+28
-51
lines changed

15 files changed

+28
-51
lines changed
 

‎src/core/pal/costcalculator.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
#include <cstring>
2020
#include <cfloat>
2121

22-
#include <pal/layer.h>
23-
#include <pal/pal.h>
24-
22+
#include "layer.h"
23+
#include "pal.h"
2524
#include "feature.h"
2625
#include "geomfunction.h"
2726
#include "labelposition.h"
2827
#include "util.h"
29-
3028
#include "costcalculator.h"
3129

3230
namespace pal

‎src/core/pal/feature.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
#include <cstring>
4141
#include <cfloat>
4242

43-
#include <pal/pal.h>
44-
#include <pal/layer.h>
45-
43+
#include "pal.h"
44+
#include "layer.h"
4645
#include "linkedlist.hpp"
4746
#include "feature.h"
4847
#include "geomfunction.h"

‎src/core/pal/feature.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636

3737
#include <geos_c.h>
3838

39-
#include <pal/palgeometry.h>
40-
39+
#include "palgeometry.h"
4140
#include "pointset.h"
4241
#include "util.h"
4342
#include "labelposition.h"

‎src/core/pal/geomfunction.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
*/
2929

3030
#include "geomfunction.h"
31-
32-
//#include <pal/Layer.h>
33-
3431
#include "feature.h"
3532
#include "util.h"
3633

‎src/core/pal/labelposition.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@
3535
#include <cstring>
3636
#include <cfloat>
3737

38-
#include <pal/layer.h>
39-
#include <pal/pal.h>
40-
38+
#include "layer.h"
39+
#include "pal.h"
4140
#include "costcalculator.h"
4241
#include "feature.h"
4342
#include "geomfunction.h"

‎src/core/pal/layer.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,12 @@
3737
#include <cmath>
3838
#include <vector>
3939

40-
#include <pal/pal.h>
41-
#include <pal/layer.h>
42-
#include <pal/palexception.h>
43-
#include <pal/internalexception.h>
44-
40+
#include "pal.h"
41+
#include "layer.h"
42+
#include "palexception.h"
43+
#include "internalexception.h"
4544
#include "linkedlist.hpp"
4645
#include "hashtable.hpp"
47-
4846
#include "feature.h"
4947
#include "geomfunction.h"
5048
#include "util.h"

‎src/core/pal/layer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232

3333
#include <fstream>
3434

35-
#include <pal/pal.h>
36-
#include <pal/palgeometry.h>
35+
#include "pal.h"
36+
#include "palgeometry.h"
3737
#include <QMutex>
3838

3939
namespace pal

‎src/core/pal/pal.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,12 @@
4242
//#include <geos/geom/Geometry.h>
4343
#include <geos_c.h>
4444

45-
#include <pal/pal.h>
46-
#include <pal/layer.h>
47-
#include <pal/palexception.h>
48-
#include <pal/palstat.h>
49-
45+
#include "pal.h"
46+
#include "layer.h"
47+
#include "palexception.h"
48+
#include "palstat.h"
5049
#include "linkedlist.hpp"
5150
#include "rtree.hpp"
52-
5351
#include "costcalculator.h"
5452
#include "feature.h"
5553
#include "geomfunction.h"

‎src/core/pal/palstat.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
*/
2929

3030
#include <iostream>
31-
#include <pal/palstat.h>
31+
#include "palstat.h"
3232

3333
namespace pal
3434
{

‎src/core/pal/pointset.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,7 @@
3838

3939
#include "pointset.h"
4040
#include "util.h"
41-
42-
#include <pal/pal.h>
43-
44-
41+
#include "pal.h"
4542
#include "geomfunction.h"
4643

4744
namespace pal

‎src/core/pal/problem.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@
4141
#include <list>
4242
#include <limits.h> //for INT_MAX
4343

44-
#include <pal/pal.h>
45-
#include <pal/palstat.h>
46-
#include <pal/layer.h>
47-
44+
#include "pal.h"
45+
#include "palstat.h"
46+
#include "layer.h"
4847
#include "linkedlist.hpp"
4948
#include "rtree.hpp"
5049
#include "feature.h"

‎src/core/pal/problem.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#define _PROBLEM_H
3232

3333
#include <list>
34-
#include <pal/pal.h>
34+
#include "pal.h"
3535
#include "rtree.hpp"
3636

3737
namespace pal

‎src/core/pal/rtree.hpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,9 @@
2727
#include <cmath>
2828
#include <cassert>
2929
#include <cstdlib>
30+
#include <QtGlobal>
3031

3132
#define ASSERT assert // RTree uses ASSERT( condition )
32-
#ifndef Min
33-
#define Min(a,b) (a<b?a:b)
34-
#endif //Min
35-
#ifndef Max
36-
#define Max(a,b) (a>b?a:b)
37-
#endif //Max
3833

3934
//
4035
// RTree.h
@@ -1084,8 +1079,8 @@ namespace pal
10841079

10851080
for ( int index = 0; index < NUMDIMS; ++index )
10861081
{
1087-
newRect.m_min[index] = Min( a_rectA->m_min[index], a_rectB->m_min[index] );
1088-
newRect.m_max[index] = Max( a_rectA->m_max[index], a_rectB->m_max[index] );
1082+
newRect.m_min[index] = qMin( a_rectA->m_min[index], a_rectB->m_min[index] );
1083+
newRect.m_max[index] = qMax( a_rectA->m_max[index], a_rectB->m_max[index] );
10891084
}
10901085

10911086
return newRect;

‎src/core/pal/util.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
#include <cstdarg>
3939
#include <ctime>
4040

41-
#include <pal/layer.h>
42-
41+
#include "layer.h"
4342
#include "internalexception.h"
4443
#include "util.h"
4544
#include "labelposition.h"

‎src/core/pal/util.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@
3535
#include <stddef.h>
3636
#include <geos_c.h>
3737

38-
#include <pal/pal.h>
39-
38+
#include "pal.h"
4039
#include "rtree.hpp"
4140
#include "pointset.h"
4241

0 commit comments

Comments
 (0)
Please sign in to comment.