From d25bffff3453338405feb4470249998e4622612c Mon Sep 17 00:00:00 2001
From: Lauri Laanmets <lauri.laanmets@eesti.ee>
Date: Thu, 30 Sep 2021 18:51:18 +0300
Subject: Code clean-up to be able to compile for Qt 6

Various minor changes about includes and re-definitions, etc, to make the compiler happy.

Leaving QGeoRoutingManager doc sample code Q_OBJECT AutoMoc error for a separate patch.

This is part of a bigger work to port QtLocation maps to Qt6.

Task-number: QTBUG-96795
Change-Id: Ic1d22cec18660a7a01dbafe89f134bdd04574851
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h | 1 -
 src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp  | 2 +-
 src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h    | 2 +-
 src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp  | 2 --
 src/plugins/geoservices/osm/qgeofiletilecacheosm.h    | 2 +-
 src/plugins/geoservices/osm/qgeoroutereplyosm.h       | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/plugins/geoservices')

diff --git a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
index f19faee7..302ed2dc 100644
--- a/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
+++ b/src/plugins/geoservices/mapbox/qgeoroutereplymapbox.h
@@ -51,7 +51,6 @@ class QGeoRouteReplyMapbox : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    explicit QGeoRouteReplyMapbox(QObject *parent = 0);
     QGeoRouteReplyMapbox(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0);
     ~QGeoRouteReplyMapbox();
 
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index 66763af3..92c50e94 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -43,7 +43,7 @@
 #include <QtCore/QByteArray>
 #include <QtCore/QCoreApplication>
 #include <QtGui/QOpenGLContext>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLFramebufferObject>
 #include <QtLocation/private/qdeclarativecirclemapitem_p.h>
 #include <QtLocation/private/qdeclarativegeomapitembase_p.h>
 #include <QtLocation/private/qdeclarativepolygonmapitem_p.h>
diff --git a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
index f89ee143..b437ed9a 100644
--- a/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
+++ b/src/plugins/geoservices/mapboxgl/qsgmapboxglnode.h
@@ -42,7 +42,7 @@
 #include <QtQuick/QSGRenderNode>
 #include <QtQuick/QSGSimpleTextureNode>
 #include <QtQuick/private/qsgtexture_p.h>
-#include <QtGui/QOpenGLFramebufferObject>
+#include <QtOpenGL/QOpenGLFramebufferObject>
 
 #include <QMapboxGL>
 
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
index 3ca0255c..c6431aee 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp
@@ -40,8 +40,6 @@
 #include <QDirIterator>
 #include <QPair>
 #include <QDateTime>
-#include <QtConcurrent>
-#include <QThread>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
index a7a203c8..b7c33363 100644
--- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
+++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.h
@@ -40,8 +40,8 @@
 #include "qgeotileproviderosm.h"
 #include <QtLocation/private/qgeofiletilecache_p.h>
 #include <QHash>
-#include <QtConcurrent>
 #include <qatomic.h>
+#include <QDir>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/geoservices/osm/qgeoroutereplyosm.h b/src/plugins/geoservices/osm/qgeoroutereplyosm.h
index feaae59c..964046c5 100644
--- a/src/plugins/geoservices/osm/qgeoroutereplyosm.h
+++ b/src/plugins/geoservices/osm/qgeoroutereplyosm.h
@@ -50,7 +50,6 @@ class QGeoRouteReplyOsm : public QGeoRouteReply
     Q_OBJECT
 
 public:
-    explicit QGeoRouteReplyOsm(QObject *parent = 0);
     QGeoRouteReplyOsm(QNetworkReply *reply, const QGeoRouteRequest &request, QObject *parent = 0);
     ~QGeoRouteReplyOsm();
 
-- 
cgit v1.2.1