Refactor: make QGeoJson a namespace

It only has static methods.

Change-Id: I706bd5131959cc67ace785bd1fd22e30ebb7202e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit e70c655366a9c30fcb15e7ed11a73623c7ee9b0c)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

2 files changed, 33 insertions, 30 deletions

diff --git a/src/location/labs/qgeojson.cpp b/src/location/labs/qgeojson.cpp
index c6003432..99e612d1 100644
--- a/src/location/labs/qgeojson.cpp
+++ b/src/location/labs/qgeojson.cpp
@@ -39,6 +39,8 @@
 ****************************************************************************/
 
 #include "qgeojson_p.h"
+#include <qvariant.h>
+#include <qjsondocument.h>
 #include <qjsonobject.h>
 #include <qjsonvalue.h>
 #include <qjsonarray.h>
@@ -50,25 +52,25 @@
 
 QT_BEGIN_NAMESPACE
 
-/*! \class QGeoJson
+/*! \namespace QGeoJson
     \inmodule QtLocation
     \since 5.13
 
-    QGeoJson class can be used to convert between a GeoJSON document (see the
-    \l {https://en.wikipedia.org/wiki/GeoJSON} {Wikipedia page}, \l
-    {https://tools.ietf.org/html/rfc7946} {RFC}) and a \l
-    {http://doc.qt.io/qt-5/qvariant.html#QVariantList-typedef} {QVariantList}
-    of \l QVariantMap elements ready to be used as Model in a \l MapItemView.
-    WARNING! This private class is part of Qt labs, thus not stable API, it is
+    The methods in the QGeoJson namespace can be used to convert between a
+    GeoJSON document (see the \l {https://en.wikipedia.org/wiki/GeoJSON}
+    {Wikipedia page}, \l {https://tools.ietf.org/html/rfc7946} {RFC}) and a
+    \l QVariantList of \l QVariantMap elements ready to be used as Model in
+    a \l MapItemView.
+
+    \note This private class is part of Qt labs, thus not stable API, it is
     part of the experimental components of QtLocation. Until it is promoted to
     public API, it may be subject to source and binary-breaking changes.
 
     \section2 Importing GeoJSON
 
-    The importGeoJson() method accepts a \l
-    {http://doc.qt.io/qt-5/qjsondocument.html} {QJsonDocument} from which it
-    extracts a single \l {https://tools.ietf.org/html/rfc7159} {JSON} object,
-    since the GeoJSON RFC expects that a valid GeoJSON Document has in its root
+    The importGeoJson() method accepts a \l QJsonDocument from which it
+    extracts a single \l {https://tools.ietf.org/html/rfc7159} {JSON} object.
+    The GeoJSON RFC expects that a valid GeoJSON Document has in its root
     a single JSON object. This method doesn't perform any validation on the
     input. The importer returns a QVariantList containing a single QVariantMap.
     This map has always at least 2 (key, value) pairs. The first one has \c
@@ -943,6 +945,9 @@ static QJsonObject exportFeatureCollection(const QVariantMap &featureCollection)
     return exportedFeatureCollection;
 }
 
+namespace QGeoJson
+{
+
 /*!
 This method imports the \a geoJson document, expected to contain valid GeoJSON
 data, into a QVariantList structured like described in the section \l
@@ -952,7 +957,7 @@ data, into a QVariantList structured like described in the section \l
 
 \sa exportGeoJson
 */
-QVariantList QGeoJson::importGeoJson(const QJsonDocument &geoJson)
+QVariantList importGeoJson(const QJsonDocument &geoJson)
 {
     QVariantList returnedList;
     QJsonObject object = geoJson.object(); // Read json object from imported doc
@@ -1087,7 +1092,7 @@ the data converted to GeoJSON.
 
 \sa importGeoJson
 */
-QJsonDocument QGeoJson::exportGeoJson(const QVariantList &geoData)
+QJsonDocument exportGeoJson(const QVariantList &geoData)
 {
     QVariantMap exportMap = geoData.at(0).value<QVariantMap>(); // Extracting the QVMap
     QJsonObject newObject;
@@ -1125,7 +1130,7 @@ QJsonDocument QGeoJson::exportGeoJson(const QVariantList &geoData)
 }
 
 // Functions for toString
-QTextStream &operator << (QTextStream &stream, const QGeoCoordinate &crd)
+QTextStream &operator<<(QTextStream &stream, const QGeoCoordinate &crd)
 {
     stream << "{ " << QString::number(crd.latitude(), 'f', 3) << ", "
                    << QString::number(crd.longitude(), 'f', 3) << ", "
@@ -1133,7 +1138,7 @@ QTextStream &operator << (QTextStream &stream, const QGeoCoordinate &crd)
     return stream;
 }
 
-QTextStream &operator << (QTextStream &stream, const QGeoShape &shape)
+QTextStream &operator<<(QTextStream &stream, const QGeoShape &shape)
 {
     switch (shape.type()) {
     case QGeoShape::CircleType: {
@@ -1164,9 +1169,9 @@ QTextStream &operator << (QTextStream &stream, const QGeoShape &shape)
     return stream;
 }
 
-static const QString sTab = QStringLiteral("  ");
 
-QString printQvariant(const QVariant v, int tabs = 0) {
+static QString printQvariant(const QVariant v, int tabs = 0) {
+    static constexpr QStringView sTab(u"  ");
     QString sTabs;
     QString res;
     QTextStream stream(&res);
@@ -1230,8 +1235,10 @@ QString printQvariant(const QVariant v, int tabs = 0) {
   \l {Importing GeoJSON}, and returns a string containing the same data in a
   readable form.
 */
-QString QGeoJson::toString(const QVariantList &geoData) {
+QString toString(const QVariantList &geoData) {
     return printQvariant(geoData.first(), 0);
 }
 
+}  // namespace QGeoJson
+
 QT_END_NAMESPACE
diff --git a/src/location/labs/qgeojson_p.h b/src/location/labs/qgeojson_p.h
index 064dfcf6..30997433 100644
--- a/src/location/labs/qgeojson_p.h
+++ b/src/location/labs/qgeojson_p.h
@@ -41,9 +41,8 @@
 #ifndef QGEOJSON_H
 #define QGEOJSON_H
 
-#include <QtCore/qvariant.h>
-#include <QtCore/qjsondocument.h>
 #include <QtLocation/private/qlocationglobal_p.h>
+#include <QtCore/QVariantList>
 
 //
 //  W A R N I N G
@@ -56,25 +55,22 @@
 // We mean it.
 //
 
-
 QT_BEGIN_NAMESPACE
 
-class Q_LOCATION_PRIVATE_EXPORT QGeoJson
-{
-public:
+class QJsonDocument;
+class QString;
 
+namespace QGeoJson {
     // This method imports a GeoJSON file to a QVariantList
-    static QVariantList importGeoJson(const QJsonDocument &doc);
+    Q_LOCATION_PRIVATE_EXPORT QVariantList importGeoJson(const QJsonDocument &doc);
 
     // This method exports a GeoJSON file from a QVariantList
-    static QJsonDocument exportGeoJson(const QVariantList &list);
+    Q_LOCATION_PRIVATE_EXPORT QJsonDocument exportGeoJson(const QVariantList &list);
 
     // This method exports the content of the imported QVariantList in a
     // readable format
-    static QString toString(const QVariantList
-    &importedGeoJson);
-
-};
+    Q_LOCATION_PRIVATE_EXPORT QString toString(const QVariantList &importedGeoJson);
+}
 
 QT_END_NAMESPACE