From a3d555bb6a927893cdce1256fa4dc8374e946188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Fri, 7 Dec 2018 00:50:11 +0100
Subject: [PATCH] Code cleanup

---
 src/pbf.cpp         | 11 ++++++-----
 src/pbf.h           |  6 +++---
 src/pbfhandler.h    |  8 ++++----
 src/sprites.h       |  3 +++
 src/style.h         |  4 ++++
 src/textitem.h      |  5 +++++
 src/textpathitem.h  |  3 ---
 src/textpointitem.h |  6 ++----
 8 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/pbf.cpp b/src/pbf.cpp
index 28789f1..7a1799e 100644
--- a/src/pbf.cpp
+++ b/src/pbf.cpp
@@ -1,4 +1,5 @@
 #include <QByteArray>
+#include <QImage>
 #include <QPainter>
 #include <QDebug>
 #include <QVariantHash>
@@ -70,7 +71,7 @@ private:
 	const vector_tile::Tile_Feature *_data;
 };
 
-bool cmp(const Feature &f1, const Feature &f2)
+static bool cmp(const Feature &f1, const Feature &f2)
 {
 	return f1.data()->id() < f2.data()->id();
 }
@@ -113,8 +114,8 @@ static inline QPoint parameters(quint32 v1, quint32 v2)
 	return QPoint(zigzag32decode(v1), zigzag32decode(v2));
 }
 
-static void drawFeature(const Feature &feature, Style *style, int styleLayer,
-  const QSizeF &factor, Tile &tile)
+static void drawFeature(const Feature &feature, const Style *style,
+  int styleLayer, const QSizeF &factor, Tile &tile)
 {
 	if (!style->match(tile.zoom(), styleLayer, feature.tags()))
 		return;
@@ -155,7 +156,7 @@ static void drawFeature(const Feature &feature, Style *style, int styleLayer,
 		style->drawFeature(tile, styleLayer, path, feature.tags());
 }
 
-static void drawLayer(const Layer &layer, Style *style, int styleLayer,
+static void drawLayer(const Layer &layer, const Style *style, int styleLayer,
   Tile &tile)
 {
 	if (layer.data()->version() > 2)
@@ -172,7 +173,7 @@ static void drawLayer(const Layer &layer, Style *style, int styleLayer,
 	tile.painter().restore();
 }
 
-bool PBF::render(const QByteArray &data, int zoom, Style *style,
+bool PBF::render(const QByteArray &data, int zoom, const Style *style,
   const QPointF &scale, QImage *image)
 {
 	vector_tile::Tile tile;
diff --git a/src/pbf.h b/src/pbf.h
index 45fd3ff..b82f8b0 100644
--- a/src/pbf.h
+++ b/src/pbf.h
@@ -1,14 +1,14 @@
 #ifndef PBF_H
 #define PBF_H
 
-#include <QImage>
-
 class QByteArray;
+class QImage;
 class Style;
+class QPointF;
 
 namespace PBF
 {
-	bool render(const QByteArray &data, int zoom, Style *style,
+	bool render(const QByteArray &data, int zoom, const Style *style,
 	  const QPointF &scale, QImage *render);
 }
 
diff --git a/src/pbfhandler.h b/src/pbfhandler.h
index e9d12d4..c8ae41e 100644
--- a/src/pbfhandler.h
+++ b/src/pbfhandler.h
@@ -2,16 +2,16 @@
 #define PBFHANDLER_H
 
 #include <QImageIOHandler>
-#include <QImage>
 #include <QVariant>
 #include <QSize>
 
+class QImage;
 class Style;
 
 class PBFHandler : public QImageIOHandler
 {
 public:
-	PBFHandler(Style *style) : _style(style) {}
+	PBFHandler(const Style *style) : _style(style) {}
 	~PBFHandler() {}
 
 	bool canRead() const;
@@ -19,12 +19,12 @@ public:
 
 	QVariant option(ImageOption option) const;
 	bool supportsOption(ImageOption option) const;
-	void setOption(QImageIOHandler::ImageOption option, const QVariant &value);
+	void setOption(ImageOption option, const QVariant &value);
 
 	static bool canRead(QIODevice *device);
 
 private:
-	Style *_style;
+	const Style *_style;
 	QSize _scaledSize;
 };
 
diff --git a/src/sprites.h b/src/sprites.h
index a06d059..4fcec57 100644
--- a/src/sprites.h
+++ b/src/sprites.h
@@ -4,6 +4,9 @@
 #include <QRect>
 #include <QMap>
 #include <QImage>
+#include <QString>
+
+class QJsonObject;
 
 class Sprites
 {
diff --git a/src/style.h b/src/style.h
index 725f3c1..6184d23 100644
--- a/src/style.h
+++ b/src/style.h
@@ -3,6 +3,8 @@
 
 #include <QObject>
 #include <QString>
+#include <QVector>
+#include <QPair>
 #include <QVariantHash>
 #include <QStringList>
 #include <QSet>
@@ -16,6 +18,8 @@
 
 class QPainter;
 class QPainterPath;
+class QJsonArray;
+class QJsonObject;
 class Tile;
 
 class Style : public QObject
diff --git a/src/textitem.h b/src/textitem.h
index 50849e3..838ac47 100644
--- a/src/textitem.h
+++ b/src/textitem.h
@@ -1,8 +1,13 @@
 #ifndef TEXTITEM_H
 #define TEXTITEM_H
 
+#include <QString>
 #include <QPainterPath>
+#include <QPen>
 #include <QFont>
+#include <QRectF>
+
+class QPainter;
 
 class TextItem
 {
diff --git a/src/textpathitem.h b/src/textpathitem.h
index 83c5e95..689c219 100644
--- a/src/textpathitem.h
+++ b/src/textpathitem.h
@@ -1,10 +1,7 @@
 #ifndef TEXTPATHITEM_H
 #define TEXTPATHITEM_H
 
-#include <QFont>
-#include <QString>
 #include "textitem.h"
-#include "text.h"
 
 class TextPathItem : public TextItem
 {
diff --git a/src/textpointitem.h b/src/textpointitem.h
index 98be28b..0470690 100644
--- a/src/textpointitem.h
+++ b/src/textpointitem.h
@@ -1,11 +1,9 @@
 #ifndef TEXTPOINTITEM_H
 #define TEXTPOINTITEM_H
 
-#include <QPen>
-#include <QFont>
-#include <QString>
-#include "textitem.h"
+#include <QImage>
 #include "text.h"
+#include "textitem.h"
 
 class TextPointItem : public TextItem
 {