summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-03 15:45:54 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-03 15:45:54 (GMT)
commit61e174ee6913582f4584a664e8e00abead867a6c (patch)
tree14e69c9173630f74353f428d6aaa581ddcf192f0
parent1f5dc1b577eb5d8f1a42f7e035a8717916fb357d (diff)
Normalize headers
-rw-r--r--tools/osm-simplify/BaseClipper.cpp2
-rw-r--r--tools/osm-simplify/BaseClipper.h15
-rw-r--r--tools/osm-simplify/LineStringProcessor.h2
-rw-r--r--tools/osm-simplify/NodeReducer.h2
-rw-r--r--tools/osm-simplify/ShpCoastlineProcessor.h2
-rw-r--r--tools/osm-simplify/TagsFilter.h5
-rw-r--r--tools/osm-simplify/TinyPlanetProcessor.h2
-rw-r--r--tools/osm-simplify/WayChunk.h4
-rw-r--r--tools/osm-simplify/WayConcatenator.h10
9 files changed, 22 insertions, 22 deletions
diff --git a/tools/osm-simplify/BaseClipper.cpp b/tools/osm-simplify/BaseClipper.cpp
index 3afb865..4e8faca 100644
--- a/tools/osm-simplify/BaseClipper.cpp
+++ b/tools/osm-simplify/BaseClipper.cpp
@@ -18,6 +18,8 @@
#include <QDebug>
#include <QSharedPointer>
+using namespace Marble;
+
class LinkedPoint {
public:
explicit LinkedPoint(const QPointF& point, bool isEntering=false, bool isLeaving=false) : m_point(point),
diff --git a/tools/osm-simplify/BaseClipper.h b/tools/osm-simplify/BaseClipper.h
index 2206667..8b32d4a 100644
--- a/tools/osm-simplify/BaseClipper.h
+++ b/tools/osm-simplify/BaseClipper.h
@@ -13,13 +13,11 @@
#ifndef BASECLIPPER_H
#define BASECLIPPER_H
-#include <QPointF>
-#include <QPolygonF>
-
#include "GeoDataLinearRing.h"
#include "GeoDataLatLonBox.h"
-using namespace Marble;
+#include <QPointF>
+#include <QPolygonF>
class BaseClipper
{
@@ -34,7 +32,7 @@ public:
{
QPolygonF polygon;
if(!reverseOrder) {
- foreach (const GeoDataCoordinates& coord, lineString) {
+ foreach (const Marble::GeoDataCoordinates& coord, lineString) {
// Need to flip the Y axis(latitude)
QPointF point(coord.longitude(), -coord.latitude());
polygon.append(point);
@@ -58,13 +56,13 @@ public:
if(!reverseOrder) {
foreach (const QPointF& point, polygon) {
// Flipping back the Y axis
- GeoDataCoordinates coord(point.x(), -point.y());
+ Marble::GeoDataCoordinates coord(point.x(), -point.y());
lineString.append(coord);
}
} else {
for(int i = polygon.size()-1; i >= 0; --i) {
// Need to flip the Y axis(latitude)
- GeoDataCoordinates coord(polygon.at(i).x(), -polygon.at(i).y());
+ Marble::GeoDataCoordinates coord(polygon.at(i).x(), -polygon.at(i).y());
lineString.append(coord);
}
}
@@ -72,14 +70,13 @@ public:
return lineString;
}
- void initClipRect(const GeoDataLatLonBox& clippingBox, int pointsToAddAtEdges);
+ void initClipRect(const Marble::GeoDataLatLonBox& clippingBox, int pointsToAddAtEdges);
void clipPolyObject ( const QPolygonF & sourcePolygon,
QVector<QPolygonF> & clippedPolyObjects,
bool isClosed );
private:
-
int sector( const QPointF & point ) const;
int borderSector( const QPointF & point ) const;
bool isCornerPoint (const QPointF & point) const;
diff --git a/tools/osm-simplify/LineStringProcessor.h b/tools/osm-simplify/LineStringProcessor.h
index d8fb17a..009da60 100644
--- a/tools/osm-simplify/LineStringProcessor.h
+++ b/tools/osm-simplify/LineStringProcessor.h
@@ -18,7 +18,7 @@ class LineStringProcessor : public PlacemarkFilter
public:
explicit LineStringProcessor(GeoDataDocument* document);
- virtual void process();
+ void process() override;
};
diff --git a/tools/osm-simplify/NodeReducer.h b/tools/osm-simplify/NodeReducer.h
index 29dbbbc..72bbbde 100644
--- a/tools/osm-simplify/NodeReducer.h
+++ b/tools/osm-simplify/NodeReducer.h
@@ -17,7 +17,7 @@
class NodeReducer : public PlacemarkFilter {
public:
NodeReducer(GeoDataDocument* document, int zoomLevel);
- virtual void process();
+ void process() override;
private:
GeoDataLineString* reduce(GeoDataLineString* lineString);
diff --git a/tools/osm-simplify/ShpCoastlineProcessor.h b/tools/osm-simplify/ShpCoastlineProcessor.h
index 9dfb8a3..f53950b 100644
--- a/tools/osm-simplify/ShpCoastlineProcessor.h
+++ b/tools/osm-simplify/ShpCoastlineProcessor.h
@@ -18,7 +18,7 @@ class ShpCoastlineProcessor : public PlacemarkFilter
public:
explicit ShpCoastlineProcessor(GeoDataDocument* document);
- virtual void process();
+ void process() override;
GeoDataDocument* cutToTiles(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY);
};
diff --git a/tools/osm-simplify/TagsFilter.h b/tools/osm-simplify/TagsFilter.h
index fa5c5fc..f5567cb 100644
--- a/tools/osm-simplify/TagsFilter.h
+++ b/tools/osm-simplify/TagsFilter.h
@@ -13,10 +13,10 @@
#define MARBLE_TAGSFILTER_H
#include "PlacemarkFilter.h"
+
#include <QMap>
#include <QString>
-
namespace Marble{
class GeoDataDocument;
@@ -26,9 +26,10 @@ class TagsFilter : public PlacemarkFilter
public:
//Filters placemarks which have tags in the hash
TagsFilter(GeoDataDocument* document, const QStringList& tagsList, bool andFlag = false);
- virtual void process();
+ void process() override;
QVector<GeoDataPlacemark*>::const_iterator rejectedObjectsBegin() const;
QVector<GeoDataPlacemark*>::const_iterator rejectedObjectsEnd() const;
+
private:
QVector<GeoDataPlacemark*> m_rejectedObjects;
};
diff --git a/tools/osm-simplify/TinyPlanetProcessor.h b/tools/osm-simplify/TinyPlanetProcessor.h
index 086ceb4..1ee700f 100644
--- a/tools/osm-simplify/TinyPlanetProcessor.h
+++ b/tools/osm-simplify/TinyPlanetProcessor.h
@@ -19,7 +19,7 @@ class TinyPlanetProcessor : public PlacemarkFilter
public:
explicit TinyPlanetProcessor(GeoDataDocument* document);
- virtual void process();
+ void process() override;
GeoDataDocument* cutToTiles(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY);
diff --git a/tools/osm-simplify/WayChunk.h b/tools/osm-simplify/WayChunk.h
index 030c71e..5f31168 100644
--- a/tools/osm-simplify/WayChunk.h
+++ b/tools/osm-simplify/WayChunk.h
@@ -11,11 +11,10 @@
#ifndef MARBLE_WAYCHUNK_H
#define MARBLE_WAYCHUNK_H
-#include <QList>
-
#include "GeoDataFeature.h"
#include "GeoDataLineString.h"
+#include <QList>
namespace Marble
{
@@ -51,7 +50,6 @@ private:
qint64 m_first;
qint64 m_last;
GeoDataFeature::GeoDataVisualCategory m_visualCategory;
-
};
}
diff --git a/tools/osm-simplify/WayConcatenator.h b/tools/osm-simplify/WayConcatenator.h
index 4aab520..dcf618e 100644
--- a/tools/osm-simplify/WayConcatenator.h
+++ b/tools/osm-simplify/WayConcatenator.h
@@ -22,12 +22,10 @@ class WayConcatenator : public TagsFilter
{
public:
WayConcatenator(GeoDataDocument *document, const QStringList &tagsList, bool andFlag = false);
- virtual void process();
~WayConcatenator();
+ void process() override;
+
private:
- QMultiHash<qint64, WayChunk*> m_hash;
- QVector<WayChunk*> m_chunks;
- QVector<GeoDataPlacemark> m_wayPlacemarks;
void createWayChunk(GeoDataPlacemark *placemark, qint64 firstId, qint64 lastId);
WayChunk* getWayChunk(GeoDataPlacemark *placemark, qint64 matchId);
void concatFirst(GeoDataPlacemark *placemark, WayChunk *chunk);
@@ -36,6 +34,10 @@ private:
void addRejectedPlacemarks();
void addWayChunks();
void modifyDocument();
+
+ QMultiHash<qint64, WayChunk*> m_hash;
+ QVector<WayChunk*> m_chunks;
+ QVector<GeoDataPlacemark> m_wayPlacemarks;
};
}