Coding style fixes: whitespace around pointers/references

Change-Id: Ie527591e2d9a1578137136fb6664e86c43eed1bf
Reviewed-by: Thomas Lowe <thomas.lowe@nokia.com>
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

57 files changed, 152 insertions, 152 deletions

diff --git a/src/location/maps/qcache3q_p.h b/src/location/maps/qcache3q_p.h
index 4f8554eb..c7932e82 100644
--- a/src/location/maps/qcache3q_p.h
+++ b/src/location/maps/qcache3q_p.h
@@ -149,7 +149,7 @@ private:
     Queue *q2_;          // regular nodes, promoted from newbies, evicted LRU
     Queue *q3_;          // "hobos": evicted from q2 but were very popular (above mean)
     Queue *q1_evicted_;  // ghosts of recently evicted newbies and regulars
-    QHash<Key, Node*> lookup_;
+    QHash<Key, Node *> lookup_;
 
 public:
     explicit QCache3Q(int maxCost = 100, int minRecent = -1, int maxOldPopular = -1);
@@ -393,11 +393,11 @@ template <class Key, class T, class EvPolicy>
 QSharedPointer<T> QCache3Q<Key,T,EvPolicy>::object(const Key &key) const
 {
     if (!lookup_.contains(key)) {
-        const_cast<QCache3Q<Key,T,EvPolicy>*>(this)->missCount_++;
+        const_cast<QCache3Q<Key,T,EvPolicy> *>(this)->missCount_++;
         return QSharedPointer<T>(0);
     }
 
-    QCache3Q<Key,T,EvPolicy> *me = const_cast<QCache3Q<Key,T,EvPolicy>*>(this);
+    QCache3Q<Key,T,EvPolicy> *me = const_cast<QCache3Q<Key,T,EvPolicy> *>(this);
 
     Node *n = me->lookup_[key];
     n->pop++;
diff --git a/src/location/maps/qdoublevector2d.cpp b/src/location/maps/qdoublevector2d.cpp
index 369739c2..0b5f3450 100644
--- a/src/location/maps/qdoublevector2d.cpp
+++ b/src/location/maps/qdoublevector2d.cpp
@@ -46,7 +46,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QDoubleVector2D::QDoubleVector2D(const QDoubleVector3D& vector)
+QDoubleVector2D::QDoubleVector2D(const QDoubleVector3D &vector)
 {
     xp = vector.xp;
     yp = vector.yp;
@@ -89,7 +89,7 @@ void QDoubleVector2D::normalize()
     yp /= len;
 }
 
-double QDoubleVector2D::dotProduct(const QDoubleVector2D& v1, const QDoubleVector2D& v2)
+double QDoubleVector2D::dotProduct(const QDoubleVector2D &v1, const QDoubleVector2D &v2)
 {
     return v1.xp * v2.xp + v1.yp * v2.yp;
 }
diff --git a/src/location/maps/qdoublevector2d_p.h b/src/location/maps/qdoublevector2d_p.h
index 959e2ffe..5b8918ce 100644
--- a/src/location/maps/qdoublevector2d_p.h
+++ b/src/location/maps/qdoublevector2d_p.h
@@ -69,7 +69,7 @@ public:
     QDoubleVector2D();
     explicit QDoubleVector2D(const QVector2D &vector);
     QDoubleVector2D(double xpos, double ypos);
-    explicit QDoubleVector2D(const QDoubleVector3D& vector);
+    explicit QDoubleVector2D(const QDoubleVector3D &vector);
 
     operator QVector2D() const;
 
@@ -93,7 +93,7 @@ public:
     QDoubleVector2D &operator*=(const QDoubleVector2D &vector);
     QDoubleVector2D &operator/=(double divisor);
 
-    static double dotProduct(const QDoubleVector2D& v1, const QDoubleVector2D& v2);
+    static double dotProduct(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
 
     friend inline bool operator==(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
     friend inline bool operator!=(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
@@ -105,7 +105,7 @@ public:
     friend inline const QDoubleVector2D operator-(const QDoubleVector2D &vector);
     friend inline const QDoubleVector2D operator/(const QDoubleVector2D &vector, double divisor);
 
-    friend inline bool qFuzzyCompare(const QDoubleVector2D& v1, const QDoubleVector2D& v2);
+    friend inline bool qFuzzyCompare(const QDoubleVector2D &v1, const QDoubleVector2D &v2);
 
     QDoubleVector3D toVector3D() const;
 
@@ -219,7 +219,7 @@ inline const QDoubleVector2D operator/(const QDoubleVector2D &vector, double div
     return QDoubleVector2D(vector.xp / divisor, vector.yp / divisor);
 }
 
-inline bool qFuzzyCompare(const QDoubleVector2D& v1, const QDoubleVector2D& v2)
+inline bool qFuzzyCompare(const QDoubleVector2D &v1, const QDoubleVector2D &v2)
 {
     return qFuzzyCompare(v1.xp, v2.xp) && qFuzzyCompare(v1.yp, v2.yp);
 }
diff --git a/src/location/maps/qdoublevector3d.cpp b/src/location/maps/qdoublevector3d.cpp
index 081cb1c6..3f9a99f9 100644
--- a/src/location/maps/qdoublevector3d.cpp
+++ b/src/location/maps/qdoublevector3d.cpp
@@ -46,14 +46,14 @@
 
 QT_BEGIN_NAMESPACE
 
-QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D& vector)
+QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D &vector)
 {
     xp = vector.xp;
     yp = vector.yp;
     zp = 0.0;
 }
 
-QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D& vector, double zpos)
+QDoubleVector3D::QDoubleVector3D(const QDoubleVector2D &vector, double zpos)
 {
     xp = vector.xp;
     yp = vector.yp;
@@ -90,44 +90,44 @@ void QDoubleVector3D::normalize()
     zp /= len;
 }
 
-double QDoubleVector3D::dotProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+double QDoubleVector3D::dotProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
 {
     return v1.xp * v2.xp + v1.yp * v2.yp + v1.zp * v2.zp;
 }
 
-QDoubleVector3D QDoubleVector3D::crossProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+QDoubleVector3D QDoubleVector3D::crossProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
 {
     return QDoubleVector3D(v1.yp * v2.zp - v1.zp * v2.yp,
                     v1.zp * v2.xp - v1.xp * v2.zp,
                     v1.xp * v2.yp - v1.yp * v2.xp);
 }
 
-QDoubleVector3D QDoubleVector3D::normal(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+QDoubleVector3D QDoubleVector3D::normal(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
 {
     return crossProduct(v1, v2).normalized();
 }
 
 QDoubleVector3D QDoubleVector3D::normal
-        (const QDoubleVector3D& v1, const QDoubleVector3D& v2, const QDoubleVector3D& v3)
+        (const QDoubleVector3D &v1, const QDoubleVector3D &v2, const QDoubleVector3D &v3)
 {
     return crossProduct((v2 - v1), (v3 - v1)).normalized();
 }
 
 double QDoubleVector3D::distanceToPlane
-        (const QDoubleVector3D& plane, const QDoubleVector3D& normal) const
+        (const QDoubleVector3D &plane, const QDoubleVector3D &normal) const
 {
     return dotProduct(*this - plane, normal);
 }
 
 double QDoubleVector3D::distanceToPlane
-    (const QDoubleVector3D& plane1, const QDoubleVector3D& plane2, const QDoubleVector3D& plane3) const
+    (const QDoubleVector3D &plane1, const QDoubleVector3D &plane2, const QDoubleVector3D &plane3) const
 {
     QDoubleVector3D n = normal(plane2 - plane1, plane3 - plane1);
     return dotProduct(*this - plane1, n);
 }
 
 double QDoubleVector3D::distanceToLine
-        (const QDoubleVector3D& point, const QDoubleVector3D& direction) const
+        (const QDoubleVector3D &point, const QDoubleVector3D &direction) const
 {
     if (direction.isNull())
         return (*this - point).length();
diff --git a/src/location/maps/qdoublevector3d_p.h b/src/location/maps/qdoublevector3d_p.h
index 539e5036..90ab0abd 100644
--- a/src/location/maps/qdoublevector3d_p.h
+++ b/src/location/maps/qdoublevector3d_p.h
@@ -69,8 +69,8 @@ public:
     QDoubleVector3D();
     QDoubleVector3D(double xpos, double ypos, double zpos);
     explicit QDoubleVector3D(const QVector3D &vector);
-    QDoubleVector3D(const QDoubleVector2D& vector);
-    QDoubleVector3D(const QDoubleVector2D& vector, double zpos);
+    QDoubleVector3D(const QDoubleVector2D &vector);
+    QDoubleVector3D(const QDoubleVector2D &vector, double zpos);
 
     operator QVector3D() const;
 
@@ -96,18 +96,18 @@ public:
     QDoubleVector3D &operator+=(const QDoubleVector3D &vector);
     QDoubleVector3D &operator-=(const QDoubleVector3D &vector);
     QDoubleVector3D &operator*=(double factor);
-    QDoubleVector3D &operator*=(const QDoubleVector3D& vector);
+    QDoubleVector3D &operator*=(const QDoubleVector3D &vector);
     QDoubleVector3D &operator/=(double divisor);
 
-    static double dotProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
-    static QDoubleVector3D crossProduct(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
-    static QDoubleVector3D normal(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
+    static double dotProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
+    static QDoubleVector3D crossProduct(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
+    static QDoubleVector3D normal(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
     static QDoubleVector3D normal
-        (const QDoubleVector3D& v1, const QDoubleVector3D& v2, const QDoubleVector3D& v3);
+        (const QDoubleVector3D &v1, const QDoubleVector3D &v2, const QDoubleVector3D &v3);
 
-    double distanceToPlane(const QDoubleVector3D& plane, const QDoubleVector3D& normal) const;
-    double distanceToPlane(const QDoubleVector3D& plane1, const QDoubleVector3D& plane2, const QDoubleVector3D& plane3) const;
-    double distanceToLine(const QDoubleVector3D& point, const QDoubleVector3D& direction) const;
+    double distanceToPlane(const QDoubleVector3D &plane, const QDoubleVector3D &normal) const;
+    double distanceToPlane(const QDoubleVector3D &plane1, const QDoubleVector3D &plane2, const QDoubleVector3D &plane3) const;
+    double distanceToLine(const QDoubleVector3D &point, const QDoubleVector3D &direction) const;
 
     friend inline bool operator==(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
     friend inline bool operator!=(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
@@ -115,11 +115,11 @@ public:
     friend inline const QDoubleVector3D operator-(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
     friend inline const QDoubleVector3D operator*(double factor, const QDoubleVector3D &vector);
     friend inline const QDoubleVector3D operator*(const QDoubleVector3D &vector, double factor);
-    friend const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D& v2);
+    friend const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
     friend inline const QDoubleVector3D operator-(const QDoubleVector3D &vector);
     friend inline const QDoubleVector3D operator/(const QDoubleVector3D &vector, double divisor);
 
-    friend inline bool qFuzzyCompare(const QDoubleVector3D& v1, const QDoubleVector3D& v2);
+    friend inline bool qFuzzyCompare(const QDoubleVector3D &v1, const QDoubleVector3D &v2);
 
     QDoubleVector2D toVector2D() const;
 
@@ -210,7 +210,7 @@ inline QDoubleVector3D &QDoubleVector3D::operator*=(double factor)
     return *this;
 }
 
-inline QDoubleVector3D &QDoubleVector3D::operator*=(const QDoubleVector3D& vector)
+inline QDoubleVector3D &QDoubleVector3D::operator*=(const QDoubleVector3D &vector)
 {
     xp *= vector.xp;
     yp *= vector.yp;
@@ -256,7 +256,7 @@ inline const QDoubleVector3D operator*(const QDoubleVector3D &vector, double fac
     return QDoubleVector3D(vector.xp * factor, vector.yp * factor, vector.zp * factor);
 }
 
-inline const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D& v2)
+inline const QDoubleVector3D operator*(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
 {
     return QDoubleVector3D(v1.xp * v2.xp, v1.yp * v2.yp, v1.zp * v2.zp);
 }
@@ -271,7 +271,7 @@ inline const QDoubleVector3D operator/(const QDoubleVector3D &vector, double div
     return QDoubleVector3D(vector.xp / divisor, vector.yp / divisor, vector.zp / divisor);
 }
 
-inline bool qFuzzyCompare(const QDoubleVector3D& v1, const QDoubleVector3D& v2)
+inline bool qFuzzyCompare(const QDoubleVector3D &v1, const QDoubleVector3D &v2)
 {
     return qFuzzyCompare(v1.xp, v2.xp) &&
            qFuzzyCompare(v1.yp, v2.yp) &&
diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp
index ab938abb..0e6494b8 100644
--- a/src/location/maps/qgeocameracapabilities.cpp
+++ b/src/location/maps/qgeocameracapabilities.cpp
@@ -52,7 +52,7 @@ public:
     QGeoCameraCapabilitiesPrivate(const QGeoCameraCapabilitiesPrivate &other);
     ~QGeoCameraCapabilitiesPrivate();
 
-    QGeoCameraCapabilitiesPrivate& operator = (const QGeoCameraCapabilitiesPrivate &other);
+    QGeoCameraCapabilitiesPrivate &operator = (const QGeoCameraCapabilitiesPrivate &other);
 
     bool supportsBearing_;
     bool supportsRolling_;
@@ -91,7 +91,7 @@ QGeoCameraCapabilitiesPrivate::QGeoCameraCapabilitiesPrivate(const QGeoCameraCap
 
 QGeoCameraCapabilitiesPrivate::~QGeoCameraCapabilitiesPrivate() {}
 
-QGeoCameraCapabilitiesPrivate& QGeoCameraCapabilitiesPrivate::operator = (const QGeoCameraCapabilitiesPrivate &other)
+QGeoCameraCapabilitiesPrivate &QGeoCameraCapabilitiesPrivate::operator = (const QGeoCameraCapabilitiesPrivate &other)
 {
     if (this == &other)
         return *this;
@@ -144,7 +144,7 @@ QGeoCameraCapabilities::~QGeoCameraCapabilities() {}
     Assigns the contents of \a other to this camera capabilities object and
     returns a reference to this camera capabilities object.
 */
-QGeoCameraCapabilities& QGeoCameraCapabilities::operator = (const QGeoCameraCapabilities &other)
+QGeoCameraCapabilities &QGeoCameraCapabilities::operator = (const QGeoCameraCapabilities &other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeocameracapabilities_p.h b/src/location/maps/qgeocameracapabilities_p.h
index b9b17ed7..ef7ef8bf 100644
--- a/src/location/maps/qgeocameracapabilities_p.h
+++ b/src/location/maps/qgeocameracapabilities_p.h
@@ -67,7 +67,7 @@ public:
     QGeoCameraCapabilities(const QGeoCameraCapabilities &other);
     ~QGeoCameraCapabilities();
 
-    QGeoCameraCapabilities& operator = (const QGeoCameraCapabilities &other);
+    QGeoCameraCapabilities &operator = (const QGeoCameraCapabilities &other);
 
     void setMinimumZoomLevel(double minimumZoomLevel);
     double minimumZoomLevel() const;
diff --git a/src/location/maps/qgeocameradata.cpp b/src/location/maps/qgeocameradata.cpp
index f9d2d4bf..a54bafba 100644
--- a/src/location/maps/qgeocameradata.cpp
+++ b/src/location/maps/qgeocameradata.cpp
@@ -57,7 +57,7 @@ public:
     QGeoCameraDataPrivate();
     QGeoCameraDataPrivate(const QGeoCameraDataPrivate &rhs);
 
-    QGeoCameraDataPrivate& operator = (const QGeoCameraDataPrivate &rhs);
+    QGeoCameraDataPrivate &operator = (const QGeoCameraDataPrivate &rhs);
 
     bool operator == (const QGeoCameraDataPrivate &rhs) const;
 
@@ -87,7 +87,7 @@ QGeoCameraDataPrivate::QGeoCameraDataPrivate(const QGeoCameraDataPrivate &rhs)
       zoomLevel_(rhs.zoomLevel_),
       interpolator_(rhs.interpolator_) {}
 
-QGeoCameraDataPrivate& QGeoCameraDataPrivate::operator = (const QGeoCameraDataPrivate &rhs)
+QGeoCameraDataPrivate &QGeoCameraDataPrivate::operator = (const QGeoCameraDataPrivate &rhs)
 {
     if (this == &rhs)
         return *this;
@@ -156,7 +156,7 @@ QGeoCameraData::~QGeoCameraData()
 {
 }
 
-QGeoCameraData& QGeoCameraData::operator = (const QGeoCameraData &other)
+QGeoCameraData &QGeoCameraData::operator = (const QGeoCameraData &other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeocameradata_p.h b/src/location/maps/qgeocameradata_p.h
index 46822a3a..013dd6b0 100644
--- a/src/location/maps/qgeocameradata_p.h
+++ b/src/location/maps/qgeocameradata_p.h
@@ -73,7 +73,7 @@ public:
     QGeoCameraData(const QGeoCameraData &other);
     ~QGeoCameraData();
 
-    QGeoCameraData& operator = (const QGeoCameraData &other);
+    QGeoCameraData &operator = (const QGeoCameraData &other);
 
     bool operator == (const QGeoCameraData &other) const;
     bool operator != (const QGeoCameraData &other) const;
diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h
index 41b50c95..5a988cb4 100644
--- a/src/location/maps/qgeocodereply.h
+++ b/src/location/maps/qgeocodereply.h
@@ -90,7 +90,7 @@ Q_SIGNALS:
     void error(QGeocodeReply::Error error, const QString &errorString = QString());
 
 protected:
-    QGeocodeReply(QObject* parent = 0);
+    QGeocodeReply(QObject *parent = 0);
 
     void setError(Error error, const QString &errorString);
     void setFinished(bool finished);
diff --git a/src/location/maps/qgeocodereply_p.h b/src/location/maps/qgeocodereply_p.h
index 35bf67f9..3e32ddd4 100644
--- a/src/location/maps/qgeocodereply_p.h
+++ b/src/location/maps/qgeocodereply_p.h
@@ -67,7 +67,7 @@ class QGeocodeReplyPrivate
 {
 public:
     QGeocodeReplyPrivate();
-    QGeocodeReplyPrivate(QGeocodeReply::Error error, const QString& errorString);
+    QGeocodeReplyPrivate(QGeocodeReply::Error error, const QString &errorString);
     ~QGeocodeReplyPrivate();
 
     QGeocodeReply::Error error;
diff --git a/src/location/maps/qgeocodingmanager.cpp b/src/location/maps/qgeocodingmanager.cpp
index 8f68db72..a9917dc2 100644
--- a/src/location/maps/qgeocodingmanager.cpp
+++ b/src/location/maps/qgeocodingmanager.cpp
@@ -173,7 +173,7 @@ int QGeocodingManager::managerVersion() const
     QGeocodingManager::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManager::geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds)
+QGeocodeReply *QGeocodingManager::geocode(const QGeoAddress &address, const QGeoBoundingArea &bounds)
 {
 //    if (!d_ptr->engine)
 //        return new QGeocodeReply(QGeocodeReply::EngineNotSetError, "The geocoding manager was not created with a valid engine.", this);
@@ -218,7 +218,7 @@ QGeocodeReply* QGeocodingManager::geocode(const QGeoAddress &address, const QGeo
     QGeocodingManager::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds)
+QGeocodeReply *QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinate, const QGeoBoundingArea &bounds)
 {
 //    if (!d_ptr->engine)
 //        return new QGeocodeReply(QGeocodeReply::EngineNotSetError, "The geocoding manager was not created with a valid engine.", this);
@@ -255,7 +255,7 @@ QGeocodeReply* QGeocodingManager::reverseGeocode(const QGeoCoordinate &coordinat
     QGeocodingManager::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManager::geocode(const QString &address,
+QGeocodeReply *QGeocodingManager::geocode(const QString &address,
         int limit,
         int offset,
         const QGeoBoundingArea &bounds)
@@ -293,7 +293,7 @@ QLocale QGeocodingManager::locale() const
 }
 
 /*!
-\fn void QGeocodingManager::finished(QGeocodeReply* reply)
+\fn void QGeocodingManager::finished(QGeocodeReply *reply)
 
     This signal is emitted when \a reply has finished processing.
 
@@ -308,7 +308,7 @@ QLocale QGeocodingManager::locale() const
 */
 
 /*!
-\fn void QGeocodingManager::error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString)
+\fn void QGeocodingManager::error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString)
 
     This signal is emitted when an error has been detected in the processing of
     \a reply. The QGeocodingManager::finished() signal will probably follow.
diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h
index 7d7f9c5d..b5ef6abb 100644
--- a/src/location/maps/qgeocodingmanager.h
+++ b/src/location/maps/qgeocodingmanager.h
@@ -69,22 +69,22 @@ public:
     QString managerName() const;
     int managerVersion() const;
 
-    QGeocodeReply* geocode(const QGeoAddress &address,
+    QGeocodeReply *geocode(const QGeoAddress &address,
                            const QGeoBoundingArea &bounds = QGeoBoundingArea());
-    QGeocodeReply* geocode(const QString &searchString,
+    QGeocodeReply *geocode(const QString &searchString,
                             int limit = -1,
                             int offset = 0,
                            const QGeoBoundingArea &bounds = QGeoBoundingArea());
 
-    QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+    QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
                                   const QGeoBoundingArea &bounds = QGeoBoundingArea());
 
     void setLocale(const QLocale &locale);
     QLocale locale() const;
 
 Q_SIGNALS:
-    void finished(QGeocodeReply* reply);
-    void error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString = QString());
+    void finished(QGeocodeReply *reply);
+    void error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString = QString());
 
 private:
     QGeocodingManager(QGeocodingManagerEngine *engine, QObject *parent = 0);
diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp
index 2dc5f316..471f971b 100644
--- a/src/location/maps/qgeocodingmanagerengine.cpp
+++ b/src/location/maps/qgeocodingmanagerengine.cpp
@@ -174,7 +174,7 @@ int QGeocodingManagerEngine::managerVersion() const
     QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManagerEngine::geocode(const QGeoAddress &address,
+QGeocodeReply *QGeocodingManagerEngine::geocode(const QGeoAddress &address,
         const QGeoBoundingArea &bounds)
 {
     Q_UNUSED(address)
@@ -219,7 +219,7 @@ QGeocodeReply* QGeocodingManagerEngine::geocode(const QGeoAddress &address,
     QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coordinate,
+QGeocodeReply *QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coordinate,
         const QGeoBoundingArea &bounds)
 {
     Q_UNUSED(coordinate)
@@ -257,7 +257,7 @@ QGeocodeReply* QGeocodingManagerEngine::reverseGeocode(const QGeoCoordinate &coo
     QGeocodingManagerEngine::error(), QGeocodeReply::finished() or
     QGeocodeReply::error() with deleteLater().
 */
-QGeocodeReply* QGeocodingManagerEngine::geocode(const QString &address,
+QGeocodeReply *QGeocodingManagerEngine::geocode(const QString &address,
         int limit,
         int offset,
         const QGeoBoundingArea &bounds)
@@ -294,7 +294,7 @@ QLocale QGeocodingManagerEngine::locale() const
 }
 
 /*!
-\fn void QGeocodingManagerEngine::finished(QGeocodeReply* reply)
+\fn void QGeocodingManagerEngine::finished(QGeocodeReply *reply)
 
     This signal is emitted when \a reply has finished processing.
 
@@ -309,7 +309,7 @@ QLocale QGeocodingManagerEngine::locale() const
 */
 
 /*!
-\fn void QGeocodingManagerEngine::error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString)
+\fn void QGeocodingManagerEngine::error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString)
 
     This signal is emitted when an error has been detected in the processing of
     \a reply. The QGeocodingManagerEngine::finished() signal will probably follow.
diff --git a/src/location/maps/qgeocodingmanagerengine.h b/src/location/maps/qgeocodingmanagerengine.h
index 6e2bed6b..64f560bf 100644
--- a/src/location/maps/qgeocodingmanagerengine.h
+++ b/src/location/maps/qgeocodingmanagerengine.h
@@ -67,13 +67,13 @@ public:
     QString managerName() const;
     int managerVersion() const;
 
-    virtual QGeocodeReply* geocode(const QGeoAddress &address,
+    virtual QGeocodeReply *geocode(const QGeoAddress &address,
                                      const QGeoBoundingArea &bounds);
-    virtual QGeocodeReply* geocode(const QString &address,
+    virtual QGeocodeReply *geocode(const QString &address,
                                     int limit,
                                     int offset,
                                     const QGeoBoundingArea &bounds);
-    virtual QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+    virtual QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
                                           const QGeoBoundingArea &bounds);
 
 
@@ -81,8 +81,8 @@ public:
     QLocale locale() const;
 
 Q_SIGNALS:
-    void finished(QGeocodeReply* reply);
-    void error(QGeocodeReply* reply, QGeocodeReply::Error error, QString errorString = QString());
+    void finished(QGeocodeReply *reply);
+    void error(QGeocodeReply *reply, QGeocodeReply::Error error, QString errorString = QString());
 
 private:
     void setManagerName(const QString &managerName);
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 4a63d8b4..536bdb10 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -137,7 +137,7 @@ QGeoManeuver::~QGeoManeuver() {}
     Assigns \a other to this maneuver object and then returns
     a reference to this maneuver object.
 */
-QGeoManeuver& QGeoManeuver::operator= (const QGeoManeuver & other)
+QGeoManeuver &QGeoManeuver::operator= (const QGeoManeuver & other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeomaneuver.h b/src/location/maps/qgeomaneuver.h
index 93ae7ff2..a9a5b08e 100644
--- a/src/location/maps/qgeomaneuver.h
+++ b/src/location/maps/qgeomaneuver.h
@@ -79,7 +79,7 @@ public:
     QGeoManeuver(const QGeoManeuver &other);
     ~QGeoManeuver();
 
-    QGeoManeuver& operator= (const QGeoManeuver &other);
+    QGeoManeuver &operator= (const QGeoManeuver &other);
 
     bool operator== (const QGeoManeuver &other) const;
     bool operator!= (const QGeoManeuver &other) const;
diff --git a/src/location/maps/qgeomap.cpp b/src/location/maps/qgeomap.cpp
index b4ed8b18..7001c7c7 100644
--- a/src/location/maps/qgeomap.cpp
+++ b/src/location/maps/qgeomap.cpp
@@ -89,12 +89,12 @@ QGeoMap::~QGeoMap()
     delete mapData_;
 }
 
-QGeoMapController* QGeoMap::mapController()
+QGeoMapController *QGeoMap::mapController()
 {
     return mapData_->mapController();
 }
 
-QGLCamera* QGeoMap::glCamera() const
+QGLCamera *QGeoMap::glCamera() const
 {
     return mapData_->glCamera();
 }
diff --git a/src/location/maps/qgeomap_p.h b/src/location/maps/qgeomap_p.h
index 04a58672..34771fe4 100644
--- a/src/location/maps/qgeomap_p.h
+++ b/src/location/maps/qgeomap_p.h
@@ -85,9 +85,9 @@ public:
     QGeoMap(QGeoMapData *mapData, QObject *parent = 0);
     virtual ~QGeoMap();
 
-    QGeoMapController* mapController();
+    QGeoMapController *mapController();
 
-    QGLCamera* glCamera() const;
+    QGLCamera *glCamera() const;
     void paintGL(QGLPainter *painter);
 
     void resize(int width, int height);
diff --git a/src/location/maps/qgeomapdata.cpp b/src/location/maps/qgeomapdata.cpp
index fde4a1f9..955b426b 100644
--- a/src/location/maps/qgeomapdata.cpp
+++ b/src/location/maps/qgeomapdata.cpp
@@ -83,13 +83,13 @@ QGeoMapData::~QGeoMapData()
     delete d_ptr;
 }
 
-QGeoMapController* QGeoMapData::mapController()
+QGeoMapController *QGeoMapData::mapController()
 {
     Q_D(QGeoMapData);
     return d->mapController();
 }
 
-QGLCamera* QGeoMapData::glCamera() const
+QGLCamera *QGeoMapData::glCamera() const
 {
     Q_D(const QGeoMapData);
     return d->glCamera();
@@ -227,14 +227,14 @@ void QGeoMapDataPrivate::setCoordinateInterpolator(QSharedPointer<QGeoCoordinate
     coordinateInterpolator_ = interpolator;
 }
 
-QGeoMapController* QGeoMapDataPrivate::mapController()
+QGeoMapController *QGeoMapDataPrivate::mapController()
 {
     if (!controller_)
         controller_ = new QGeoMapController(map_, coordinateInterpolator_);
     return controller_;
 }
 
-QGLCamera* QGeoMapDataPrivate::glCamera() const
+QGLCamera *QGeoMapDataPrivate::glCamera() const
 {
     return camera_;
 }
diff --git a/src/location/maps/qgeomapdata_p.h b/src/location/maps/qgeomapdata_p.h
index 3a0ba8ce..42367ced 100644
--- a/src/location/maps/qgeomapdata_p.h
+++ b/src/location/maps/qgeomapdata_p.h
@@ -83,9 +83,9 @@ public:
     QGeoMapData(QGeoMappingManagerEngine *engine, QObject *parent = 0);
     virtual ~QGeoMapData();
 
-    QGeoMapController* mapController();
+    QGeoMapController *mapController();
 
-    QGLCamera* glCamera() const;
+    QGLCamera *glCamera() const;
     virtual void paintGL(QGLPainter *painter) = 0;
 
     void resize(int width, int height);
diff --git a/src/location/maps/qgeomapdata_p_p.h b/src/location/maps/qgeomapdata_p_p.h
index 8242d67c..cf6d2909 100644
--- a/src/location/maps/qgeomapdata_p_p.h
+++ b/src/location/maps/qgeomapdata_p_p.h
@@ -85,9 +85,9 @@ public:
 
     QGeoMappingManagerEngine *engine() const;
 
-    QGeoMapController* mapController();
+    QGeoMapController *mapController();
 
-    QGLCamera* glCamera() const;
+    QGLCamera *glCamera() const;
 
     void setCameraData(const QGeoCameraData &cameraData);
     QGeoCameraData cameraData() const;
diff --git a/src/location/maps/qgeomappingmanager.h b/src/location/maps/qgeomappingmanager.h
index e563a274..49fde85f 100644
--- a/src/location/maps/qgeomappingmanager.h
+++ b/src/location/maps/qgeomappingmanager.h
@@ -72,7 +72,7 @@ public:
     QString managerName() const;
     int managerVersion() const;
 
-    QGeoMap* createMap(QObject *parent);
+    QGeoMap *createMap(QObject *parent);
 
     QList<QGeoMapType> supportedMapTypes() const;
 
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 45d56e5a..773cd3d5 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -78,7 +78,7 @@ public:
     explicit QGeoMappingManagerEngine(QObject *parent = 0);
     virtual ~QGeoMappingManagerEngine();
 
-    virtual QGeoMapData* createMapData() = 0;
+    virtual QGeoMapData *createMapData() = 0;
 
     QMap<QString, QVariant> parameters() const;
 
diff --git a/src/location/maps/qgeomapscene.cpp b/src/location/maps/qgeomapscene.cpp
index bb69c814..c8b39232 100644
--- a/src/location/maps/qgeomapscene.cpp
+++ b/src/location/maps/qgeomapscene.cpp
@@ -90,7 +90,7 @@ public:
     // it is 1<<zoomLevel
     int sideLength_;
 
-    QHash<QGeoTileSpec, QGLSceneNode*> nodes_;
+    QHash<QGeoTileSpec, QGLSceneNode *> nodes_;
     QHash<QGeoTileSpec, QSharedPointer<QGeoTileTexture> > textures_;
     QList<QSharedPointer<QGeoTileTexture> > newUploads_;
 
@@ -207,13 +207,13 @@ QPointF QGeoMapScene::mercatorToScreenPosition(const QDoubleVector2D &mercator)
     return d->mercatorToScreenPosition(mercator);
 }
 
-QGLCamera* QGeoMapScene::camera() const
+QGLCamera *QGeoMapScene::camera() const
 {
     Q_D(const QGeoMapScene);
     return d->camera_;
 }
 
-QGLSceneNode* QGeoMapScene::sceneNode() const
+QGLSceneNode *QGeoMapScene::sceneNode() const
 {
     Q_D(const QGeoMapScene);
     return d->sceneNode_;
diff --git a/src/location/maps/qgeomaptype.cpp b/src/location/maps/qgeomaptype.cpp
index 331b32c3..bfa99100 100644
--- a/src/location/maps/qgeomaptype.cpp
+++ b/src/location/maps/qgeomaptype.cpp
@@ -55,7 +55,7 @@ QGeoMapType::QGeoMapType(QGeoMapType::MapStyle style, const QString &name, const
 
 QGeoMapType::~QGeoMapType() {}
 
-QGeoMapType& QGeoMapType::operator = (const QGeoMapType &other)
+QGeoMapType &QGeoMapType::operator = (const QGeoMapType &other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeomaptype.h b/src/location/maps/qgeomaptype.h
index d6b48211..82e21d6e 100644
--- a/src/location/maps/qgeomaptype.h
+++ b/src/location/maps/qgeomaptype.h
@@ -73,7 +73,7 @@ public:
     QGeoMapType(MapStyle style, const QString &name, const QString &description, bool mobile, int mapId);
     ~QGeoMapType();
 
-    QGeoMapType& operator = (const QGeoMapType &other);
+    QGeoMapType &operator = (const QGeoMapType &other);
 
     bool operator == (const QGeoMapType &other) const;
     bool operator != (const QGeoMapType &other) const;
diff --git a/src/location/maps/qgeomaptype_p.h b/src/location/maps/qgeomaptype_p.h
index 4cea4f3b..26cbb798 100644
--- a/src/location/maps/qgeomaptype_p.h
+++ b/src/location/maps/qgeomaptype_p.h
@@ -69,7 +69,7 @@ public:
     QGeoMapTypePrivate(const QGeoMapTypePrivate &other);
     ~QGeoMapTypePrivate();
 
-    QGeoMapTypePrivate& operator = (const QGeoMapTypePrivate &other);
+    QGeoMapTypePrivate &operator = (const QGeoMapTypePrivate &other);
 
     bool operator == (const QGeoMapTypePrivate &other) const;
 
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index bc8151e0..6614f7bc 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -95,7 +95,7 @@ QGeoRoute::~QGeoRoute()
     Assigns the contents of \a other to this route and returns a reference to
     this route.
 */
-QGeoRoute& QGeoRoute::operator= (const QGeoRoute & other)
+QGeoRoute &QGeoRoute::operator= (const QGeoRoute & other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h
index b24869d5..ea4d4cb1 100644
--- a/src/location/maps/qgeoroute.h
+++ b/src/location/maps/qgeoroute.h
@@ -67,7 +67,7 @@ public:
     QGeoRoute(const QGeoRoute &other);
     ~QGeoRoute();
 
-    QGeoRoute& operator = (const QGeoRoute &other);
+    QGeoRoute &operator = (const QGeoRoute &other);
 
     bool operator == (const QGeoRoute &other) const;
     bool operator != (const QGeoRoute &other) const;
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp
index 1278cb51..26ae244b 100644
--- a/src/location/maps/qgeorouterequest.cpp
+++ b/src/location/maps/qgeorouterequest.cpp
@@ -255,7 +255,7 @@ QGeoRouteRequest::~QGeoRouteRequest() {}
     Assigns \a other to this route request object and then returns a reference
     to this route request object.
 */
-QGeoRouteRequest& QGeoRouteRequest::operator= (const QGeoRouteRequest & other)
+QGeoRouteRequest &QGeoRouteRequest::operator= (const QGeoRouteRequest & other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 0e6b0d8d..c903183a 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -119,7 +119,7 @@ public:
 
     ~QGeoRouteRequest();
 
-    QGeoRouteRequest& operator= (const QGeoRouteRequest &other);
+    QGeoRouteRequest &operator= (const QGeoRouteRequest &other);
 
     bool operator == (const QGeoRouteRequest &other) const;
     bool operator != (const QGeoRouteRequest &other) const;
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index 5264a5ac..dbf98e1a 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -96,7 +96,7 @@ QGeoRouteSegment::~QGeoRouteSegment() {}
     Assigns \a other to this route segment object and then returns a
     reference to this route segment object.
 */
-QGeoRouteSegment& QGeoRouteSegment::operator= (const QGeoRouteSegment & other)
+QGeoRouteSegment &QGeoRouteSegment::operator= (const QGeoRouteSegment & other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeoroutesegment.h b/src/location/maps/qgeoroutesegment.h
index abc808c2..6cbea455 100644
--- a/src/location/maps/qgeoroutesegment.h
+++ b/src/location/maps/qgeoroutesegment.h
@@ -64,7 +64,7 @@ public:
     QGeoRouteSegment(const QGeoRouteSegment &other);
     ~QGeoRouteSegment();
 
-    QGeoRouteSegment& operator= (const QGeoRouteSegment &other);
+    QGeoRouteSegment &operator= (const QGeoRouteSegment &other);
 
     bool operator ==(const QGeoRouteSegment &other) const;
     bool operator !=(const QGeoRouteSegment &other) const;
diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp
index e74bdbab..dde8187f 100644
--- a/src/location/maps/qgeoroutingmanager.cpp
+++ b/src/location/maps/qgeoroutingmanager.cpp
@@ -235,7 +235,7 @@ int QGeoRoutingManager::managerVersion() const
     QGeoRoutingManager::error(), QGeoRouteReply::finished() or
     QGeoRouteReply::error() with deleteLater().
 */
-QGeoRouteReply* QGeoRoutingManager::calculateRoute(const QGeoRouteRequest& request)
+QGeoRouteReply *QGeoRoutingManager::calculateRoute(const QGeoRouteRequest &request)
 {
     return d_ptr->engine->calculateRoute(request);
 }
@@ -267,7 +267,7 @@ QGeoRouteReply* QGeoRoutingManager::calculateRoute(const QGeoRouteRequest& reque
     QGeoRoutingManager::error(), QGeoRouteReply::finished() or
     QGeoRouteReply::error() with deleteLater().
 */
-QGeoRouteReply* QGeoRoutingManager::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManager::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
 {
     return d_ptr->engine->updateRoute(route, position);
 }
@@ -347,7 +347,7 @@ QLocale QGeoRoutingManager::locale() const
 }
 
 /*!
-\fn void QGeoRoutingManager::finished(QGeoRouteReply* reply)
+\fn void QGeoRoutingManager::finished(QGeoRouteReply *reply)
 
 This signal is emitted when \a reply has finished processing.
 
@@ -361,7 +361,7 @@ Use deleteLater() instead.
 */
 
 /*!
-\fn void QGeoRoutingManager::error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString)
+\fn void QGeoRoutingManager::error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString)
 
 This signal is emitted when an error has been detected in the processing of
 \a reply.  The QGeoRoutingManager::finished() signal will probably follow.
diff --git a/src/location/maps/qgeoroutingmanager.h b/src/location/maps/qgeoroutingmanager.h
index 2bde0389..c4c1b579 100644
--- a/src/location/maps/qgeoroutingmanager.h
+++ b/src/location/maps/qgeoroutingmanager.h
@@ -68,8 +68,8 @@ public:
     QString managerName() const;
     int managerVersion() const;
 
-    QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request);
-    QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
+    QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request);
+    QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
 
     QGeoRouteRequest::TravelModes supportedTravelModes() const;
     QGeoRouteRequest::FeatureTypes supportedFeatureTypes() const;
@@ -82,8 +82,8 @@ public:
     QLocale locale() const;
 
 Q_SIGNALS:
-    void finished(QGeoRouteReply* reply);
-    void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
+    void finished(QGeoRouteReply *reply);
+    void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
 
 private:
     QGeoRoutingManager(QGeoRoutingManagerEngine *engine, QObject *parent = 0);
diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp
index 416de09d..9a6f7bc6 100644
--- a/src/location/maps/qgeoroutingmanagerengine.cpp
+++ b/src/location/maps/qgeoroutingmanagerengine.cpp
@@ -149,7 +149,7 @@ int QGeoRoutingManagerEngine::managerVersion() const
 }
 
 /*!
-\fn QGeoRouteReply* QGeoRoutingManagerEngine::calculateRoute(const QGeoRouteRequest& request)
+\fn QGeoRouteReply *QGeoRoutingManagerEngine::calculateRoute(const QGeoRouteRequest &request)
 
     Begins the calculation of the route specified by \a request.
 
@@ -199,7 +199,7 @@ int QGeoRoutingManagerEngine::managerVersion() const
     QGeoRoutingManagerEngine::error(), QGeoRouteReply::finished() or
     QGeoRouteReply::error() with deleteLater().
 */
-QGeoRouteReply* QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManagerEngine::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
 {
     Q_UNUSED(route)
     Q_UNUSED(position)
@@ -359,7 +359,7 @@ QLocale QGeoRoutingManagerEngine::locale() const
 }
 
 /*!
-\fn void QGeoRoutingManagerEngine::finished(QGeoRouteReply* reply)
+\fn void QGeoRoutingManagerEngine::finished(QGeoRouteReply *reply)
 
 This signal is emitted when \a reply has finished processing.
 
@@ -373,7 +373,7 @@ Use deleteLater() instead.
 */
 
 /*!
-\fn void QGeoRoutingManagerEngine::error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString)
+\fn void QGeoRoutingManagerEngine::error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString)
 
 This signal is emitted when an error has been detected in the processing of
 \a reply.  The QGeoRoutingManagerEngine::finished() signal will probably follow.
diff --git a/src/location/maps/qgeoroutingmanagerengine.h b/src/location/maps/qgeoroutingmanagerengine.h
index 66c01548..91c7b37f 100644
--- a/src/location/maps/qgeoroutingmanagerengine.h
+++ b/src/location/maps/qgeoroutingmanagerengine.h
@@ -68,8 +68,8 @@ public:
     QString managerName() const;
     int managerVersion() const;
 
-    virtual QGeoRouteReply* calculateRoute(const QGeoRouteRequest& request) = 0;
-    virtual QGeoRouteReply* updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
+    virtual QGeoRouteReply *calculateRoute(const QGeoRouteRequest &request) = 0;
+    virtual QGeoRouteReply *updateRoute(const QGeoRoute &route, const QGeoCoordinate &position);
 
     QGeoRouteRequest::TravelModes supportedTravelModes() const;
     QGeoRouteRequest::FeatureTypes supportedFeatureTypes() const;
@@ -82,8 +82,8 @@ public:
     QLocale locale() const;
 
 Q_SIGNALS:
-    void finished(QGeoRouteReply* reply);
-    void error(QGeoRouteReply* reply, QGeoRouteReply::Error error, QString errorString = QString());
+    void finished(QGeoRouteReply *reply);
+    void error(QGeoRouteReply *reply, QGeoRouteReply::Error error, QString errorString = QString());
 
 protected:
     void setSupportedTravelModes(QGeoRouteRequest::TravelModes travelModes);
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index c38f4ff3..8c1b5815 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -311,7 +311,7 @@ Manager *QGeoServiceProviderPrivate::manager(QGeoServiceProvider::Error *_error,
     report any errors which occurred during the construction of the
     QGeocodingManager.
 */
-QGeocodingManager* QGeoServiceProvider::geocodingManager() const
+QGeocodingManager *QGeoServiceProvider::geocodingManager() const
 {
     return d_ptr->manager<QGeocodingManager, QGeocodingManagerEngine>(
                &(d_ptr->geocodeError), &(d_ptr->geocodeErrorString),
@@ -338,7 +338,7 @@ QGeocodingManager* QGeoServiceProvider::geocodingManager() const
     report any errors which occurred during the construction of the
     QGeoMappingManager.
 */
-QGeoMappingManager* QGeoServiceProvider::mappingManager() const
+QGeoMappingManager *QGeoServiceProvider::mappingManager() const
 {
     return d_ptr->manager<QGeoMappingManager, QGeoMappingManagerEngine>(
                &(d_ptr->mappingError), &(d_ptr->mappingErrorString),
@@ -365,7 +365,7 @@ QGeoMappingManager* QGeoServiceProvider::mappingManager() const
     report any errors which occurred during the construction of the
     QGeoRoutingManager.
 */
-QGeoRoutingManager* QGeoServiceProvider::routingManager() const
+QGeoRoutingManager *QGeoServiceProvider::routingManager() const
 {
     return d_ptr->manager<QGeoRoutingManager, QGeoRoutingManagerEngine>(
                &(d_ptr->routingError), &(d_ptr->routingErrorString),
@@ -583,7 +583,7 @@ void QGeoServiceProviderPrivate::loadPlugin(const QMap<QString, QVariant> &param
     int idx = int(metaData.value(QStringLiteral("index")).toDouble());
 
     // load the actual plugin
-    factory = qobject_cast<QGeoServiceProviderFactory*>(loader()->instance(idx));
+    factory = qobject_cast<QGeoServiceProviderFactory *>(loader()->instance(idx));
 }
 
 QHash<QString, QJsonObject> QGeoServiceProviderPrivate::plugins(bool reload)
diff --git a/src/location/maps/qgeoserviceprovider.h b/src/location/maps/qgeoserviceprovider.h
index f3958148..9bd8ded5 100644
--- a/src/location/maps/qgeoserviceprovider.h
+++ b/src/location/maps/qgeoserviceprovider.h
@@ -147,9 +147,9 @@ public:
     MappingFeatures mappingFeatures() const;
     PlacesFeatures placesFeatures() const;
 
-    QGeocodingManager* geocodingManager() const;
-    QGeoMappingManager* mappingManager() const;
-    QGeoRoutingManager* routingManager() const;
+    QGeocodingManager *geocodingManager() const;
+    QGeoMappingManager *mappingManager() const;
+    QGeoRoutingManager *routingManager() const;
     QPlaceManager *placeManager() const;
 
     Error error() const;
diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp
index 30e072af..088ae070 100644
--- a/src/location/maps/qgeoserviceproviderfactory.cpp
+++ b/src/location/maps/qgeoserviceproviderfactory.cpp
@@ -78,7 +78,7 @@ Destroys this QGeoServiceProviderFactory instance.
     The default implementation returns 0, which causes a
     QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
 */
-QGeocodingManagerEngine* QGeoServiceProviderFactory::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeocodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
@@ -102,7 +102,7 @@ QGeocodingManagerEngine* QGeoServiceProviderFactory::createGeocodingManagerEngin
     The default implementation returns 0, which causes a
     QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
 */
-QGeoMappingManagerEngine* QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
@@ -126,7 +126,7 @@ QGeoMappingManagerEngine* QGeoServiceProviderFactory::createMappingManagerEngine
     The default implementation returns 0, which causes a
     QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
 */
-QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoRoutingManagerEngine *QGeoServiceProviderFactory::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 
@@ -151,7 +151,7 @@ QGeoRoutingManagerEngine* QGeoServiceProviderFactory::createRoutingManagerEngine
     The default implementation returns 0, which causes a
     QGeoServiceProvider::NotSupportedError in QGeoServiceProvider.
 */
-QPlaceManagerEngine* QGeoServiceProviderFactory::createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
+QPlaceManagerEngine *QGeoServiceProviderFactory::createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 
diff --git a/src/location/maps/qgeoserviceproviderfactory.h b/src/location/maps/qgeoserviceproviderfactory.h
index 7e93d0b4..3c87ec5f 100644
--- a/src/location/maps/qgeoserviceproviderfactory.h
+++ b/src/location/maps/qgeoserviceproviderfactory.h
@@ -57,13 +57,13 @@ class Q_LOCATION_EXPORT QGeoServiceProviderFactory
 public:
     virtual ~QGeoServiceProviderFactory() {}
 
-    virtual QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeocodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    virtual QGeoMappingManagerEngine* createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    virtual QGeoRoutingManagerEngine* createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+    virtual QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
     virtual QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
diff --git a/src/location/maps/qgeotilecache_p.h b/src/location/maps/qgeotilecache_p.h
index 52207a71..d7a900de 100644
--- a/src/location/maps/qgeotilecache_p.h
+++ b/src/location/maps/qgeotilecache_p.h
@@ -169,7 +169,7 @@ private:
     int extraTextureUsage_;
 
     QMutex cleanupMutex_;
-    QList<QGLTexture2D*> cleanupList_;
+    QList<QGLTexture2D *> cleanupList_;
 };
 
 QT_END_NAMESPACE
diff --git a/src/location/maps/qgeotiledmapdata.cpp b/src/location/maps/qgeotiledmapdata.cpp
index 9ecf8539..0d331625 100644
--- a/src/location/maps/qgeotiledmapdata.cpp
+++ b/src/location/maps/qgeotiledmapdata.cpp
@@ -155,7 +155,7 @@ void QGeoTiledMapData::newTileFetched(QSharedPointer<QGeoTileTexture> texture)
     d->newTileFetched(texture);
 }
 
-QGeoTileCache* QGeoTiledMapData::tileCache()
+QGeoTileCache *QGeoTiledMapData::tileCache()
 {
     Q_D(QGeoTiledMapData);
     return d->tileCache();
@@ -253,7 +253,7 @@ QGeoTiledMapDataPrivate::~QGeoTiledMapDataPrivate()
     // However: how to ensure this is done in rendering thread?
 }
 
-QGeoTileCache* QGeoTiledMapDataPrivate::tileCache()
+QGeoTileCache *QGeoTiledMapDataPrivate::tileCache()
 {
     return cache_;
 }
diff --git a/src/location/maps/qgeotiledmapdata_p.h b/src/location/maps/qgeotiledmapdata_p.h
index e91e1aca..73fde8f1 100644
--- a/src/location/maps/qgeotiledmapdata_p.h
+++ b/src/location/maps/qgeotiledmapdata_p.h
@@ -78,7 +78,7 @@ public:
     QGeoTiledMapData(QGeoTiledMappingManagerEngine *engine, QObject *parent);
     virtual ~QGeoTiledMapData();
 
-    QGeoTileCache* tileCache();
+    QGeoTileCache *tileCache();
 
     void paintGL(QGLPainter *painter);
 
diff --git a/src/location/maps/qgeotiledmapdata_p_p.h b/src/location/maps/qgeotiledmapdata_p_p.h
index d1e68e9f..e1d2d716 100644
--- a/src/location/maps/qgeotiledmapdata_p_p.h
+++ b/src/location/maps/qgeotiledmapdata_p_p.h
@@ -90,7 +90,7 @@ public:
     QGeoTiledMapDataPrivate(QGeoTiledMapData *parent, QGeoTiledMappingManagerEngine *engine);
     ~QGeoTiledMapDataPrivate();
 
-    QGeoTileCache* tileCache();
+    QGeoTileCache *tileCache();
 
     void paintGL(QGLPainter *painter);
 
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.cpp b/src/location/maps/qgeotiledmappingmanagerengine.cpp
index 6ac65b37..9d2ba880 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.cpp
+++ b/src/location/maps/qgeotiledmappingmanagerengine.cpp
@@ -120,7 +120,7 @@ QGeoTileFetcher *QGeoTiledMappingManagerEngine::tileFetcher()
     return d->fetcher_;
 }
 
-QGeoMap* QGeoTiledMappingManagerEngine::createMap(QObject *parent)
+QGeoMap *QGeoTiledMappingManagerEngine::createMap(QObject *parent)
 {
     Q_UNUSED(parent);
     return NULL;
@@ -136,12 +136,12 @@ void QGeoTiledMappingManagerEngine::deregisterMap(QGeoTiledMapData *map)
     d_ptr->tileMaps_.remove(map);
     d_ptr->mapHash_.remove(map);
 
-    QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> > newTileHash = d_ptr->tileHash_;
-    typedef QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> >::const_iterator h_iter;
+    QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> > newTileHash = d_ptr->tileHash_;
+    typedef QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> >::const_iterator h_iter;
     h_iter hi = d_ptr->tileHash_.constBegin();
     h_iter hend = d_ptr->tileHash_.constEnd();
     for (; hi != hend; ++hi) {
-        QSet<QGeoTiledMapData*> maps = hi.value();
+        QSet<QGeoTiledMapData *> maps = hi.value();
         if (maps.contains(map)) {
             maps.remove(map);
             if (maps.isEmpty())
@@ -186,7 +186,7 @@ void QGeoTiledMappingManagerEngine::updateTileRequests(QGeoTiledMapData *map,
 
     rem = tilesRemoved.constBegin();
     for (; rem != remEnd; ++rem) {
-        QSet<QGeoTiledMapData*> mapSet = d->tileHash_.value(*rem);
+        QSet<QGeoTiledMapData *> mapSet = d->tileHash_.value(*rem);
         mapSet.remove(map);
         if (mapSet.isEmpty()) {
             cancelTiles.insert(*rem);
@@ -198,7 +198,7 @@ void QGeoTiledMappingManagerEngine::updateTileRequests(QGeoTiledMapData *map,
 
     add = tilesAdded.constBegin();
     for (; add != addEnd; ++add) {
-        QSet<QGeoTiledMapData*> mapSet = d->tileHash_.value(*add);
+        QSet<QGeoTiledMapData *> mapSet = d->tileHash_.value(*add);
         if (mapSet.isEmpty()) {
             reqTiles.insert(*add);
         }
@@ -218,9 +218,9 @@ void QGeoTiledMappingManagerEngine::engineTileFinished(const QGeoTileSpec &spec,
 {
     Q_D(QGeoTiledMappingManagerEngine);
 
-    QSet<QGeoTiledMapData*> maps = d->tileHash_.value(spec);
+    QSet<QGeoTiledMapData *> maps = d->tileHash_.value(spec);
 
-    typedef QSet<QGeoTiledMapData*>::const_iterator map_iter;
+    typedef QSet<QGeoTiledMapData *>::const_iterator map_iter;
 
     map_iter map = maps.constBegin();
     map_iter mapEnd = maps.constEnd();
@@ -235,7 +235,7 @@ void QGeoTiledMappingManagerEngine::engineTileFinished(const QGeoTileSpec &spec,
 
     d->tileHash_.remove(spec);
 
-    typedef QSet<QGeoTileCache*>::const_iterator cache_iter;
+    typedef QSet<QGeoTileCache *>::const_iterator cache_iter;
 
     tileCache()->insert(spec, bytes, format, d->cacheHint_);
 
@@ -252,8 +252,8 @@ void QGeoTiledMappingManagerEngine::engineTileError(const QGeoTileSpec &spec, co
 {
     Q_D(QGeoTiledMappingManagerEngine);
 
-    QSet<QGeoTiledMapData*> maps = d->tileHash_.value(spec);
-    typedef QSet<QGeoTiledMapData*>::const_iterator map_iter;
+    QSet<QGeoTiledMapData *> maps = d->tileHash_.value(spec);
+    typedef QSet<QGeoTiledMapData *>::const_iterator map_iter;
     map_iter map = maps.constBegin();
     map_iter mapEnd = maps.constEnd();
     for (; map != mapEnd; ++map) {
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.h b/src/location/maps/qgeotiledmappingmanagerengine.h
index ea1433a0..3c6d65d0 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine.h
@@ -86,7 +86,7 @@ public:
 
     QGeoTileFetcher *tileFetcher();
 
-    virtual QGeoMap* createMap(QObject *parent);
+    virtual QGeoMap *createMap(QObject *parent);
 
     void registerMap(QGeoTiledMapData *map);
     void deregisterMap(QGeoTiledMapData *map);
@@ -115,7 +115,7 @@ protected:
     void setTileSize(const QSize &tileSize);
     void setCacheHint(QGeoTiledMappingManagerEngine::CacheAreas cacheHint);
 
-    QGeoTileCache *createTileCacheWithDir(const QString& cacheDirectory);
+    QGeoTileCache *createTileCacheWithDir(const QString &cacheDirectory);
 
 private:
     QGeoTiledMappingManagerEnginePrivate *d_ptr;
diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h
index 7948f203..07b2d5d4 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine_p.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h
@@ -76,9 +76,9 @@ public:
 
     QThread *thread_;
     QSize tileSize_;
-    QSet<QGeoTiledMapData*> tileMaps_;
-    QHash<QGeoTiledMapData*, QSet<QGeoTileSpec> > mapHash_;
-    QHash<QGeoTileSpec, QSet<QGeoTiledMapData*> > tileHash_;
+    QSet<QGeoTiledMapData *> tileMaps_;
+    QHash<QGeoTiledMapData *, QSet<QGeoTileSpec> > mapHash_;
+    QHash<QGeoTileSpec, QSet<QGeoTiledMapData *> > tileHash_;
     QGeoTiledMappingManagerEngine::CacheAreas cacheHint_;
     QGeoTileCache *tileCache_;
     QGeoTileFetcher *fetcher_;
diff --git a/src/location/maps/qgeotiledmapreply_p.h b/src/location/maps/qgeotiledmapreply_p.h
index ff34432d..8584465e 100644
--- a/src/location/maps/qgeotiledmapreply_p.h
+++ b/src/location/maps/qgeotiledmapreply_p.h
@@ -62,7 +62,7 @@ class QGeoTiledMapReplyPrivate
 {
 public:
     QGeoTiledMapReplyPrivate(const QGeoTileSpec &spec);
-    QGeoTiledMapReplyPrivate(QGeoTiledMapReply::Error error, const QString& errorString);
+    QGeoTiledMapReplyPrivate(QGeoTiledMapReply::Error error, const QString &errorString);
     ~QGeoTiledMapReplyPrivate();
 
     QGeoTiledMapReply::Error error;
diff --git a/src/location/maps/qgeotilefetcher.cpp b/src/location/maps/qgeotilefetcher.cpp
index 8b83b881..79b838bb 100644
--- a/src/location/maps/qgeotilefetcher.cpp
+++ b/src/location/maps/qgeotilefetcher.cpp
@@ -180,7 +180,7 @@ void QGeoTileFetcher::finished()
 
     QMutexLocker ml(&d->queueMutex_);
 
-    QGeoTiledMapReply *reply = qobject_cast<QGeoTiledMapReply*>(sender());
+    QGeoTiledMapReply *reply = qobject_cast<QGeoTiledMapReply *>(sender());
     if (!reply)
         return;
 
diff --git a/src/location/maps/qgeotilefetcher.h b/src/location/maps/qgeotilefetcher.h
index 5e996b26..e40f21ef 100644
--- a/src/location/maps/qgeotilefetcher.h
+++ b/src/location/maps/qgeotilefetcher.h
@@ -87,7 +87,7 @@ protected:
 private:
     QGeoTileFetcherPrivate *d_ptr;
 
-    virtual QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec) = 0;
+    virtual QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec) = 0;
     void handleReply(QGeoTiledMapReply *reply, const QGeoTileSpec &spec);
 
     Q_DECLARE_PRIVATE(QGeoTileFetcher)
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index b50e15a1..68d73233 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -83,7 +83,7 @@ public:
     QTimer *timer_;
     QMutex queueMutex_;
     QList<QGeoTileSpec> queue_;
-    QHash<QGeoTileSpec, QGeoTiledMapReply*> invmap_;
+    QHash<QGeoTileSpec, QGeoTiledMapReply *> invmap_;
 
 private:
     Q_DISABLE_COPY(QGeoTileFetcherPrivate)
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index dca33cb0..563df456 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -118,7 +118,7 @@ QList<QSharedPointer<QGeoTileTexture> > QGeoTileRequestManagerPrivate::requestTi
     QList<QSharedPointer<QGeoTileTexture> > cachedTex;
 
     QGeoTiledMappingManagerEngine *engine = map_ ?
-                static_cast<QGeoTiledMappingManagerEngine*>(map_->engine()) : 0;
+                static_cast<QGeoTiledMappingManagerEngine *>(map_->engine()) : 0;
 
     // remove tiles in cache from request tiles
     if (engine) {
@@ -193,7 +193,7 @@ void RetryFuture::retry()
     requestTiles.insert(tile_);
     if (map_) {
         QGeoTiledMappingManagerEngine *engine =
-                static_cast<QGeoTiledMappingManagerEngine*>(map_->engine());
+                static_cast<QGeoTiledMappingManagerEngine *>(map_->engine());
         engine->updateTileRequests(map_, requestTiles, cancelTiles);
     }
 }
diff --git a/src/location/maps/qgeotilespec.cpp b/src/location/maps/qgeotilespec.cpp
index cb768c37..272d8b1d 100644
--- a/src/location/maps/qgeotilespec.cpp
+++ b/src/location/maps/qgeotilespec.cpp
@@ -56,7 +56,7 @@ QGeoTileSpec::QGeoTileSpec(const QGeoTileSpec &other)
 QGeoTileSpec::~QGeoTileSpec() {
 }
 
-QGeoTileSpec& QGeoTileSpec::operator = (const QGeoTileSpec &other)
+QGeoTileSpec &QGeoTileSpec::operator = (const QGeoTileSpec &other)
 {
     if (this == &other)
         return *this;
@@ -159,7 +159,7 @@ QGeoTileSpecPrivate::QGeoTileSpecPrivate(const QString &plugin, int mapId, int z
 
 QGeoTileSpecPrivate::~QGeoTileSpecPrivate() {}
 
-QGeoTileSpecPrivate& QGeoTileSpecPrivate::operator = (const QGeoTileSpecPrivate &other)
+QGeoTileSpecPrivate &QGeoTileSpecPrivate::operator = (const QGeoTileSpecPrivate &other)
 {
     if (this == &other)
         return *this;
diff --git a/src/location/maps/qgeotilespec.h b/src/location/maps/qgeotilespec.h
index 959f816d..10be4294 100644
--- a/src/location/maps/qgeotilespec.h
+++ b/src/location/maps/qgeotilespec.h
@@ -61,7 +61,7 @@ public:
     QGeoTileSpec(const QString &plugin, int mapId, int zoom, int x, int y);
     ~QGeoTileSpec();
 
-    QGeoTileSpec& operator = (const QGeoTileSpec &other);
+    QGeoTileSpec &operator = (const QGeoTileSpec &other);
 
     QString plugin() const;
 
diff --git a/src/location/maps/qgeotilespec_p.h b/src/location/maps/qgeotilespec_p.h
index 787dd6a9..8392e617 100644
--- a/src/location/maps/qgeotilespec_p.h
+++ b/src/location/maps/qgeotilespec_p.h
@@ -65,7 +65,7 @@ public:
     QGeoTileSpecPrivate(const QString &plugin, int mapId, int zoom, int x, int y);
     ~QGeoTileSpecPrivate();
 
-    QGeoTileSpecPrivate& operator = (const QGeoTileSpecPrivate &other);
+    QGeoTileSpecPrivate &operator = (const QGeoTileSpecPrivate &other);
 
     bool operator == (const QGeoTileSpecPrivate &rhs) const;
     bool operator < (const QGeoTileSpecPrivate &rhs) const;