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>

45 files changed, 164 insertions, 164 deletions

diff --git a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
index 2bd6a095..7d7a7b8a 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacecontentreplyimplv1.cpp
@@ -131,7 +131,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI
 {
     if (errorId == QPlaceJSonParser::NoError) {
         if (request().contentType() == QPlaceContent::ImageType) {
-            QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser*>(parser);
+            QPlaceJSonMediaParser * mediaParser = qobject_cast<QPlaceJSonMediaParser *>(parser);
             QList<QPlaceImage> imageOjects = mediaParser->resultMedia();
             QPlaceContent::Collection collection;
             for (int i=0; i < imageOjects.count(); ++i)
@@ -139,7 +139,7 @@ void QPlaceContentReplyImplV1::resultReady(const QPlaceJSonParser::Error &errorI
             setContent(collection);
             setTotalCount(mediaParser->allMediaCount());
         } else if (request().contentType() == QPlaceContent::ReviewType) {
-            QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser*>(parser);
+            QPlaceJSonReviewParser *reviewParser = qobject_cast<QPlaceJSonReviewParser *>(parser);
             QList<QPlaceReview> reviewObjects = reviewParser->results();
             QPlaceContent::Collection collection;
             for (int i=0; i < reviewObjects.count(); ++i)
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
index 7269b788..009a0749 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacejsondetailsparser.cpp
@@ -700,7 +700,7 @@ void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QJSValue &
                 int insertionIndex = 0;
                 if (!images.keys().isEmpty())
                     insertionIndex = images.keys().last() + 1;
-                images.insert(insertionIndex,*obj);
+                images.insert(insertionIndex, *obj);
                 targetPlace->setContent(QPlaceContent::ImageType, images);
                 delete obj;
             }
@@ -822,7 +822,7 @@ void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QJSValue &conte
                 if (it.name() != "length") {
                     QPlaceImage *obj = processAdContentMediaObject(it.value());
                     if (obj) {
-                        images.insert(insertionIndex,*obj);
+                        images.insert(insertionIndex, *obj);
                         insertionIndex++;
                         delete obj;
                     }
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
index fb44d15c..258c1505 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
+++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.cpp
@@ -116,7 +116,7 @@ QPlaceRestManager *QPlaceRestManager::instance()
 /*!
     Sets the network access manager used for requests.
 */
-void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager* manager)
+void QPlaceRestManager::setNetworkAccessManager(QGeoNetworkAccessManager *manager)
 {
     if (manager) {
         delete mManager;
diff --git a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
index bea2bee4..90eb3521 100644
--- a/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
+++ b/src/plugins/geoservices/nokia/placesv1/qplacerestmanager.h
@@ -68,7 +68,7 @@ class QPlaceRestManager : public QObject
 public:
     static QPlaceRestManager *instance();
 
-    void setNetworkAccessManager(QGeoNetworkAccessManager* networkManager);
+    void setNetworkAccessManager(QGeoNetworkAccessManager *networkManager);
 
     QPlaceRestReply *sendPlaceRequest(const QString &placeId);
     QPlaceRestReply *sendPlaceImagesRequest(const QString &placeId, const QPlaceContentRequest &params);
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
index 282809ff..6b06fef0 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp
@@ -64,7 +64,7 @@ QGeoCodeXmlParser::~QGeoCodeXmlParser()
         delete m_reader;
 }
 
-bool QGeoCodeXmlParser::parse(QIODevice* source)
+bool QGeoCodeXmlParser::parse(QIODevice *source)
 {
     if (m_reader)
         delete m_reader;
diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.h b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
index fffbecda..120c80a8 100644
--- a/src/plugins/geoservices/nokia/qgeocodexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.h
@@ -68,7 +68,7 @@ public:
     QGeoCodeXmlParser();
     ~QGeoCodeXmlParser();
 
-    bool parse(QIODevice* source);
+    bool parse(QIODevice *source);
 
     QList<QGeoLocation> results() const;
     QString errorString() const;
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index a8488ac6..c37cadf9 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -60,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia(
-        QGeoNetworkAccessManager* networkManager,
+        QGeoNetworkAccessManager *networkManager,
         const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString)
@@ -116,7 +116,7 @@ QString QGeocodingManagerEngineNokia::getAuthenticationString() const
 }
 
 
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
         const QGeoBoundingArea &bounds)
 {
     QString requestString = "http://";
@@ -185,7 +185,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address,
     return geocode(requestString, bounds);
 }
 
-QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate,
+QGeocodeReply *QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate &coordinate,
         const QGeoBoundingArea &bounds)
 {
     QString requestString = "http://";
@@ -205,7 +205,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::reverseGeocode(const QGeoCoordinate
     return geocode(requestString, bounds);
 }
 
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(const QString &address,
         int limit,
         int offset,
         const QGeoBoundingArea &bounds)
@@ -235,7 +235,7 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QString &address,
     return geocode(requestString, bounds, limit, offset);
 }
 
-QGeocodeReply* QGeocodingManagerEngineNokia::geocode(QString requestString,
+QGeocodeReply *QGeocodingManagerEngineNokia::geocode(QString requestString,
         const QGeoBoundingArea &bounds,
         int limit,
         int offset)
@@ -270,7 +270,7 @@ QString QGeocodingManagerEngineNokia::trimDouble(double degree, int decimalDigit
 
 void QGeocodingManagerEngineNokia::placesFinished()
 {
-    QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender());
+    QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
 
     if (!reply)
         return;
@@ -285,12 +285,12 @@ void QGeocodingManagerEngineNokia::placesFinished()
 
 void QGeocodingManagerEngineNokia::placesError(QGeocodeReply::Error error, const QString &errorString)
 {
-    QGeocodeReply *reply = qobject_cast<QGeocodeReply*>(sender());
+    QGeocodeReply *reply = qobject_cast<QGeocodeReply *>(sender());
 
     if (!reply)
         return;
 
-    if (receivers(SIGNAL(error(QGeocodeReply*, QGeocodeReply::Error, QString))) == 0) {
+    if (receivers(SIGNAL(error(QGeocodeReply *, QGeocodeReply::Error, QString))) == 0) {
         reply->deleteLater();
         return;
     }
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
index 4bcf0479..d021191d 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.h
@@ -66,18 +66,18 @@ class QGeocodingManagerEngineNokia : public QGeocodingManagerEngine
 {
     Q_OBJECT
 public:
-    QGeocodingManagerEngineNokia(QGeoNetworkAccessManager* networkManager,
+    QGeocodingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
                                  const QMap<QString, QVariant> &parameters,
                                  QGeoServiceProvider::Error *error,
                                  QString *errorString);
     ~QGeocodingManagerEngineNokia();
 
-    QGeocodeReply* geocode(const QGeoAddress &address,
+    QGeocodeReply *geocode(const QGeoAddress &address,
                              const QGeoBoundingArea &bounds);
-    QGeocodeReply* reverseGeocode(const QGeoCoordinate &coordinate,
+    QGeocodeReply *reverseGeocode(const QGeoCoordinate &coordinate,
                                     const QGeoBoundingArea &bounds);
 
-    QGeocodeReply* geocode(const QString &searchString,
+    QGeocodeReply *geocode(const QString &searchString,
                             int limit,
                             int offset,
                             const QGeoBoundingArea &bounds);
@@ -88,7 +88,7 @@ private Q_SLOTS:
 
 private:
     static QString trimDouble(double degree, int decimalDigits = 10);
-    QGeocodeReply* geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0);
+    QGeocodeReply *geocode(QString requestString, const QGeoBoundingArea &bounds, int limit = -1, int offset = 0);
     QString languageToMarc(QLocale::Language language);
     QString getAuthenticationString() const;
 
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
index 118a2d24..b9b0bbf9 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.cpp
@@ -89,7 +89,7 @@ void QGeoIntrinsicNetworkAccessManager::configure(const QMap<QString, QVariant>
     }
 }
 
-QNetworkReply* QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest& request)
+QNetworkReply *QGeoIntrinsicNetworkAccessManager::get(const QNetworkRequest &request)
 {
     return m_networkManager->get(request);
 }
diff --git a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
index c1b85c9d..267b7f2e 100644
--- a/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeointrinsicnetworkaccessmanager.h
@@ -56,14 +56,14 @@ public:
     explicit QGeoIntrinsicNetworkAccessManager(QObject *parent = 0);
     QGeoIntrinsicNetworkAccessManager(const QMap<QString, QVariant> &parameters, const QString &token = QString(), QObject *parent = 0);
 
-    virtual QNetworkReply* get(const QNetworkRequest& request);
+    virtual QNetworkReply *get(const QNetworkRequest &request);
     virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
 
 private:
     void configure(const QMap<QString, QVariant> &parameters);
 
     const QString m_customProxyToken;
-    QNetworkAccessManager* m_networkManager;
+    QNetworkAccessManager *m_networkManager;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
index b249a194..60a18c3c 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.cpp
@@ -78,7 +78,7 @@ QGeoMapReplyNokia::~QGeoMapReplyNokia()
 {
 }
 
-QNetworkReply* QGeoMapReplyNokia::networkReply() const
+QNetworkReply *QGeoMapReplyNokia::networkReply() const
 {
     return m_reply;
 }
diff --git a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
index bf5f9384..70fd8570 100644
--- a/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeomapreply_nokia.h
@@ -65,7 +65,7 @@ public:
 
     void abort();
 
-    QNetworkReply* networkReply() const;
+    QNetworkReply *networkReply() const;
 
 private Q_SLOTS:
     void replyDestroyed();
diff --git a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
index 73a4c208..8bc7ecb1 100644
--- a/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
+++ b/src/plugins/geoservices/nokia/qgeonetworkaccessmanager.h
@@ -55,11 +55,11 @@ class QGeoNetworkAccessManager : public QObject
     Q_OBJECT
 public:
     virtual ~QGeoNetworkAccessManager() {}
-    virtual QNetworkReply* get(const QNetworkRequest& request) = 0;
+    virtual QNetworkReply *get(const QNetworkRequest &request) = 0;
     virtual QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data) = 0;
 
 protected:
-    QGeoNetworkAccessManager(QObject* parent) : QObject(parent) {}
+    QGeoNetworkAccessManager(QObject *parent) : QObject(parent) {}
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
index 9eabc593..7c98ea79 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp
@@ -74,7 +74,7 @@ QGeoRouteXmlParser::~QGeoRouteXmlParser()
         delete m_reader;
 }
 
-bool QGeoRouteXmlParser::parse(QIODevice* source)
+bool QGeoRouteXmlParser::parse(QIODevice *source)
 {
     if (m_reader)
         delete m_reader;
@@ -522,7 +522,7 @@ bool QGeoRouteXmlParser::parseLink()
     return true;
 }
 
-bool QGeoRouteXmlParser::parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName)
+bool QGeoRouteXmlParser::parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName)
 {
     QStringList rawPoints = strPoints.split(' ');
 
diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
index c798b233..ee659192 100644
--- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
+++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.h
@@ -99,7 +99,7 @@ public:
     QGeoRouteXmlParser(const QGeoRouteRequest &request);
     ~QGeoRouteXmlParser();
 
-    bool parse(QIODevice* source);
+    bool parse(QIODevice *source);
     QList<QGeoRoute> results() const;
     QString errorString() const;
 
@@ -110,7 +110,7 @@ private:
     bool parseCoordinates(QGeoCoordinate &coord);
     bool parseMode(QGeoRoute *route);
     bool parseSummary(QGeoRoute *route);
-    bool parseGeoPoints(const QString& strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName);
+    bool parseGeoPoints(const QString &strPoints, QList<QGeoCoordinate> *geoPoints, const QString &elementName);
     bool parseLeg();
     bool parseManeuver();
     bool parseLink();
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index 8fa7d33a..f4295f57 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -58,7 +58,7 @@
 QT_BEGIN_NAMESPACE
 
 QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
-        QGeoNetworkAccessManager* networkManager,
+        QGeoNetworkAccessManager *networkManager,
         const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString)
@@ -124,7 +124,7 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(
 
 QGeoRoutingManagerEngineNokia::~QGeoRoutingManagerEngineNokia() {}
 
-QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest& request)
+QGeoRouteReply *QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteRequest &request)
 {
     QString reqString = calculateRouteRequestString(request);
 
@@ -150,7 +150,7 @@ QGeoRouteReply* QGeoRoutingManagerEngineNokia::calculateRoute(const QGeoRouteReq
     return reply;
 }
 
-QGeoRouteReply* QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
+QGeoRouteReply *QGeoRoutingManagerEngineNokia::updateRoute(const QGeoRoute &route, const QGeoCoordinate &position)
 {
     QString reqString = updateRouteRequestString(route, position);
 
@@ -453,7 +453,7 @@ QString QGeoRoutingManagerEngineNokia::trimDouble(double degree, int decimalDigi
 
 void QGeoRoutingManagerEngineNokia::routeFinished()
 {
-    QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender());
+    QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender());
 
     if (!reply)
         return;
@@ -468,7 +468,7 @@ void QGeoRoutingManagerEngineNokia::routeFinished()
 
 void QGeoRoutingManagerEngineNokia::routeError(QGeoRouteReply::Error error, const QString &errorString)
 {
-    QGeoRouteReply *reply = qobject_cast<QGeoRouteReply*>(sender());
+    QGeoRouteReply *reply = qobject_cast<QGeoRouteReply *>(sender());
 
     if (!reply)
         return;
diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
index 8e9b9ef9..f5bb9541 100644
--- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.h
@@ -62,14 +62,14 @@ class QGeoRoutingManagerEngineNokia : public QGeoRoutingManagerEngine
 {
     Q_OBJECT
 public:
-    QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager* networkInterface,
+    QGeoRoutingManagerEngineNokia(QGeoNetworkAccessManager *networkInterface,
                                   const QMap<QString, QVariant> &parameters,
                                   QGeoServiceProvider::Error *error,
                                   QString *errorString);
     ~QGeoRoutingManagerEngineNokia();
 
-    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);
 
 private Q_SLOTS:
     void routeFinished();
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index 2f2a4dc4..d031d1cd 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -80,7 +80,7 @@ static bool isValidParameter(const QString &param)
 
 static QGeoNetworkAccessManager *tryGetNetworkAccessManager(const QVariantMap &parameters)
 {
-    return static_cast<QGeoNetworkAccessManager*>(qvariant_cast<void*>(parameters.value(QStringLiteral("nam"))));
+    return static_cast<QGeoNetworkAccessManager *>(qvariant_cast<void *>(parameters.value(QStringLiteral("nam"))));
 }
 
 QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia()
@@ -89,42 +89,42 @@ QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia()
 
 QGeoServiceProviderFactoryNokia::~QGeoServiceProviderFactoryNokia() {}
 
-QGeocodingManagerEngine* QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine(
+QGeocodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine(
         const QVariantMap &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
     informOnceAboutUsageTermsIfNecessary(parameters);
 
-    QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+    QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
     if (!networkManager)
         networkManager = new QGeoIntrinsicNetworkAccessManager(parameters);
 
     return new QGeocodingManagerEngineNokia(networkManager, parameters, error, errorString);
 }
 
-QGeoMappingManagerEngine* QGeoServiceProviderFactoryNokia::createMappingManagerEngine(
+QGeoMappingManagerEngine *QGeoServiceProviderFactoryNokia::createMappingManagerEngine(
         const QVariantMap &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
     informOnceAboutUsageTermsIfNecessary(parameters);
 
-    QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+    QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
     if (!networkManager)
         networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("mapping.proxy"));
 
     return new QGeoTiledMappingManagerEngineNokia(networkManager, parameters, error, errorString);
 }
 
-QGeoRoutingManagerEngine* QGeoServiceProviderFactoryNokia::createRoutingManagerEngine(
+QGeoRoutingManagerEngine *QGeoServiceProviderFactoryNokia::createRoutingManagerEngine(
         const QVariantMap &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
     informOnceAboutUsageTermsIfNecessary(parameters);
 
-    QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+    QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
     if (!networkManager)
         networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("routing.proxy"));
 
@@ -138,7 +138,7 @@ QPlaceManagerEngine *QGeoServiceProviderFactoryNokia::createPlaceManagerEngine(
 {
     informOnceAboutUsageTermsIfNecessary(parameters);
 
-    QGeoNetworkAccessManager* networkManager = tryGetNetworkAccessManager(parameters);
+    QGeoNetworkAccessManager *networkManager = tryGetNetworkAccessManager(parameters);
     if (!networkManager)
         networkManager = new QGeoIntrinsicNetworkAccessManager(parameters, QStringLiteral("places.proxy"));
 
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
index ed9ad35c..917117de 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
@@ -67,13 +67,13 @@ public:
     QGeoServiceProviderFactoryNokia();
     ~QGeoServiceProviderFactoryNokia();
 
-    QGeocodingManagerEngine* createGeocodingManagerEngine(const QVariantMap &parameters,
+    QGeocodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    QGeoMappingManagerEngine* createMappingManagerEngine(const QVariantMap &parameters,
+    QGeoMappingManagerEngine *createMappingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    QGeoRoutingManagerEngine* createRoutingManagerEngine(const QVariantMap &parameters,
+    QGeoRoutingManagerEngine *createRoutingManagerEngine(const QVariantMap &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
     QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
diff --git a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index a436315b..e71d4378 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -80,7 +80,7 @@ void QGeoTiledMapDataNokia::evaluateCopyrights(const QSet<QGeoTileSpec> &visible
     const int shadowWidth = 2;
     const int fontSize = 10;
 
-    QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia*>(engine());
+    QGeoTiledMappingManagerEngineNokia *engineNokia = static_cast<QGeoTiledMappingManagerEngineNokia *>(engine());
     QString copyrightsString = engineNokia->evaluateCopyrightsText(activeMapType().style(), mapController()->zoom(), visibleTiles);
 
     if (width() > 0 && height() > 0 && (lastCopyrightsString.isNull() || copyrightsString != lastCopyrightsString)) {
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
index 76305e57..15c67ded 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp
@@ -66,7 +66,7 @@
 QT_BEGIN_NAMESPACE
 
 QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
-    QGeoNetworkAccessManager* networkManager,
+    QGeoNetworkAccessManager *networkManager,
     const QMap<QString, QVariant> &parameters,
     QGeoServiceProvider::Error *error,
     QString *errorString)
@@ -110,7 +110,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia(
     if (parameters.contains(QLatin1String("mapping.cache.directory")))
         cacheDir = parameters.value(QLatin1String("mapping.cache.directory")).toString();
 
-    QGeoTileCache* tileCache = createTileCacheWithDir(cacheDir);
+    QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir);
 
     if (parameters.contains(QLatin1String("mapping.cache.disk.size"))) {
       bool ok = false;
diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
index 91171e03..92b634cd 100644
--- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h
@@ -70,13 +70,13 @@ class QGeoTiledMappingManagerEngineNokia : public QGeoTiledMappingManagerEngine
     Q_OBJECT
 
 public:
-    QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager* networkManager,
+    QGeoTiledMappingManagerEngineNokia(QGeoNetworkAccessManager *networkManager,
                                        const QMap<QString, QVariant> &parameters,
                                        QGeoServiceProvider::Error *error,
                                        QString *errorString);
     ~QGeoTiledMappingManagerEngineNokia();
 
-    virtual QGeoMapData* createMapData();
+    virtual QGeoMapData *createMapData();
     QString evaluateCopyrightsText(const QGeoMapType::MapStyle mapStyle,
                                    const int zoomLevel,
                                    const QSet<QGeoTileSpec> &tiles);
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index c8ff5ad6..c33000c3 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -66,13 +66,13 @@
 
 QT_BEGIN_NAMESPACE
 
-const char* MAPTILES_HOST = "1-4.maptile.lbs.ovi.com";
-const char* MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn";
+const char *MAPTILES_HOST = "1-4.maptile.lbs.ovi.com";
+const char *MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn";
 
-QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager,
+QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager,
                                            QGeoTiledMappingManagerEngine *engine)
         : QGeoTileFetcher(engine),
-          m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia*>(engine)),
+          m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia *>(engine)),
           m_networkManager(networkManager),
           m_firstSubdomain(QChar::Null),
           m_copyrightsReply(0),
@@ -120,7 +120,7 @@ bool QGeoTileFetcherNokia::init()
     return true;
 }
 
-QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
+QGeoTiledMapReply *QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
 {
     // TODO add error detection for if request.connectivityMode() != QGraphicsGeoMap::OnlineMode
     QString rawRequest = getRequestString(spec);
@@ -128,9 +128,9 @@ QGeoTiledMapReply* QGeoTileFetcherNokia::getTileImage(const QGeoTileSpec &spec)
     QNetworkRequest netRequest((QUrl(rawRequest))); // The extra pair of parens disambiguates this from a function declaration
     netRequest.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
 
-    QNetworkReply* netReply = m_networkManager->get(netRequest);
+    QNetworkReply *netReply = m_networkManager->get(netRequest);
 
-    QGeoTiledMapReply* mapReply = new QGeoMapReplyNokia(netReply, spec);
+    QGeoTiledMapReply *mapReply = new QGeoMapReplyNokia(netReply, spec);
 
     return mapReply;
 }
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
index 3280e870..6a51e8de 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.h
@@ -74,18 +74,18 @@ class QGeoTileFetcherNokia : public QGeoTileFetcher
     Q_OBJECT
 
 public:
-    QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager, QGeoTiledMappingManagerEngine *engine);
+    QGeoTileFetcherNokia(QGeoNetworkAccessManager *networkManager, QGeoTiledMappingManagerEngine *engine);
     ~QGeoTileFetcherNokia();
 
     bool init();
 
-    QGeoTiledMapReply* getTileImage(const QGeoTileSpec &spec);
+    QGeoTiledMapReply *getTileImage(const QGeoTileSpec &spec);
 
-    const QString& host() const;
+    const QString &host() const;
     QChar firstSubdomain() const;
     unsigned char maxSubdomains() const;
-    const QString& token() const;
-    const QString& applicationId() const;
+    const QString &token() const;
+    const QString &applicationId() const;
 
     void setParams(const QMap<QString, QVariant> &parameters);
     void setTileSize(QSize tileSize);
@@ -96,7 +96,7 @@ public Q_SLOTS:
 
 #ifdef USE_CHINA_NETWORK_REGISTRATION
 private Q_SLOTS:
-    void currentMobileCountryCodeChanged(int interface, const QString& mcc);
+    void currentMobileCountryCodeChanged(int interface, const QString &mcc);
 #endif
 
 private:
@@ -107,7 +107,7 @@ private:
     static QString sizeToStr(const QSize &size);
     static QString mapIdToStr(int mapId);
 
-    void setHost(const QString& host);
+    void setHost(const QString &host);
 
     QGeoTiledMappingManagerEngineNokia *m_engineNokia;
     QGeoNetworkAccessManager *m_networkManager;
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
index 97a1340e..19d6d94b 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.cpp
@@ -64,7 +64,7 @@
 QT_USE_NAMESPACE
 
 QPlaceManagerEngineNokiaV1::QPlaceManagerEngineNokiaV1(
-    QGeoNetworkAccessManager* networkManager,
+    QGeoNetworkAccessManager *networkManager,
     const QMap<QString, QVariant> &parameters,
     QGeoServiceProvider::Error *error,
     QString *errorString)
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
index dff8adb7..45a11859 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav1.h
@@ -64,7 +64,7 @@ class QPlaceManagerEngineNokiaV1 : public QPlaceManagerEngine
     Q_OBJECT
 public:
 
-    QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager* networkManager,
+    QPlaceManagerEngineNokiaV1(QGeoNetworkAccessManager *networkManager,
                                const QMap<QString, QVariant> &parameters,
                                QGeoServiceProvider::Error *error,
                                QString *errorString);
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
index 25a12ff7..6a465441 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp
@@ -93,7 +93,7 @@ static const char * const placesServerInternational = "http://api.places.lbs.map
 static const char * const placesServerChina = "http://api.places.lbs.maps.nokia.com.cn/places";
 
 QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2(
-    QGeoNetworkAccessManager* networkManager,
+    QGeoNetworkAccessManager *networkManager,
     const QMap<QString, QVariant> &parameters,
     QGeoServiceProvider::Error *error,
     QString *errorString)
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
index 3ed4af61..60539aa5 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.h
@@ -77,7 +77,7 @@ class QPlaceManagerEngineNokiaV2 : public QPlaceManagerEngine
     Q_OBJECT
 
 public:
-    QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager* networkManager,
+    QPlaceManagerEngineNokiaV2(QGeoNetworkAccessManager *networkManager,
                                const QMap<QString, QVariant> &parameters,
                                QGeoServiceProvider::Error *error,
                                QString *errorString);
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
index 4c2bd548..5eefd26b 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
@@ -51,7 +51,7 @@ QGeoServiceProviderFactoryJsonDb::QGeoServiceProviderFactoryJsonDb() {}
 
 QGeoServiceProviderFactoryJsonDb::~QGeoServiceProviderFactoryJsonDb() {}
 
-QGeocodingManagerEngine* QGeoServiceProviderFactoryJsonDb::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeocodingManagerEngine *QGeoServiceProviderFactoryJsonDb::createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
@@ -62,7 +62,7 @@ QGeocodingManagerEngine* QGeoServiceProviderFactoryJsonDb::createGeocodingManage
     return 0;
 }
 
-QGeoMappingManagerEngine* QGeoServiceProviderFactoryJsonDb::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoMappingManagerEngine *QGeoServiceProviderFactoryJsonDb::createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
@@ -73,7 +73,7 @@ QGeoMappingManagerEngine* QGeoServiceProviderFactoryJsonDb::createMappingManager
     return 0;
 }
 
-QGeoRoutingManagerEngine* QGeoServiceProviderFactoryJsonDb::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+QGeoRoutingManagerEngine *QGeoServiceProviderFactoryJsonDb::createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
         QGeoServiceProvider::Error *error,
         QString *errorString) const
 {
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
index 59a19abb..e3b40284 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
@@ -58,13 +58,13 @@ public:
     QGeoServiceProviderFactoryJsonDb();
     ~QGeoServiceProviderFactoryJsonDb();
 
-    QGeocodingManagerEngine* createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
+    QGeocodingManagerEngine *createGeocodingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    QGeoMappingManagerEngine* createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
+    QGeoMappingManagerEngine *createMappingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
-    QGeoRoutingManagerEngine* createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
+    QGeoRoutingManagerEngine *createRoutingManagerEngine(const QMap<QString, QVariant> &parameters,
             QGeoServiceProvider::Error *error,
             QString *errorString) const;
     QPlaceManagerEngine *createPlaceManagerEngine(const QMap<QString, QVariant> &parameters,
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index 37a93b1c..d9a7f2dc 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -66,9 +66,9 @@ static void position_changed (GeocluePosition      *position,
     Q_UNUSED(position);
     if (!(fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
           fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)) {
-        static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->regularUpdateFailed();
+        static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->regularUpdateFailed();
     } else {
-        static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->regularUpdateSucceeded(
+        static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->regularUpdateSucceeded(
                     fields, timestamp, latitude, longitude, altitude, accuracy);
     }
 }
@@ -87,10 +87,10 @@ static void velocity_changed (GeoclueVelocity *velocity,
     Q_UNUSED(direction)
     Q_UNUSED(climb)
     if (!(fields & GEOCLUE_VELOCITY_FIELDS_SPEED)) {
-        static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->velocityUpdateFailed();
+        static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->velocityUpdateFailed();
         return;
     }
-    static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->velocityUpdateSucceeded(speed);
+    static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->velocityUpdateSucceeded(speed);
 }
 
 // Callback for single async update
@@ -111,10 +111,10 @@ static void position_callback (GeocluePosition      *pos,
         g_error_free (error);
     if (!(fields & GEOCLUE_POSITION_FIELDS_LATITUDE &&
                    fields & GEOCLUE_POSITION_FIELDS_LONGITUDE)) {
-        static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->singleUpdateFailed();
+        static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->singleUpdateFailed();
 
     } else {
-        static_cast<QGeoPositionInfoSourceGeoclueMaster*>(userdata)->singleUpdateSucceeded(
+        static_cast<QGeoPositionInfoSourceGeoclueMaster *>(userdata)->singleUpdateSucceeded(
                     fields, timestamp, latitude, longitude, altitude, accuracy);
     }
 }
@@ -232,8 +232,8 @@ void QGeoPositionInfoSourceGeoclueMaster::regularUpdateSucceeded(GeocluePosition
 bool QGeoPositionInfoSourceGeoclueMaster::tryGPS()
 {
     // Check if the gconf value is set properly
-    GConfClient* client;
-    gchar* device_name;
+    GConfClient *client;
+    gchar *device_name;
     client = gconf_client_get_default();
     device_name = gconf_client_get_string(client, "/apps/geoclue/master/org.freedesktop.Geoclue.GPSDevice", NULL);
     QString deviceName(QString::fromLatin1(device_name));
@@ -465,9 +465,9 @@ void QGeoPositionInfoSourceGeoclueMaster::stopUpdates()
     if (m_updateTimer.isActive())
         m_updateTimer.stop();
     if (m_pos) {
-        g_signal_handlers_disconnect_by_func(G_OBJECT(m_pos), (void*)position_changed, this);
+        g_signal_handlers_disconnect_by_func(G_OBJECT(m_pos), (void *)position_changed, this);
     } if (m_vel) {
-        g_signal_handlers_disconnect_by_func(G_OBJECT(m_vel), (void*)velocity_changed, this);
+        g_signal_handlers_disconnect_by_func(G_OBJECT(m_vel), (void *)velocity_changed, this);
     }
 }
 
@@ -523,7 +523,7 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo(
                                                double                latitude,
                                                double                longitude,
                                                double                altitude,
-                                               GeoclueAccuracy*      accuracy)
+                                               GeoclueAccuracy *     accuracy)
 {
     QGeoCoordinate coordinate(latitude, longitude);
     QDateTime dateTime = QDateTime();
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
index 8946767a..cd4db044 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
@@ -118,14 +118,14 @@ private:
                                            double                latitude,
                                            double                longitude,
                                            double                altitude,
-                                           GeoclueAccuracy*      accuracy);
+                                           GeoclueAccuracy *     accuracy);
 private:
     int m_updateInterval;
     GeoclueResourceFlags m_preferredResources;
     GeoclueAccuracyLevel m_preferredAccuracy;
     GeoclueMasterClient *m_client;
     GeocluePosition *m_pos;
-    GeoclueVelocity* m_vel;
+    GeoclueVelocity *m_vel;
     QTimer m_updateTimer;
     QTimer m_requestTimer;
     bool m_lastPositionIsFresh;
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
index cbfb31ae..4c4606cb 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
@@ -59,10 +59,10 @@ static void satellites_changed (GypsySatellite *satellite,
 #ifdef Q_LOCATION_GYPSY_DEBUG
     qDebug() << "QGeoSatelliteInfoSourceGypsy Gypsy satellites-changed -signal received.";
 #endif
-    ((QGeoSatelliteInfoSourceGypsy*)userdata)->satellitesChanged(satellite, satellites);
+    ((QGeoSatelliteInfoSourceGypsy *)userdata)->satellitesChanged(satellite, satellites);
 }
 
-SatelliteGypsyEngine::SatelliteGypsyEngine(QGeoSatelliteInfoSource* parent) :
+SatelliteGypsyEngine::SatelliteGypsyEngine(QGeoSatelliteInfoSource *parent) :
     m_owner(parent)
 {
 }
@@ -72,7 +72,7 @@ SatelliteGypsyEngine::~SatelliteGypsyEngine()
 
 // Glib symbols
 gulong SatelliteGypsyEngine::eng_g_signal_connect(gpointer instance,
-                                                  const gchar* detailed_signal,
+                                                  const gchar *detailed_signal,
                                                   GCallback c_handler,
                                                   gpointer data)
 {
@@ -90,11 +90,11 @@ void SatelliteGypsyEngine::eng_g_free(gpointer mem)
     return ::g_free(mem);
 }
 // Gypsy symbols
-GypsyControl* SatelliteGypsyEngine::eng_gypsy_control_get_default (void)
+GypsyControl *SatelliteGypsyEngine::eng_gypsy_control_get_default (void)
 {
     return ::gypsy_control_get_default();
 }
-char *SatelliteGypsyEngine::eng_gypsy_control_create (GypsyControl *control, const char*device_name, GError **error)
+char *SatelliteGypsyEngine::eng_gypsy_control_create (GypsyControl *control, const char *device_name, GError **error)
 {
     return ::gypsy_control_create(control, device_name, error);
 }
@@ -133,11 +133,11 @@ void SatelliteGypsyEngine::eng_gypsy_satellite_free_satellite_array (GPtrArray *
     return ::gypsy_satellite_free_satellite_array(satellites);
 }
 // GConf symbols (mockability due to X11 requirement)
-GConfClient* SatelliteGypsyEngine::eng_gconf_client_get_default(void)
+GConfClient *SatelliteGypsyEngine::eng_gconf_client_get_default(void)
 {
     return ::gconf_client_get_default();
 }
-gchar* SatelliteGypsyEngine::eng_gconf_client_get_string(GConfClient* client, const gchar* key, GError** err)
+gchar *SatelliteGypsyEngine::eng_gconf_client_get_string(GConfClient *client, const gchar *key, GError** err)
 {
     return ::gconf_client_get_string(client, key, err);
 }
@@ -158,7 +158,7 @@ void QGeoSatelliteInfoSourceGypsy::createEngine()
 
 QGeoSatelliteInfoSourceGypsy::~QGeoSatelliteInfoSourceGypsy()
 {
-    GError* error = NULL;
+    GError *error = NULL;
     if (m_device) {
         m_engine->eng_gypsy_device_stop (m_device, &error);
         g_object_unref(m_device);
@@ -171,8 +171,8 @@ QGeoSatelliteInfoSourceGypsy::~QGeoSatelliteInfoSourceGypsy()
         delete m_engine;
 }
 
-void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
-                                                     GPtrArray* satellites)
+void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite *satellite,
+                                                     GPtrArray *satellites)
 {
     if (!satellite || !satellites)
         return;
@@ -185,7 +185,7 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
 
     unsigned int i;
     for (i = 0; i < satellites->len; i++) {
-        GypsySatelliteDetails *details = (GypsySatelliteDetails*)satellites->pdata[i];
+        GypsySatelliteDetails *details = (GypsySatelliteDetails *)satellites->pdata[i];
         QGeoSatelliteInfo info;
         info.setAttribute(QGeoSatelliteInfo::Elevation, details->elevation);
         info.setAttribute(QGeoSatelliteInfo::Azimuth, details->azimuth);
@@ -202,7 +202,7 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite* satellite,
         m_requestOngoing = false;
         // If there is no regular updates ongoing, disconnect now.
         if (!m_updatesOngoing) {
-            m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+            m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
         }
     }
     // If regular updates are to be delivered as they come:
@@ -219,8 +219,8 @@ int QGeoSatelliteInfoSourceGypsy::init()
 {
     GError *error = NULL;
     char *path;
-    GConfClient* client;
-    gchar* device_name;
+    GConfClient *client;
+    gchar *device_name;
 
     g_type_init ();
     createEngine();
@@ -306,7 +306,7 @@ void QGeoSatelliteInfoSourceGypsy::stopUpdates()
     // is completed and it notices that there is no active update ongoing, it will disconnect
     // the signal.
     if (!m_requestTimer.isActive())
-        m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+        m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
 }
 
 void QGeoSatelliteInfoSourceGypsy::requestUpdate(int timeout)
@@ -326,7 +326,7 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdate(int timeout)
 #ifdef Q_LOCATION_GYPSY_DEBUG
         qDebug() << "QGeoSatelliteInfoSourceGypsy fix available, requesting current satellite data";
 #endif
-        GPtrArray* satelliteData = m_engine->eng_gypsy_satellite_get_satellites(m_satellite, &error);
+        GPtrArray *satelliteData = m_engine->eng_gypsy_satellite_get_satellites(m_satellite, &error);
         if (!error) {
             // The fix was available and we have satellite data to deliver right away.
             satellitesChanged(m_satellite, satelliteData);
@@ -358,7 +358,7 @@ void QGeoSatelliteInfoSourceGypsy::requestUpdateTimeout()
     // Emit timeout and disconnect from signal if regular updates are not
     // ongoing (as we were listening just for one single requestUpdate).
     if (!m_updatesOngoing) {
-        m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void*)satellites_changed, this);
+        m_engine->eng_g_signal_handlers_disconnect_by_func(G_OBJECT(m_satellite), (void *)satellites_changed, this);
     }
     m_requestOngoing = false;
     emit requestTimeout();
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
index 956836ad..a6079a8e 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
@@ -70,11 +70,11 @@ QT_BEGIN_NAMESPACE
 class SatelliteGypsyEngine
 {
 public:
-    SatelliteGypsyEngine(QGeoSatelliteInfoSource* parent = 0);
+    SatelliteGypsyEngine(QGeoSatelliteInfoSource *parent = 0);
     virtual ~SatelliteGypsyEngine();
     // Glib symbols
     virtual gulong eng_g_signal_connect(gpointer instance,
-                                    const gchar* detailed_signal,
+                                    const gchar *detailed_signal,
                                     GCallback c_handler,
                                     gpointer data);
     virtual guint eng_g_signal_handlers_disconnect_by_func(gpointer instance,
@@ -82,8 +82,8 @@ public:
                                                         gpointer data);
     virtual void eng_g_free(gpointer mem);
     // Gypsy symbols
-    virtual GypsyControl* eng_gypsy_control_get_default (void);
-    virtual char *eng_gypsy_control_create (GypsyControl *control, const char*device_name, GError **error);
+    virtual GypsyControl *eng_gypsy_control_get_default (void);
+    virtual char *eng_gypsy_control_create (GypsyControl *control, const char *device_name, GError **error);
     virtual GypsyDevice *eng_gypsy_device_new (const char *object_path);
     virtual GypsySatellite *eng_gypsy_satellite_new (const char *object_path);
     virtual gboolean eng_gypsy_device_start (GypsyDevice *device, GError **error);
@@ -92,10 +92,10 @@ public:
     virtual GPtrArray *eng_gypsy_satellite_get_satellites (GypsySatellite *satellite, GError **error);
     virtual void eng_gypsy_satellite_free_satellite_array (GPtrArray *satellites);
     // GConf symbols (mockability due to X11 requirement)
-    virtual GConfClient* eng_gconf_client_get_default(void);
-    virtual gchar* eng_gconf_client_get_string(GConfClient* client, const gchar* key, GError** err);
+    virtual GConfClient *eng_gconf_client_get_default(void);
+    virtual gchar *eng_gconf_client_get_string(GConfClient *client, const gchar *key, GError** err);
 protected:
-    QGeoSatelliteInfoSource* m_owner;
+    QGeoSatelliteInfoSource *m_owner;
 };
 
 class QGeoSatelliteInfoSourceGypsy : public QGeoSatelliteInfoSource
@@ -111,7 +111,7 @@ public slots:
       virtual void startUpdates();
       void stopUpdates();
       void requestUpdate(int timeout = 5000);
-      void satellitesChanged(GypsySatellite* satellite, GPtrArray* satellites);
+      void satellitesChanged(GypsySatellite *satellite, GPtrArray *satellites);
 
 signals:
       void satellitesInViewUpdated(const QList<QGeoSatelliteInfo> &satellites);
@@ -124,12 +124,12 @@ protected:
       // Creates an engine which encapsulates all used symbols
       // that we want to be also able to mock.
       virtual void createEngine();
-      SatelliteGypsyEngine* m_engine;
+      SatelliteGypsyEngine *m_engine;
 
 private:
       Q_DISABLE_COPY(QGeoSatelliteInfoSourceGypsy)
-      GypsySatellite* m_satellite;
-      GypsyDevice* m_device;
+      GypsySatellite *m_satellite;
+      GypsyDevice *m_device;
       QTimer m_requestTimer;
       bool m_updatesOngoing;
       bool m_requestOngoing;
diff --git a/src/plugins/position/maemo/dbuscomm_maemo.cpp b/src/plugins/position/maemo/dbuscomm_maemo.cpp
index 0aeb2b50..1a1db1d5 100644
--- a/src/plugins/position/maemo/dbuscomm_maemo.cpp
+++ b/src/plugins/position/maemo/dbuscomm_maemo.cpp
@@ -50,8 +50,8 @@ const QString DBusComm::positioningdService   = QString("com.nokia.positioningd.
 const QString DBusComm::positioningdPath      = QString("/com/nokia/positioningd/client");
 const QString DBusComm::positioningdInterface = QString("com.nokia.positioningd.client");
 
-DBusComm::DBusComm(QObject *parent) : QObject(parent), 
-                                      minimumUpdateInterval(1000), 
+DBusComm::DBusComm(QObject *parent) : QObject(parent),
+                                      minimumUpdateInterval(1000),
                                       availablePositioningMethods(QGeoPositionInfoSource::AllPositioningMethods)
 {
 }
@@ -67,7 +67,7 @@ int DBusComm::init()
     // Application auto-start by dbus may take a while, so try
     // connecting a few times.
 
-    int cnt = 10; 
+    int cnt = 10;
     positioningdProxy = new QDBusInterface(positioningdService,
                                            positioningdPath,
                                            positioningdInterface,
@@ -87,20 +87,20 @@ int DBusComm::init()
         cerr << "DBus connection to positioning daemon failed.\n";
         return -1;
     }
-    serviceDisconnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(), 
+    serviceDisconnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
                                                         QDBusServiceWatcher::WatchForUnregistration, this);
-    
+
     QObject::connect(serviceDisconnectWatcher, SIGNAL(serviceUnregistered ( const QString &)),
                      this,SLOT(onServiceDisconnect(const QString &)));
 
-    serviceConnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(), 
+    serviceConnectWatcher = new QDBusServiceWatcher (positioningdService, QDBusConnection::sessionBus(),
                                                      QDBusServiceWatcher::WatchForRegistration, this);
-    
+
     QObject::connect(serviceConnectWatcher, SIGNAL(serviceRegistered ( const QString &)),
                      this,SLOT(onServiceConnect(const QString &)));
-    
 
-    if (createUniqueName() == false) { // set myService, myPath 
+
+    if (createUniqueName() == false) { // set myService, myPath
         return -1;
     }
 
@@ -194,12 +194,12 @@ int DBusComm::minimumInterval() const
 bool DBusComm::sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method,
                                  int interval) const
 {
-    QDBusReply<int> reply; 
+    QDBusReply<int> reply;
     reply = positioningdProxy->call("configSession", clientId, command, int(method), interval);
-    
+
     //cout << "sessionConfigRequest cmd: cmd:" << command << " method: ";
     //cout << method << " interval: " << interval << "\n";
-    
+
     if (reply.isValid()) {
         int n = reply.value();
     } else {
@@ -213,9 +213,9 @@ bool DBusComm::sendConfigRequest(Command command, QGeoPositionInfoSource::Positi
 }
 
 
-QGeoPositionInfo& DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
+QGeoPositionInfo &DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
 {
-    QDBusReply<QByteArray> reply; 
+    QDBusReply<QByteArray> reply;
     reply = positioningdProxy->call("latestPosition", satelliteMethodOnly);
     static QGeoPositionInfo update;
 
@@ -232,7 +232,7 @@ QGeoPositionInfo& DBusComm::requestLastKnownPosition(bool satelliteMethodOnly)
     }
 
     return update;
-} 
+}
 
 
 bool DBusComm::createUniqueName()
diff --git a/src/plugins/position/maemo/dbuscomm_maemo_p.h b/src/plugins/position/maemo/dbuscomm_maemo_p.h
index ca25d7d9..66a28fc0 100644
--- a/src/plugins/position/maemo/dbuscomm_maemo_p.h
+++ b/src/plugins/position/maemo/dbuscomm_maemo_p.h
@@ -71,16 +71,16 @@ class DBusComm: public QObject, DBusServerIF
 
 
 public:
-    enum Command {CommandStart = 1,      CommandStop = 2,     CommandOneShot = 3, 
-                  CommandSetMethods = 4, CommandSetInterval = 8, 
+    enum Command {CommandStart = 1,      CommandStop = 2,     CommandOneShot = 3,
+                  CommandSetMethods = 4, CommandSetInterval = 8,
                   CommandSatStart = 16,  CommandSatStop = 32, CommandSatOneShot = 48};
 
     DBusComm(QObject *parent = 0);
     int  init();
     bool sendDBusRegister();
-    bool sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method, 
+    bool sendConfigRequest(Command command, QGeoPositionInfoSource::PositioningMethods method,
                            int interval) const;
-    QGeoPositionInfo& requestLastKnownPosition(bool satelliteMethodOnly);
+    QGeoPositionInfo &requestLastKnownPosition(bool satelliteMethodOnly);
     QGeoPositionInfoSource::PositioningMethods availableMethods() const;
     int minimumInterval() const;
 
@@ -104,7 +104,7 @@ private:
     void receiveSettings(QGeoPositionInfoSource::PositioningMethod methods, qint32 interval);
 
     QDBusInterface *positioningdProxy;
-    DBusServer* dbusServer;
+    DBusServer *dbusServer;
     QObject serverObj;
     QString myService;
     QString myPath;
diff --git a/src/plugins/position/maemo/dbusserver_maemo.cpp b/src/plugins/position/maemo/dbusserver_maemo.cpp
index ca73b85e..a7cea4cc 100644
--- a/src/plugins/position/maemo/dbusserver_maemo.cpp
+++ b/src/plugins/position/maemo/dbusserver_maemo.cpp
@@ -43,8 +43,8 @@
 
 QT_BEGIN_NAMESPACE
 
-DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj), 
-                                                            interface(iface) 
+DBusServer::DBusServer(QObject *obj, DBusServerIF *iface) : QDBusAbstractAdaptor(obj),
+                                                            interface(iface)
 {
 }
 
diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
index 0305c69c..ff52688e 100644
--- a/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
+++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo.cpp
@@ -78,9 +78,9 @@ void QGeoPositionInfoSourceMaemo::onServiceDisconnect()
 
 void QGeoPositionInfoSourceMaemo::onServiceConnect()
 {
-    DBusComm::Command command = 
+    DBusComm::Command command =
         (DBusComm::Command)
-        ( DBusComm::CommandSetInterval | 
+        ( DBusComm::CommandSetInterval |
           DBusComm::CommandSetMethods );
 
     int interval = QGeoPositionInfoSource::updateInterval();
@@ -110,7 +110,7 @@ void QGeoPositionInfoSourceMaemo::newPositionUpdate(const QGeoPositionInfo &upda
 
 QGeoPositionInfo QGeoPositionInfoSourceMaemo::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
 {
-    QGeoPositionInfo update = dbusComm->requestLastKnownPosition(fromSatellitePositioningMethodsOnly); 
+    QGeoPositionInfo update = dbusComm->requestLastKnownPosition(fromSatellitePositioningMethodsOnly);
 
     return update;
 }
@@ -163,13 +163,13 @@ void QGeoPositionInfoSourceMaemo::stopUpdates()
 
 void QGeoPositionInfoSourceMaemo::requestUpdate(int timeout)
 {
-    if ( QGeoPositionInfoSource::updateInterval() != 
+    if ( QGeoPositionInfoSource::updateInterval() !=
          dbusComm->minimumInterval() )
-        dbusComm->sendConfigRequest(dbusComm->CommandSetInterval, 0, 
+        dbusComm->sendConfigRequest(dbusComm->CommandSetInterval, 0,
                                     dbusComm->minimumInterval());
 
     if ( !QGeoPositionInfoSource::preferredPositioningMethods().testFlag(QGeoPositionInfoSource::AllPositioningMethods) )
-        dbusComm->sendConfigRequest(dbusComm->CommandSetMethods, 
+        dbusComm->sendConfigRequest(dbusComm->CommandSetMethods,
                                     QGeoPositionInfoSource::AllPositioningMethods, 0);
 
     if ( !locationOngoing )
diff --git a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
index e82ba344..ac495321 100644
--- a/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
+++ b/src/plugins/position/maemo/qgeopositioninfosource_maemo_p.h
@@ -92,10 +92,10 @@ public Q_SLOTS:
     void requestUpdate(int timeout = 5000);
 
 private:
-    DBusComm* dbusComm;
-    QTimer* requestTimer;
+    DBusComm *dbusComm;
+    QTimer *requestTimer;
     bool locationOngoing;
-    
+
     void shutdownRequestSession();
 
 private Q_SLOTS:
diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
index 4922549b..9ff7d486 100644
--- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
+++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo.cpp
@@ -103,7 +103,7 @@ void QGeoSatelliteInfoSourceMaemo::newSatellitesInView(const QList<QGeoSatellite
         requestTimer->stop();
         if ( !running )
             dbusComm->sendConfigRequest(DBusComm::CommandSatStop, 0, 0);
-        else 
+        else
             emit satellitesInViewUpdated(update);
     } else {
         emit satellitesInViewUpdated(update);
diff --git a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
index dfa1494b..eac30d97 100644
--- a/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
+++ b/src/plugins/position/maemo/qgeosatelliteinfosource_maemo_p.h
@@ -84,10 +84,10 @@ private Q_SLOTS:
     void requestTimerExpired();
 
 private:
-    DBusComm* dbusComm;
+    DBusComm *dbusComm;
     bool running;
     bool satInViewSeen;
-    QTimer* requestTimer; 
+    QTimer *requestTimer;
     Q_DISABLE_COPY(QGeoSatelliteInfoSourceMaemo)
 };
 
diff --git a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
index 1ad8905b..4a060fe6 100644
--- a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
+++ b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend.cpp
@@ -65,7 +65,7 @@ bool QGeoPositionInfoSourceNpeBackend::init()
 
 QGeoPositionInfo QGeoPositionInfoSourceNpeBackend::lastKnownPosition(bool fromSatellitePositioningMethodsOnly) const
 {
-    const PositionData& position = m_locationdConn->lastKnownPosition(fromSatellitePositioningMethodsOnly);
+    const PositionData &position = m_locationdConn->lastKnownPosition(fromSatellitePositioningMethodsOnly);
     QGeoCoordinate coordinate;
     QGeoPositionInfo lastPosition;
     coordinate.setLatitude(position.latitude);
@@ -216,7 +216,7 @@ void QGeoPositionInfoSourceNpeBackend::shutdownRequestSession()
 }
 
 
-void QGeoPositionInfoSourceNpeBackend::onPositionUpdate(const PositionData& position)
+void QGeoPositionInfoSourceNpeBackend::onPositionUpdate(const PositionData &position)
 {
     if (position.valid) {
         QGeoPositionInfo update;
diff --git a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
index 0f170c85..6c9c2c7c 100644
--- a/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
+++ b/src/plugins/position/npe_backend/qgeopositioninfosource_npe_backend_p.h
@@ -80,10 +80,10 @@ public Q_SLOTS:
 private:
     void setError(QGeoPositionInfoSource::Error positionError);
     void shutdownRequestSession();
-    LocationDaemonConnection* m_locationdConn;
+    LocationDaemonConnection *m_locationdConn;
     bool trackingOngoing;
     bool timeoutSent;
-    QTimer* requestTimer;
+    QTimer *requestTimer;
     QGeoPositionInfoSource::Error mPositionError;
 
 
diff --git a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
index 055fa229..ad05d161 100644
--- a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
+++ b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend.cpp
@@ -156,7 +156,7 @@ void QGeoSatelliteInfoSourceNpeBackend::shutdownRequestSession()
 }
 
 
-void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteData>& satellites)
+void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteData> &satellites)
 {
     QList<QGeoSatelliteInfo> inUse;
     QList<QGeoSatelliteInfo> inView;
@@ -166,7 +166,7 @@ void QGeoSatelliteInfoSourceNpeBackend::onSatelliteUpdate(const QList<SatelliteD
         while (it.hasNext())
         {
             QGeoSatelliteInfo satinfo;
-            const SatelliteData& satellite = it.next();
+            const SatelliteData &satellite = it.next();
             satinfo.setAttribute(QGeoSatelliteInfo::Elevation, satellite.elevation);
             satinfo.setAttribute(QGeoSatelliteInfo::Azimuth, satellite.azimuth);
             satinfo.setSatelliteIdentifier(satellite.id);
diff --git a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
index 1a8f3568..78a78ef9 100644
--- a/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
+++ b/src/plugins/position/npe_backend/qgeosatelliteinfosource_npe_backend_p.h
@@ -77,14 +77,14 @@ public Q_SLOTS:
 private:
     void setError(QGeoSatelliteInfoSource::Error satelliteError);
     void shutdownRequestSession();
-    LocationDaemonConnection* m_locationdConn;
+    LocationDaemonConnection *m_locationdConn;
     bool satOngoing;
-    QTimer* requestTimer;
+    QTimer *requestTimer;
     QGeoSatelliteInfoSource::Error mSatelliteError;
 
 
 private Q_SLOTS:
-    void onSatelliteUpdate(const QList<SatelliteData>& satellites);
+    void onSatelliteUpdate(const QList<SatelliteData> &satellites);
     void onConnectionError(LocationDaemonConnection::SocketError socketError);
     void requestTimerExpired();
 };