summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-09-03 16:13:41 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-09-03 16:13:41 (GMT)
commit017a680a06c7e110c3ed9a6ac65930d9a7340745 (patch)
treef6b833a235e6f1c3075f203019282e42a44e786a
parenta3891570eb191c9ceccb53a8630be178979447f9 (diff)
Use Marble namespace consistently
-rw-r--r--tools/osm-simplify/BaseClipper.cpp3
-rw-r--r--tools/osm-simplify/BaseClipper.h4
-rw-r--r--tools/osm-simplify/BaseFilter.cpp4
-rw-r--r--tools/osm-simplify/BaseFilter.h4
-rw-r--r--tools/osm-simplify/LineStringProcessor.cpp2
-rw-r--r--tools/osm-simplify/LineStringProcessor.h4
-rw-r--r--tools/osm-simplify/NodeReducer.cpp4
-rw-r--r--tools/osm-simplify/NodeReducer.h4
-rw-r--r--tools/osm-simplify/PlacemarkFilter.cpp3
-rw-r--r--tools/osm-simplify/PlacemarkFilter.h4
-rw-r--r--tools/osm-simplify/ShpCoastlineProcessor.cpp4
-rw-r--r--tools/osm-simplify/ShpCoastlineProcessor.h4
-rw-r--r--tools/osm-simplify/TagsFilter.cpp7
-rw-r--r--tools/osm-simplify/TagsFilter.h3
-rw-r--r--tools/osm-simplify/TinyPlanetProcessor.cpp4
-rw-r--r--tools/osm-simplify/TinyPlanetProcessor.h4
-rw-r--r--tools/osm-simplify/WayChunk.cpp4
-rw-r--r--tools/osm-simplify/WayChunk.h4
-rw-r--r--tools/osm-simplify/WayConcatenator.cpp5
-rw-r--r--tools/osm-simplify/WayConcatenator.h6
20 files changed, 60 insertions, 21 deletions
diff --git a/tools/osm-simplify/BaseClipper.cpp b/tools/osm-simplify/BaseClipper.cpp
index 4e8faca..c7dc8e1 100644
--- a/tools/osm-simplify/BaseClipper.cpp
+++ b/tools/osm-simplify/BaseClipper.cpp
@@ -18,7 +18,7 @@
#include <QDebug>
#include <QSharedPointer>
-using namespace Marble;
+namespace Marble {
class LinkedPoint {
public:
@@ -1329,5 +1329,6 @@ void BaseClipper::clipOnce( QPolygonF & clippedPolyObject,
default:
break;
}
+}
}
diff --git a/tools/osm-simplify/BaseClipper.h b/tools/osm-simplify/BaseClipper.h
index 8b32d4a..1b95649 100644
--- a/tools/osm-simplify/BaseClipper.h
+++ b/tools/osm-simplify/BaseClipper.h
@@ -19,6 +19,8 @@
#include <QPointF>
#include <QPolygonF>
+namespace Marble {
+
class BaseClipper
{
public:
@@ -132,4 +134,6 @@ private:
bool m_clippedTwice;
};
+}
+
#endif // BASECLIPPER_H
diff --git a/tools/osm-simplify/BaseFilter.cpp b/tools/osm-simplify/BaseFilter.cpp
index 910c9f5..0f2bcdf 100644
--- a/tools/osm-simplify/BaseFilter.cpp
+++ b/tools/osm-simplify/BaseFilter.cpp
@@ -15,6 +15,8 @@
#include "GeoDataObject.h"
#include "GeoDataTypes.h"
+namespace Marble {
+
BaseFilter::BaseFilter(GeoDataDocument* document) :
m_document(document),
m_placemarks(document->placemarkList())
@@ -46,3 +48,5 @@ GeoDataDocument *BaseFilter::document()
{
return m_document;
}
+
+}
diff --git a/tools/osm-simplify/BaseFilter.h b/tools/osm-simplify/BaseFilter.h
index 78f372f..ee8e691 100644
--- a/tools/osm-simplify/BaseFilter.h
+++ b/tools/osm-simplify/BaseFilter.h
@@ -18,7 +18,7 @@
#include "GeoDataDocument.h"
#include "GeoDataTypes.h"
-using namespace Marble;
+namespace Marble {
class BaseFilter
{
@@ -39,4 +39,6 @@ private:
QVector<GeoDataPlacemark*> m_placemarks;
};
+}
+
#endif // OBJECTHANDLER_H
diff --git a/tools/osm-simplify/LineStringProcessor.cpp b/tools/osm-simplify/LineStringProcessor.cpp
index d56a817..e443a34 100644
--- a/tools/osm-simplify/LineStringProcessor.cpp
+++ b/tools/osm-simplify/LineStringProcessor.cpp
@@ -14,6 +14,7 @@
#include "GeoDataGeometry.h"
#include "GeoDataLineString.h"
+namespace Marble {
LineStringProcessor::LineStringProcessor(GeoDataDocument* document) :
PlacemarkFilter(document)
@@ -70,3 +71,4 @@ void LineStringProcessor::process()
qDebug() << document()->name();
}
+}
diff --git a/tools/osm-simplify/LineStringProcessor.h b/tools/osm-simplify/LineStringProcessor.h
index 009da60..59ff6df 100644
--- a/tools/osm-simplify/LineStringProcessor.h
+++ b/tools/osm-simplify/LineStringProcessor.h
@@ -13,6 +13,8 @@
#include "PlacemarkFilter.h"
+namespace Marble {
+
class LineStringProcessor : public PlacemarkFilter
{
public:
@@ -22,4 +24,6 @@ public:
};
+}
+
#endif // LINESTRINGHANDLER_H
diff --git a/tools/osm-simplify/NodeReducer.cpp b/tools/osm-simplify/NodeReducer.cpp
index 5ae074b..ee19298 100644
--- a/tools/osm-simplify/NodeReducer.cpp
+++ b/tools/osm-simplify/NodeReducer.cpp
@@ -19,6 +19,8 @@
#include <QDebug>
#include <QVector>
+namespace Marble {
+
NodeReducer::NodeReducer(GeoDataDocument* document, int zoomLevel) :
PlacemarkFilter(document),
m_resolution(resolutionForLevel(zoomLevel)),
@@ -120,3 +122,5 @@ qreal NodeReducer::resolutionForLevel(int level) {
break;
}
}
+
+}
diff --git a/tools/osm-simplify/NodeReducer.h b/tools/osm-simplify/NodeReducer.h
index e67b209..fc49320 100644
--- a/tools/osm-simplify/NodeReducer.h
+++ b/tools/osm-simplify/NodeReducer.h
@@ -15,6 +15,8 @@
#include "GeoDataLineString.h"
#include "MarbleMath.h"
+namespace Marble {
+
class NodeReducer : public PlacemarkFilter {
public:
NodeReducer(GeoDataDocument* document, int zoomLevel);
@@ -54,4 +56,6 @@ private:
qint64 m_count;
};
+}
+
#endif
diff --git a/tools/osm-simplify/PlacemarkFilter.cpp b/tools/osm-simplify/PlacemarkFilter.cpp
index 8b8ade4..f44ec27 100644
--- a/tools/osm-simplify/PlacemarkFilter.cpp
+++ b/tools/osm-simplify/PlacemarkFilter.cpp
@@ -12,9 +12,12 @@
#include "GeoDataPlacemark.h"
+namespace Marble {
+
PlacemarkFilter::PlacemarkFilter(GeoDataDocument *document) :
BaseFilter(document)
{
qDebug() << "Placemark count:" << placemarks().size();
}
+}
diff --git a/tools/osm-simplify/PlacemarkFilter.h b/tools/osm-simplify/PlacemarkFilter.h
index 1f2b774..51f006c 100644
--- a/tools/osm-simplify/PlacemarkFilter.h
+++ b/tools/osm-simplify/PlacemarkFilter.h
@@ -13,10 +13,14 @@
#include "BaseFilter.h"
+namespace Marble {
+
class PlacemarkFilter : public BaseFilter
{
public:
explicit PlacemarkFilter(GeoDataDocument* document);
};
+}
+
#endif // PLACEMARKHANDLER_H
diff --git a/tools/osm-simplify/ShpCoastlineProcessor.cpp b/tools/osm-simplify/ShpCoastlineProcessor.cpp
index e93b997..6e9735e 100644
--- a/tools/osm-simplify/ShpCoastlineProcessor.cpp
+++ b/tools/osm-simplify/ShpCoastlineProcessor.cpp
@@ -18,6 +18,8 @@
#include <QPolygonF>
#include <QDebug>
+namespace Marble {
+
ShpCoastlineProcessor::ShpCoastlineProcessor(GeoDataDocument* document) :
PlacemarkFilter(document)
{
@@ -99,3 +101,5 @@ GeoDataDocument *ShpCoastlineProcessor::cutToTiles(unsigned int zoomLevel, unsig
return tile;
}
+
+}
diff --git a/tools/osm-simplify/ShpCoastlineProcessor.h b/tools/osm-simplify/ShpCoastlineProcessor.h
index f53950b..8090479 100644
--- a/tools/osm-simplify/ShpCoastlineProcessor.h
+++ b/tools/osm-simplify/ShpCoastlineProcessor.h
@@ -13,6 +13,8 @@
#include "PlacemarkFilter.h"
+namespace Marble {
+
class ShpCoastlineProcessor : public PlacemarkFilter
{
public:
@@ -23,4 +25,6 @@ public:
GeoDataDocument* cutToTiles(unsigned int zoomLevel, unsigned int tileX, unsigned int tileY);
};
+}
+
#endif // COASTLINEFILTER_H
diff --git a/tools/osm-simplify/TagsFilter.cpp b/tools/osm-simplify/TagsFilter.cpp
index 4ec389b..055b23b 100644
--- a/tools/osm-simplify/TagsFilter.cpp
+++ b/tools/osm-simplify/TagsFilter.cpp
@@ -18,7 +18,7 @@
#include "OsmPlacemarkData.h"
#include "GeoDataPlacemark.h"
-namespace Marble{
+namespace Marble {
TagsFilter::TagsFilter(GeoDataDocument *document, const QStringList &tagsList, bool andFlag ) : PlacemarkFilter(document)
{
@@ -80,9 +80,6 @@ void TagsFilter::process()
//does nothing
}
-}
-
-
QVector<GeoDataPlacemark*>::const_iterator TagsFilter::rejectedObjectsBegin() const
{
return m_rejectedObjects.begin();
@@ -92,3 +89,5 @@ QVector<GeoDataPlacemark*>::const_iterator TagsFilter::rejectedObjectsEnd() cons
{
return m_rejectedObjects.end();
}
+
+}
diff --git a/tools/osm-simplify/TagsFilter.h b/tools/osm-simplify/TagsFilter.h
index f5567cb..ed0724a 100644
--- a/tools/osm-simplify/TagsFilter.h
+++ b/tools/osm-simplify/TagsFilter.h
@@ -17,7 +17,7 @@
#include <QMap>
#include <QString>
-namespace Marble{
+namespace Marble {
class GeoDataDocument;
@@ -35,4 +35,5 @@ private:
};
}
+
#endif
diff --git a/tools/osm-simplify/TinyPlanetProcessor.cpp b/tools/osm-simplify/TinyPlanetProcessor.cpp
index f15bc95..7a706d2 100644
--- a/tools/osm-simplify/TinyPlanetProcessor.cpp
+++ b/tools/osm-simplify/TinyPlanetProcessor.cpp
@@ -20,6 +20,8 @@
#include <QPolygonF>
#include <QPair>
+namespace Marble {
+
TinyPlanetProcessor::TinyPlanetProcessor(GeoDataDocument* document) :
PlacemarkFilter(document)
{
@@ -192,3 +194,5 @@ void TinyPlanetProcessor::copyTags(const OsmPlacemarkData &originalPlacemarkData
targetOsmData.addTag(iter.key(), iter.value());
}
}
+
+}
diff --git a/tools/osm-simplify/TinyPlanetProcessor.h b/tools/osm-simplify/TinyPlanetProcessor.h
index 1ee700f..27df005 100644
--- a/tools/osm-simplify/TinyPlanetProcessor.h
+++ b/tools/osm-simplify/TinyPlanetProcessor.h
@@ -14,6 +14,8 @@
#include "PlacemarkFilter.h"
#include "OsmPlacemarkData.h"
+namespace Marble {
+
class TinyPlanetProcessor : public PlacemarkFilter
{
public:
@@ -28,4 +30,6 @@ private:
void copyTags(const OsmPlacemarkData &originalPlacemarkData, OsmPlacemarkData& targetOsmData) const;
};
+}
+
#endif // TINYPLANETPROCESSOR_H
diff --git a/tools/osm-simplify/WayChunk.cpp b/tools/osm-simplify/WayChunk.cpp
index b34a727..f3f484f 100644
--- a/tools/osm-simplify/WayChunk.cpp
+++ b/tools/osm-simplify/WayChunk.cpp
@@ -19,8 +19,7 @@
#include "GeoDataLineString.h"
#include "OsmPlacemarkData.h"
-namespace Marble
-{
+namespace Marble {
WayChunk::WayChunk(GeoDataPlacemark *placemark, qint64 first, qint64 last)
{
@@ -125,5 +124,4 @@ GeoDataFeature::GeoDataVisualCategory WayChunk::visualCategory() const
return m_visualCategory;
}
-
}
diff --git a/tools/osm-simplify/WayChunk.h b/tools/osm-simplify/WayChunk.h
index 5f31168..a055cf4 100644
--- a/tools/osm-simplify/WayChunk.h
+++ b/tools/osm-simplify/WayChunk.h
@@ -16,8 +16,7 @@
#include <QList>
-namespace Marble
-{
+namespace Marble {
class GeoDataPlacemark;
@@ -55,4 +54,3 @@ private:
}
#endif
-
diff --git a/tools/osm-simplify/WayConcatenator.cpp b/tools/osm-simplify/WayConcatenator.cpp
index 8291008..ad7a429 100644
--- a/tools/osm-simplify/WayConcatenator.cpp
+++ b/tools/osm-simplify/WayConcatenator.cpp
@@ -21,8 +21,7 @@
#include "WayChunk.h"
#include "TagsFilter.h"
-namespace Marble
-{
+namespace Marble {
WayConcatenator::WayConcatenator(GeoDataDocument *document, const QStringList &tagsList, bool andFlag) : TagsFilter(document, tagsList, andFlag)
{
@@ -333,6 +332,4 @@ void WayConcatenator::concatBoth(GeoDataPlacemark *placemark, WayChunk *chunk, W
}
-
-
}
diff --git a/tools/osm-simplify/WayConcatenator.h b/tools/osm-simplify/WayConcatenator.h
index dcf618e..00f84a7 100644
--- a/tools/osm-simplify/WayConcatenator.h
+++ b/tools/osm-simplify/WayConcatenator.h
@@ -14,8 +14,8 @@
#include "PlacemarkFilter.h"
#include "TagsFilter.h"
-namespace Marble
-{
+namespace Marble {
+
class WayChunk;
class WayConcatenator : public TagsFilter
@@ -43,5 +43,3 @@ private:
}
#endif
-
-