Coding style fixes, round #1

In this patch:
    * Assignment operators that don't check for self-assignment
    * Using const references where possible in function arguments
    * Using const refs in the iterator var of a foreach() loop
    * Add 'explicit' to constructors taking one parameter

Change-Id: I640fd85c3312851f0d8c10193333efec41232e05
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

82 files changed, 175 insertions, 89 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
index 3e77a9fc..8042d82d 100644
--- a/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativebusinessfeature_p.h
@@ -53,9 +53,9 @@ class QDeclarativeBusinessFeature : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString key READ key WRITE setKey NOTIFY keyChanged);
-    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged);
-    Q_PROPERTY(QString value READ value WRITE setValue NOTIFY valueChanged);
+    Q_PROPERTY(QString key READ key WRITE setKey NOTIFY keyChanged)
+    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
+    Q_PROPERTY(QString value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
     explicit QDeclarativeBusinessFeature(QObject* parent = 0);
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index da47650e..391ce9c1 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -982,7 +982,7 @@ void QDeclarativePlace::synchronizeCategories()
 {
     qDeleteAll(m_categories);
     m_categories.clear();
-    foreach (QPlaceCategory value, m_src.categories()) {
+    foreach (const QPlaceCategory &value, m_src.categories()) {
         QDeclarativeCategory* declarativeValue = new QDeclarativeCategory(value, m_plugin, this);
         m_categories.append(declarativeValue);
     }
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
index 2e86e238..b5aa8227 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
@@ -73,12 +73,12 @@ class QDeclarativePlace : public QObject, public QQmlParserStatus
     Q_PROPERTY(QPlace place READ place WRITE setPlace)
     Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativeCategory> categories READ categories NOTIFY categoriesChanged)
-    Q_PROPERTY(QDeclarativeGeoLocation* location READ location WRITE setLocation NOTIFY locationChanged);
-    Q_PROPERTY(QDeclarativeRatings* ratings READ ratings WRITE setRatings NOTIFY ratingsChanged);
+    Q_PROPERTY(QDeclarativeGeoLocation* location READ location WRITE setLocation NOTIFY locationChanged)
+    Q_PROPERTY(QDeclarativeRatings* ratings READ ratings WRITE setRatings NOTIFY ratingsChanged)
     Q_PROPERTY(QDeclarativeSupplier *supplier READ supplier WRITE setSupplier NOTIFY supplierChanged)
     Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged)
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged);
-    Q_PROPERTY(QString placeId READ placeId WRITE setPlaceId NOTIFY placeIdChanged);
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString placeId READ placeId WRITE setPlaceId NOTIFY placeIdChanged)
     Q_PROPERTY(QString attribution READ attribution WRITE setAttribution NOTIFY attributionChanged)
 
     Q_PROPERTY(QDeclarativeReviewModel *reviewModel READ reviewModel NOTIFY reviewModelChanged)
@@ -88,12 +88,12 @@ class QDeclarativePlace : public QObject, public QQmlParserStatus
     Q_PROPERTY(QObject *extendedAttributes READ extendedAttributes NOTIFY extendedAttributesChanged)
     Q_PROPERTY(QObject *contactDetails READ contactDetails NOTIFY contactDetailsChanged)
     Q_PROPERTY(bool detailsFetched READ detailsFetched NOTIFY detailsFetchedChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged);
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
-    Q_PROPERTY(QString primaryPhone READ primaryPhone NOTIFY primaryPhoneChanged);
-    Q_PROPERTY(QString primaryFax READ primaryFax NOTIFY primaryFaxChanged);
-    Q_PROPERTY(QString primaryEmail READ primaryEmail NOTIFY primaryEmailChanged);
-    Q_PROPERTY(QUrl primaryWebsite READ primaryWebsite NOTIFY primaryWebsiteChanged);
+    Q_PROPERTY(QString primaryPhone READ primaryPhone NOTIFY primaryPhoneChanged)
+    Q_PROPERTY(QString primaryFax READ primaryFax NOTIFY primaryFaxChanged)
+    Q_PROPERTY(QString primaryEmail READ primaryEmail NOTIFY primaryEmailChanged)
+    Q_PROPERTY(QUrl primaryWebsite READ primaryWebsite NOTIFY primaryWebsiteChanged)
 
     Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
     Q_PROPERTY(QDeclarativePlace *favorite READ favorite WRITE setFavorite NOTIFY favoriteChanged)
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
index 5448dc3a..ba93c5e1 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h
@@ -57,8 +57,8 @@ class QDeclarativeSupplier : public QObject, public QQmlParserStatus
     Q_OBJECT
 
     Q_PROPERTY(QPlaceSupplier supplier READ supplier WRITE setSupplier)
-    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged);
-    Q_PROPERTY(QString supplierId READ supplierId WRITE setSupplierId NOTIFY supplierIdChanged);
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString supplierId READ supplierId WRITE setSupplierId NOTIFY supplierIdChanged)
     Q_PROPERTY(QUrl url READ url WRITE setUrl NOTIFY urlChanged)
     Q_PROPERTY(QDeclarativePlaceIcon* icon READ icon WRITE setIcon NOTIFY iconChanged)
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
index a08b977a..03cab768 100644
--- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h
@@ -76,7 +76,7 @@ class QDeclarativeSupportedCategoriesModel : public QAbstractItemModel, public Q
 
     Q_PROPERTY(QDeclarativeGeoServiceProvider *plugin READ plugin WRITE setPlugin NOTIFY pluginChanged)
     Q_PROPERTY(bool hierarchical READ hierarchical WRITE setHierarchical NOTIFY hierarchicalChanged)
-    Q_PROPERTY(Status status READ status NOTIFY statusChanged);
+    Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 
     Q_INTERFACES(QQmlParserStatus)
     Q_ENUMS(Roles) //The Roles enum is for internal usage only.
diff --git a/src/imports/location/mapnode_p.h b/src/imports/location/mapnode_p.h
index b26561bc..bf89d79c 100644
--- a/src/imports/location/mapnode_p.h
+++ b/src/imports/location/mapnode_p.h
@@ -67,7 +67,7 @@ class QSGPlainTexture;
 class MapNode : public QSGGeometryNode
 {
 public:
-    MapNode(QGeoMap *m_map);
+    explicit MapNode(QGeoMap *m_map);
     ~MapNode();
 
     void setSize(const QSize &size);
diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp
index 9ece1637..f50beab5 100644
--- a/src/imports/location/qdeclarativecirclemapitem.cpp
+++ b/src/imports/location/qdeclarativecirclemapitem.cpp
@@ -426,7 +426,7 @@ void QDeclarativeCircleMapItem::dragEnded()
 /*!
     \internal
 */
-bool QDeclarativeCircleMapItem::contains(QPointF point)
+bool QDeclarativeCircleMapItem::contains(const QPointF &point)
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h
index dd1db77d..07bd2ad8 100644
--- a/src/imports/location/qdeclarativecirclemapitem_p.h
+++ b/src/imports/location/qdeclarativecirclemapitem_p.h
@@ -61,7 +61,7 @@ class QDeclarativeCircleMapItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT)
 
 public:
-    QDeclarativeCircleMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativeCircleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeCircleMapItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
@@ -79,7 +79,7 @@ public:
     QDeclarativeMapLineProperties *border();
 
     void dragEnded();
-    bool contains(QPointF point);
+    bool contains(const QPointF &point);
 
 Q_SIGNALS:
     void centerChanged(const QDeclarativeCoordinate *center);
diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/location/qdeclarativecoordinate_p.h
index 7d0946d7..f7860d68 100644
--- a/src/imports/location/qdeclarativecoordinate_p.h
+++ b/src/imports/location/qdeclarativecoordinate_p.h
@@ -60,7 +60,7 @@ class QDeclarativeCoordinate : public QObject
     Q_PROPERTY(bool isValid READ isValid NOTIFY validityChanged)
 
 public:
-    QDeclarativeCoordinate(QObject* parent = 0);
+    explicit QDeclarativeCoordinate(QObject* parent = 0);
     QDeclarativeCoordinate(const QGeoCoordinate &coordinate, QObject* parent = 0);
     ~QDeclarativeCoordinate();
 
diff --git a/src/imports/location/qdeclarativegeoboundingarea_p.h b/src/imports/location/qdeclarativegeoboundingarea_p.h
index aa8e8eae..2ea9bdd6 100644
--- a/src/imports/location/qdeclarativegeoboundingarea_p.h
+++ b/src/imports/location/qdeclarativegeoboundingarea_p.h
@@ -55,7 +55,7 @@ class QDeclarativeGeoBoundingArea : public QObject
     Q_OBJECT
 
 public:
-    QDeclarativeGeoBoundingArea(QObject *parent) :QObject(parent){}
+    explicit QDeclarativeGeoBoundingArea(QObject *parent) :QObject(parent){}
     virtual QGeoBoundingArea area() const = 0;
 };
 
diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/imports/location/qdeclarativegeolocation_p.h
index c1648ee7..9225ec29 100644
--- a/src/imports/location/qdeclarativegeolocation_p.h
+++ b/src/imports/location/qdeclarativegeolocation_p.h
@@ -56,8 +56,8 @@ class QDeclarativeGeoLocation : public QObject
     Q_OBJECT
 
     Q_PROPERTY(QGeoLocation location READ location WRITE setLocation)
-    Q_PROPERTY(QDeclarativeGeoAddress* address READ address WRITE setAddress NOTIFY addressChanged);
-    Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged);
+    Q_PROPERTY(QDeclarativeGeoAddress* address READ address WRITE setAddress NOTIFY addressChanged)
+    Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate WRITE setCoordinate NOTIFY coordinateChanged)
     Q_PROPERTY(QDeclarativeGeoBoundingBox *boundingBox READ boundingBox WRITE setBoundingBox NOTIFY boundingBoxChanged)
 
 public:
diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h
index 4d6ed3bb..fe952d2a 100644
--- a/src/imports/location/qdeclarativegeomaneuver_p.h
+++ b/src/imports/location/qdeclarativegeomaneuver_p.h
@@ -80,7 +80,7 @@ public:
         DirectionBearLeft = QGeoManeuver::DirectionBearLeft
     };
 
-    QDeclarativeGeoManeuver(QObject *parent = 0);
+    explicit QDeclarativeGeoManeuver(QObject *parent = 0);
     QDeclarativeGeoManeuver(const QGeoManeuver &maneuver, QObject *parent = 0);
     ~QDeclarativeGeoManeuver();
 
diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp
index 02468421..c88def75 100644
--- a/src/imports/location/qdeclarativegeomap.cpp
+++ b/src/imports/location/qdeclarativegeomap.cpp
@@ -928,7 +928,7 @@ QQmlListProperty<QDeclarativeGeoMapType> QDeclarativeGeoMap::supportedMapTypes()
     the current viewport.
 */
 
-QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(QPointF screenPosition) const
+QDeclarativeCoordinate* QDeclarativeGeoMap::toCoordinate(const QPointF &screenPosition) const
 {
     QGeoCoordinate coordinate;
     if (map_)
diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h
index b95b3dc3..d7254302 100644
--- a/src/imports/location/qdeclarativegeomap_p.h
+++ b/src/imports/location/qdeclarativegeomap_p.h
@@ -119,7 +119,7 @@ class QDeclarativeGeoMap : public QQuickItem
 
 public:
 
-    QDeclarativeGeoMap(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMap(QQuickItem *parent = 0);
     ~QDeclarativeGeoMap();
 
     // From QQmlParserStatus
@@ -161,7 +161,7 @@ public:
     Q_INVOKABLE void clearMapItems();
     QList<QObject*> mapItems();
 
-    Q_INVOKABLE QDeclarativeCoordinate* toCoordinate(QPointF screenPosition) const;
+    Q_INVOKABLE QDeclarativeCoordinate* toCoordinate(const QPointF &screenPosition) const;
     Q_INVOKABLE QPointF toScreenPosition(QDeclarativeCoordinate* coordinate) const;
 
     // callback for map mouse areas
diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h
index bafc1c63..1b430afa 100644
--- a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h
+++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h
@@ -51,7 +51,7 @@ class QDeclarativeGeoMapCopyrightNotice : public QQuickPaintedItem
 {
     Q_OBJECT
 public:
-    QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent);
+    explicit QDeclarativeGeoMapCopyrightNotice(QQuickItem *parent);
     ~QDeclarativeGeoMapCopyrightNotice();
 
     void setCopyrightsZ(int copyrightsZ);
diff --git a/src/imports/location/qdeclarativegeomapgesturearea_p.h b/src/imports/location/qdeclarativegeomapgesturearea_p.h
index bc394730..a6c6e22f 100644
--- a/src/imports/location/qdeclarativegeomapgesturearea_p.h
+++ b/src/imports/location/qdeclarativegeomapgesturearea_p.h
@@ -71,8 +71,8 @@ class QDeclarativeGeoMapPinchEvent : public QObject
     Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
 
 public:
-    QDeclarativeGeoMapPinchEvent(QPointF center, qreal angle,
-                                 QPointF point1, QPointF point2,
+    QDeclarativeGeoMapPinchEvent(const QPointF &center, qreal angle,
+                                 const QPointF &point1, const QPointF &point2,
                                  int pointCount = 0, bool accepted = true)
         : QObject(), center_(center), angle_(angle),
           point1_(point1), point2_(point2),
@@ -84,13 +84,13 @@ public:
           accepted_(true) {}
 
     QPointF center() const { return center_; }
-    void setCenter(QPointF center) { center_ = center; }
+    void setCenter(const QPointF &center) { center_ = center; }
     qreal angle() const { return angle_; }
     void setAngle(qreal angle) { angle_ = angle; }
     QPointF point1() const { return point1_; }
-    void setPoint1(QPointF p) { point1_ = p; }
+    void setPoint1(const QPointF &p) { point1_ = p; }
     QPointF point2() const { return point2_; }
-    void setPoint2(QPointF p) { point2_ = p; }
+    void setPoint2(const QPointF &p) { point2_ = p; }
     int pointCount() const { return pointCount_; }
     void setPointCount(int count) { pointCount_ = count; }
     bool accepted() const { return accepted_; }
@@ -146,7 +146,7 @@ public:
         PanGesture = 0x0008,
         FlickGesture = 0x0010
     };
-    Q_DECLARE_FLAGS(ActiveGestures, ActiveGesture);
+    Q_DECLARE_FLAGS(ActiveGestures, ActiveGesture)
 
     ActiveGestures activeGestures() const;
     void setActiveGestures(ActiveGestures activeGestures);
diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp
index 6b98948d..5111acf2 100644
--- a/src/imports/location/qdeclarativegeomapitembase.cpp
+++ b/src/imports/location/qdeclarativegeomapitembase.cpp
@@ -121,7 +121,7 @@ void QDeclarativeGeoMapItemBase::afterChildrenChanged()
 /*!
     \internal
 */
-bool QDeclarativeGeoMapItemBase::contains(QPointF point)
+bool QDeclarativeGeoMapItemBase::contains(const QPointF &point)
 {
     Q_UNUSED(point);
     return true;
diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h
index 26d97ef3..4a71669c 100644
--- a/src/imports/location/qdeclarativegeomapitembase_p.h
+++ b/src/imports/location/qdeclarativegeomapitembase_p.h
@@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE
 class QGeoMapViewportChangeEvent
 {
 public:
-    QGeoMapViewportChangeEvent();
+    explicit QGeoMapViewportChangeEvent();
     QGeoMapViewportChangeEvent(const QGeoMapViewportChangeEvent &other);
     QGeoMapViewportChangeEvent &operator=(const QGeoMapViewportChangeEvent &other);
 
@@ -71,12 +71,12 @@ class QDeclarativeGeoMapItemBase : public QQuickItem
 {
     Q_OBJECT
 public:
-    QDeclarativeGeoMapItemBase(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapItemBase(QQuickItem *parent = 0);
     virtual ~QDeclarativeGeoMapItemBase();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
     virtual void setPositionOnMap(const QGeoCoordinate& coordinate, const QPointF& offset);
-    virtual bool contains(QPointF point);
+    virtual bool contains(const QPointF &point);
     virtual void dragStarted();
     virtual void dragEnded();
 
diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/imports/location/qdeclarativegeomapitemview_p.h
index 14b764a9..deed4f60 100644
--- a/src/imports/location/qdeclarativegeomapitemview_p.h
+++ b/src/imports/location/qdeclarativegeomapitemview_p.h
@@ -67,7 +67,7 @@ class QDeclarativeGeoMapItemView : public QObject, public QQmlParserStatus
     Q_PROPERTY(qreal z READ zValue WRITE setZValue NOTIFY zChanged)
 
 public:
-    QDeclarativeGeoMapItemView(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapItemView(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapItemView();
 
     QVariant model() const;
diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h
index bb28d3db..5d0c4d75 100644
--- a/src/imports/location/qdeclarativegeomapmousearea_p.h
+++ b/src/imports/location/qdeclarativegeomapmousearea_p.h
@@ -56,7 +56,7 @@ class QDeclarativeGeoMapMouseArea : public QQuickMouseArea
     Q_OBJECT
 
 public:
-    QDeclarativeGeoMapMouseArea(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapMouseArea(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapMouseArea();
 
     Q_INVOKABLE QDeclarativeCoordinate* mouseToCoordinate(QQuickMouseEvent* event);
diff --git a/src/imports/location/qdeclarativegeomapmouseevent.cpp b/src/imports/location/qdeclarativegeomapmouseevent.cpp
index c97b0b1e..2f39c992 100644
--- a/src/imports/location/qdeclarativegeomapmouseevent.cpp
+++ b/src/imports/location/qdeclarativegeomapmouseevent.cpp
@@ -234,7 +234,7 @@ int QDeclarativeGeoMapMouseEvent::y() const
     occurred.
 */
 
-void QDeclarativeGeoMapMouseEvent::setCoordinate(QGeoCoordinate coordinate)
+void QDeclarativeGeoMapMouseEvent::setCoordinate(const QGeoCoordinate &coordinate)
 {
     coordinate_.setCoordinate(coordinate);
 }
diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h
index 77737de8..7d1f90ca 100644
--- a/src/imports/location/qdeclarativegeomapmouseevent_p.h
+++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h
@@ -62,7 +62,7 @@ class QDeclarativeGeoMapMouseEvent : public QObject
     Q_PROPERTY(QDeclarativeCoordinate* coordinate READ coordinate)
 
 public:
-    QDeclarativeGeoMapMouseEvent(QObject *parent = 0);
+    explicit QDeclarativeGeoMapMouseEvent(QObject *parent = 0);
     ~QDeclarativeGeoMapMouseEvent();
 
     void setAccepted(bool accepted);
@@ -86,7 +86,7 @@ public:
     void setY(int y);
     int y() const;
 
-    void setCoordinate(QGeoCoordinate coordinate);
+    void setCoordinate(const QGeoCoordinate &coordinate);
     QDeclarativeCoordinate* coordinate();
 
 private:
diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h
index 309e735c..8c3de3f3 100644
--- a/src/imports/location/qdeclarativegeomappincharea_p.h
+++ b/src/imports/location/qdeclarativegeomappincharea_p.h
@@ -82,7 +82,7 @@ public:
         RotationGesture = 0x0002,
         TiltGesture = 0x0004
     };
-    Q_DECLARE_FLAGS(ActiveGestures, ActiveGesture);
+    Q_DECLARE_FLAGS(ActiveGestures, ActiveGesture)
     ActiveGestures activeGestures()
     {
         QDeclarativeGeoMapGestureArea::ActiveGestures gestures = gestureArea_->activeGestures();
diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h
index 9b18a6ce..e38dcb90 100644
--- a/src/imports/location/qdeclarativegeomapquickitem_p.h
+++ b/src/imports/location/qdeclarativegeomapquickitem_p.h
@@ -60,7 +60,7 @@ class QDeclarativeGeoMapQuickItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QQuickItem* sourceItem READ sourceItem WRITE setSourceItem NOTIFY sourceItemChanged)
 
 public:
-    QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
+    explicit QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0);
     ~QDeclarativeGeoMapQuickItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h
index 64ef1945..d056e776 100644
--- a/src/imports/location/qdeclarativegeoroute_p.h
+++ b/src/imports/location/qdeclarativegeoroute_p.h
@@ -63,7 +63,7 @@ class QDeclarativeGeoRoute : public QObject
     Q_PROPERTY(QQmlListProperty<QDeclarativeGeoRouteSegment> segments READ segments CONSTANT)
 
 public:
-    QDeclarativeGeoRoute(QObject *parent = 0);
+    explicit QDeclarativeGeoRoute(QObject *parent = 0);
     QDeclarativeGeoRoute(const QGeoRoute &route, QObject *parent = 0);
     ~QDeclarativeGeoRoute();
 
diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h
index 45daa391..ec8c19e9 100644
--- a/src/imports/location/qdeclarativegeoroutemodel_p.h
+++ b/src/imports/location/qdeclarativegeoroutemodel_p.h
@@ -99,7 +99,7 @@ public:
         UnknownError = QGeoRouteReply::UnknownError
     };
 
-    QDeclarativeGeoRouteModel(QObject *parent = 0);
+    explicit QDeclarativeGeoRouteModel(QObject *parent = 0);
     ~QDeclarativeGeoRouteModel();
 
     // From QQmlParserStatus
@@ -194,7 +194,7 @@ class QDeclarativeGeoRouteQuery : public QObject, public QQmlParserStatus
 
 public:
 
-    QDeclarativeGeoRouteQuery(QObject *parent = 0);
+    explicit QDeclarativeGeoRouteQuery(QObject *parent = 0);
     ~QDeclarativeGeoRouteQuery();
 
     // From QQmlParserStatus
diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h
index 5fb346b5..5dce70f7 100644
--- a/src/imports/location/qdeclarativegeoroutesegment_p.h
+++ b/src/imports/location/qdeclarativegeoroutesegment_p.h
@@ -59,7 +59,7 @@ class QDeclarativeGeoRouteSegment : public QObject
     Q_PROPERTY(QDeclarativeGeoManeuver* maneuver READ maneuver CONSTANT)
 
 public:
-    QDeclarativeGeoRouteSegment(QObject *parent = 0);
+    explicit QDeclarativeGeoRouteSegment(QObject *parent = 0);
     QDeclarativeGeoRouteSegment(const QGeoRouteSegment &segment, QObject *parent = 0);
     ~QDeclarativeGeoRouteSegment();
 
diff --git a/src/imports/location/qdeclarativegeoserviceprovider.cpp b/src/imports/location/qdeclarativegeoserviceprovider.cpp
index e38fd748..3f76a90c 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider.cpp
+++ b/src/imports/location/qdeclarativegeoserviceprovider.cpp
@@ -172,7 +172,7 @@ void QDeclarativeGeoServiceProvider::componentComplete()
         QStringList providers = QGeoServiceProvider::availableServiceProviders();
 
         /* first check any preferred plugins */
-        foreach (QString name, prefer_) {
+        foreach (const QString &name, prefer_) {
             if (providers.contains(name)) {
                 // so we don't try it again later
                 providers.removeAll(name);
@@ -186,7 +186,7 @@ void QDeclarativeGeoServiceProvider::componentComplete()
         }
 
         /* then try the rest */
-        foreach (QString name, providers) {
+        foreach (const QString &name, providers) {
             QGeoServiceProvider sp(name, parameterMap(), experimental_);
             if (required_->matches(&sp)) {
                 setName(name);
diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h
index 0f2cf478..b82e3e8e 100644
--- a/src/imports/location/qdeclarativegeoserviceprovider_p.h
+++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h
@@ -62,7 +62,7 @@ class QDeclarativeGeoServiceProviderParameter : public QObject
     Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged)
 
 public:
-    QDeclarativeGeoServiceProviderParameter(QObject *parent = 0);
+    explicit QDeclarativeGeoServiceProviderParameter(QObject *parent = 0);
     ~QDeclarativeGeoServiceProviderParameter();
 
     void setName(const QString &name);
@@ -103,7 +103,7 @@ class QDeclarativeGeoServiceProvider : public QObject, public QQmlParserStatus
     Q_INTERFACES(QQmlParserStatus)
 
 public:
-    QDeclarativeGeoServiceProvider(QObject *parent = 0);
+    explicit QDeclarativeGeoServiceProvider(QObject *parent = 0);
     ~QDeclarativeGeoServiceProvider();
 
     enum RoutingFeature {
@@ -236,7 +236,7 @@ class QDeclarativeGeoServiceProviderRequirements : public QObject
                NOTIFY placesRequirementsChanged)
 
 public:
-    QDeclarativeGeoServiceProviderRequirements(QObject *parent = 0);
+    explicit QDeclarativeGeoServiceProviderRequirements(QObject *parent = 0);
     ~QDeclarativeGeoServiceProviderRequirements();
 
     QDeclarativeGeoServiceProvider::MappingFeatures mappingRequirements() const;
diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp
index d12b388e..74291f37 100644
--- a/src/imports/location/qdeclarativepolygonmapitem.cpp
+++ b/src/imports/location/qdeclarativepolygonmapitem.cpp
@@ -527,7 +527,7 @@ void QDeclarativePolygonMapItem::afterViewportChanged(const QGeoMapViewportChang
 /*!
     \internal
 */
-bool QDeclarativePolygonMapItem::contains(QPointF point)
+bool QDeclarativePolygonMapItem::contains(const QPointF &point)
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h
index 26741eb4..0f06287f 100644
--- a/src/imports/location/qdeclarativepolygonmapitem_p.h
+++ b/src/imports/location/qdeclarativepolygonmapitem_p.h
@@ -77,7 +77,7 @@ class QDeclarativePolygonMapItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeMapLineProperties *border READ border CONSTANT)
 
 public:
-    QDeclarativePolygonMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativePolygonMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolygonMapItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
@@ -94,7 +94,7 @@ public:
 
     QDeclarativeMapLineProperties *border();
 
-    bool contains(QPointF point);
+    bool contains(const QPointF &point);
     void dragEnded();
 
 Q_SIGNALS:
diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp
index 100747a3..4375b84a 100644
--- a/src/imports/location/qdeclarativepolylinemapitem.cpp
+++ b/src/imports/location/qdeclarativepolylinemapitem.cpp
@@ -672,7 +672,7 @@ QSGNode* QDeclarativePolylineMapItem::updateMapItemPaintNode(QSGNode* oldNode, U
     return node;
 }
 
-bool QDeclarativePolylineMapItem::contains(QPointF point)
+bool QDeclarativePolylineMapItem::contains(const QPointF &point)
 {
     return geometry_.contains(point);
 }
diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h
index f12141a9..64e81829 100644
--- a/src/imports/location/qdeclarativepolylinemapitem_p.h
+++ b/src/imports/location/qdeclarativepolylinemapitem_p.h
@@ -102,7 +102,7 @@ class QDeclarativePolylineMapItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT)
 
 public:
-    QDeclarativePolylineMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativePolylineMapItem(QQuickItem *parent = 0);
     ~QDeclarativePolylineMapItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
@@ -114,7 +114,7 @@ public:
 
     QQmlListProperty<QDeclarativeCoordinate> declarativePath();
 
-    bool contains(QPointF point);
+    bool contains(const QPointF &point);
 
     QDeclarativeMapLineProperties *line();
 
diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/location/qdeclarativeposition.cpp
index f41b80ff..f241e1c0 100644
--- a/src/imports/location/qdeclarativeposition.cpp
+++ b/src/imports/location/qdeclarativeposition.cpp
@@ -110,7 +110,7 @@ QDeclarativePosition::~QDeclarativePosition()
 
 */
 
-void QDeclarativePosition::setCoordinate(QGeoCoordinate coordinate)
+void QDeclarativePosition::setCoordinate(const QGeoCoordinate &coordinate)
 {
     m_coordinate.setCoordinate(coordinate);
 
diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/location/qdeclarativeposition_p.h
index dc90f8fc..2b22945b 100644
--- a/src/imports/location/qdeclarativeposition_p.h
+++ b/src/imports/location/qdeclarativeposition_p.h
@@ -75,7 +75,7 @@ class QDeclarativePosition : public QObject
 
 public:
 
-    QDeclarativePosition(QObject* parent = 0);
+    explicit QDeclarativePosition(QObject* parent = 0);
     ~QDeclarativePosition();
 
     bool isLatitudeValid() const;
@@ -96,7 +96,7 @@ public:
     void setVerticalAccuracy(qreal verticalAccuracy);
 
     // C++
-    void setCoordinate(QGeoCoordinate coordinate);
+    void setCoordinate(const QGeoCoordinate &coordinate);
     void invalidate();
 
 Q_SIGNALS:
diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp
index bbcc1cfa..bcbc3c67 100644
--- a/src/imports/location/qdeclarativerectanglemapitem.cpp
+++ b/src/imports/location/qdeclarativerectanglemapitem.cpp
@@ -399,7 +399,7 @@ void QDeclarativeRectangleMapItem::afterViewportChanged(const QGeoMapViewportCha
 /*!
     \internal
 */
-bool QDeclarativeRectangleMapItem::contains(QPointF point)
+bool QDeclarativeRectangleMapItem::contains(const QPointF &point)
 {
     return (geometry_.contains(point) || borderGeometry_.contains(point));
 }
diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h
index 82bba617..a5b74fb6 100644
--- a/src/imports/location/qdeclarativerectanglemapitem_p.h
+++ b/src/imports/location/qdeclarativerectanglemapitem_p.h
@@ -74,7 +74,7 @@ class QDeclarativeRectangleMapItem: public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeMapLineProperties *border READ border)
 
 public:
-    QDeclarativeRectangleMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativeRectangleMapItem(QQuickItem *parent = 0);
     ~QDeclarativeRectangleMapItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
@@ -93,7 +93,7 @@ public:
     QDeclarativeMapLineProperties *border();
 
     void dragEnded();
-    bool contains(QPointF point);
+    bool contains(const QPointF &point);
 
 Q_SIGNALS:
     void topLeftChanged(const QDeclarativeCoordinate *topLeft);
diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp
index b413f81e..ae76b78f 100644
--- a/src/imports/location/qdeclarativeroutemapitem.cpp
+++ b/src/imports/location/qdeclarativeroutemapitem.cpp
@@ -234,7 +234,7 @@ void QDeclarativeRouteMapItem::afterViewportChanged(const QGeoMapViewportChangeE
 /*!
     \internal
 */
-bool QDeclarativeRouteMapItem::contains(QPointF point)
+bool QDeclarativeRouteMapItem::contains(const QPointF &point)
 {
     return geometry_.contains(point);
 }
diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h
index 07b9148f..e5d587f6 100644
--- a/src/imports/location/qdeclarativeroutemapitem_p.h
+++ b/src/imports/location/qdeclarativeroutemapitem_p.h
@@ -61,7 +61,7 @@ class QDeclarativeRouteMapItem : public QDeclarativeGeoMapItemBase
     Q_PROPERTY(QDeclarativeMapLineProperties *line READ line CONSTANT)
 
 public:
-    QDeclarativeRouteMapItem(QQuickItem *parent = 0);
+    explicit QDeclarativeRouteMapItem(QQuickItem *parent = 0);
     ~QDeclarativeRouteMapItem();
 
     virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map);
@@ -73,7 +73,7 @@ public:
 
     QDeclarativeMapLineProperties *line();
 
-    bool contains(QPointF point);
+    bool contains(const QPointF &point);
 
 Q_SIGNALS:
     void routeChanged(const QDeclarativeGeoRoute *route);
diff --git a/src/imports/location/qgeomapitemgeometry.cpp b/src/imports/location/qgeomapitemgeometry.cpp
index 90bd7bf4..5f962393 100644
--- a/src/imports/location/qgeomapitemgeometry.cpp
+++ b/src/imports/location/qgeomapitemgeometry.cpp
@@ -96,7 +96,7 @@ void QGeoMapItemGeometry::allocateAndFill(QSGGeometry *geom) const
 /*!
     \internal
 */
-QRectF QGeoMapItemGeometry::translateToCommonOrigin(QList<QGeoMapItemGeometry *> geoms)
+QRectF QGeoMapItemGeometry::translateToCommonOrigin(const QList<QGeoMapItemGeometry *> &geoms)
 {
     QGeoCoordinate origin = geoms.at(0)->origin();
 
diff --git a/src/imports/location/qgeomapitemgeometry_p.h b/src/imports/location/qgeomapitemgeometry_p.h
index 169a2929..9e25982b 100644
--- a/src/imports/location/qgeomapitemgeometry_p.h
+++ b/src/imports/location/qgeomapitemgeometry_p.h
@@ -111,7 +111,7 @@ public:
 
     void allocateAndFill(QSGGeometry *geom) const;
 
-    static QRectF translateToCommonOrigin(QList<QGeoMapItemGeometry*> geoms);
+    static QRectF translateToCommonOrigin(const QList<QGeoMapItemGeometry*> &geoms);
 
 protected:
     bool sourceDirty_, screenDirty_;
diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp
index 3752affd..ab938abb 100644
--- a/src/location/maps/qgeocameracapabilities.cpp
+++ b/src/location/maps/qgeocameracapabilities.cpp
@@ -146,6 +146,9 @@ QGeoCameraCapabilities::~QGeoCameraCapabilities() {}
 */
 QGeoCameraCapabilities& QGeoCameraCapabilities::operator = (const QGeoCameraCapabilities &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/maps/qgeocameradata.cpp b/src/location/maps/qgeocameradata.cpp
index 9c5b9839..f9d2d4bf 100644
--- a/src/location/maps/qgeocameradata.cpp
+++ b/src/location/maps/qgeocameradata.cpp
@@ -158,6 +158,9 @@ QGeoCameraData::~QGeoCameraData()
 
 QGeoCameraData& QGeoCameraData::operator = (const QGeoCameraData &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp
index 50b5e56c..4a63d8b4 100644
--- a/src/location/maps/qgeomaneuver.cpp
+++ b/src/location/maps/qgeomaneuver.cpp
@@ -139,6 +139,9 @@ QGeoManeuver::~QGeoManeuver() {}
 */
 QGeoManeuver& QGeoManeuver::operator= (const QGeoManeuver & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/maps/qgeomappingmanagerengine.h b/src/location/maps/qgeomappingmanagerengine.h
index 9812c4c8..7c676e1f 100644
--- a/src/location/maps/qgeomappingmanagerengine.h
+++ b/src/location/maps/qgeomappingmanagerengine.h
@@ -75,7 +75,7 @@ class Q_LOCATION_EXPORT QGeoMappingManagerEngine : public QObject
     Q_OBJECT
 
 public:
-    QGeoMappingManagerEngine(QObject *parent = 0);
+    explicit QGeoMappingManagerEngine(QObject *parent = 0);
     virtual ~QGeoMappingManagerEngine();
 
     virtual QGeoMapData* createMapData() = 0;
diff --git a/src/location/maps/qgeomapscene.cpp b/src/location/maps/qgeomapscene.cpp
index c8fb3375..665ed789 100644
--- a/src/location/maps/qgeomapscene.cpp
+++ b/src/location/maps/qgeomapscene.cpp
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 
 class QGeoMapScenePrivate {
 public:
-    QGeoMapScenePrivate(QGeoMapScene *scene);
+    explicit QGeoMapScenePrivate(QGeoMapScene *scene);
     ~QGeoMapScenePrivate();
 
     QSize screenSize_; // in pixels
diff --git a/src/location/maps/qgeomaptype.cpp b/src/location/maps/qgeomaptype.cpp
index ce8c9191..331b32c3 100644
--- a/src/location/maps/qgeomaptype.cpp
+++ b/src/location/maps/qgeomaptype.cpp
@@ -57,6 +57,9 @@ QGeoMapType::~QGeoMapType() {}
 
 QGeoMapType& QGeoMapType::operator = (const QGeoMapType &other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp
index a641a1de..bc8151e0 100644
--- a/src/location/maps/qgeoroute.cpp
+++ b/src/location/maps/qgeoroute.cpp
@@ -97,6 +97,9 @@ QGeoRoute::~QGeoRoute()
 */
 QGeoRoute& QGeoRoute::operator= (const QGeoRoute & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/maps/qgeoroutereply_p.h b/src/location/maps/qgeoroutereply_p.h
index ed899b32..fa9fcdbd 100644
--- a/src/location/maps/qgeoroutereply_p.h
+++ b/src/location/maps/qgeoroutereply_p.h
@@ -65,7 +65,7 @@ class QGeoRoute;
 class QGeoRouteReplyPrivate
 {
 public:
-    QGeoRouteReplyPrivate(const QGeoRouteRequest &request);
+    explicit QGeoRouteReplyPrivate(const QGeoRouteRequest &request);
     QGeoRouteReplyPrivate(QGeoRouteReply::Error error, QString errorString);
     ~QGeoRouteReplyPrivate();
 
diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp
index 2f9f3d39..1278cb51 100644
--- a/src/location/maps/qgeorouterequest.cpp
+++ b/src/location/maps/qgeorouterequest.cpp
@@ -257,6 +257,9 @@ QGeoRouteRequest::~QGeoRouteRequest() {}
 */
 QGeoRouteRequest& QGeoRouteRequest::operator= (const QGeoRouteRequest & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h
index 9af96f7f..0e6b0d8d 100644
--- a/src/location/maps/qgeorouterequest.h
+++ b/src/location/maps/qgeorouterequest.h
@@ -112,7 +112,7 @@ public:
     };
     Q_DECLARE_FLAGS(ManeuverDetails, ManeuverDetail)
 
-    QGeoRouteRequest(const QList<QGeoCoordinate> &waypoints = QList<QGeoCoordinate>());
+    explicit QGeoRouteRequest(const QList<QGeoCoordinate> &waypoints = QList<QGeoCoordinate>());
     QGeoRouteRequest(const QGeoCoordinate &origin,
                      const QGeoCoordinate &destination);
     QGeoRouteRequest(const QGeoRouteRequest &other);
diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp
index 653dccd1..5264a5ac 100644
--- a/src/location/maps/qgeoroutesegment.cpp
+++ b/src/location/maps/qgeoroutesegment.cpp
@@ -98,6 +98,9 @@ QGeoRouteSegment::~QGeoRouteSegment() {}
 */
 QGeoRouteSegment& QGeoRouteSegment::operator= (const QGeoRouteSegment & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp
index 628148cc..0bfdb660 100644
--- a/src/location/maps/qgeoserviceprovider.cpp
+++ b/src/location/maps/qgeoserviceprovider.cpp
@@ -181,7 +181,7 @@ Flags QGeoServiceProviderPrivate::features(const char *enumName)
     if (this->metaData.contains(QStringLiteral("Features"))
             && this->metaData.value(QStringLiteral("Features")).isArray()) {
         QJsonArray features = this->metaData.value(QStringLiteral("Features")).toArray();
-        foreach (QJsonValue v, features) {
+        foreach (const QJsonValue &v, features) {
             int val = en.keyToValue(v.toString().toLatin1().constData());
             if (v.isString() && val != -1) {
                 ret |= typename Flags::enum_type(val);
diff --git a/src/location/maps/qgeotiledmapdata.cpp b/src/location/maps/qgeotiledmapdata.cpp
index 3fc294de..dbc8bb99 100644
--- a/src/location/maps/qgeotiledmapdata.cpp
+++ b/src/location/maps/qgeotiledmapdata.cpp
@@ -297,7 +297,7 @@ void QGeoTiledMapDataPrivate::changeCameraData(const QGeoCameraData &oldCameraDa
         QList<QSharedPointer<QGeoTileTexture> > cachedTiles =
                 tileRequests_->requestTiles(visibleTiles_);
 
-        foreach (QSharedPointer<QGeoTileTexture> tex, cachedTiles) {
+        foreach (const QSharedPointer<QGeoTileTexture> &tex, cachedTiles) {
             mapScene_->addTile(tex->spec, tex);
         }
 
diff --git a/src/location/maps/qgeotiledmappingmanagerengine.h b/src/location/maps/qgeotiledmappingmanagerengine.h
index 4d81415d..7b529c94 100644
--- a/src/location/maps/qgeotiledmappingmanagerengine.h
+++ b/src/location/maps/qgeotiledmappingmanagerengine.h
@@ -81,7 +81,7 @@ public:
     };
     Q_DECLARE_FLAGS(CacheAreas, CacheArea)
 
-    QGeoTiledMappingManagerEngine(QObject *parent = 0);
+    explicit QGeoTiledMappingManagerEngine(QObject *parent = 0);
     virtual ~QGeoTiledMappingManagerEngine();
 
     QGeoTileFetcher *tileFetcher();
diff --git a/src/location/maps/qgeotilefetcher_p.h b/src/location/maps/qgeotilefetcher_p.h
index 14af709f..23eba010 100644
--- a/src/location/maps/qgeotilefetcher_p.h
+++ b/src/location/maps/qgeotilefetcher_p.h
@@ -73,7 +73,7 @@ QT_BEGIN_NAMESPACE
 class QGeoTileFetcherPrivate
 {
 public:
-    QGeoTileFetcherPrivate(QGeoTiledMappingManagerEngine *engine);
+    explicit QGeoTileFetcherPrivate(QGeoTiledMappingManagerEngine *engine);
     virtual ~QGeoTileFetcherPrivate();
 
     QGeoTiledMappingManagerEngine *engine_;
diff --git a/src/location/maps/qgeotilerequestmanager.cpp b/src/location/maps/qgeotilerequestmanager.cpp
index d63a4f2a..f4fc791b 100644
--- a/src/location/maps/qgeotilerequestmanager.cpp
+++ b/src/location/maps/qgeotilerequestmanager.cpp
@@ -53,7 +53,7 @@ class RetryFuture;
 class QGeoTileRequestManagerPrivate
 {
 public:
-    QGeoTileRequestManagerPrivate(QGeoTiledMapData *map);
+    explicit QGeoTileRequestManagerPrivate(QGeoTiledMapData *map);
     ~QGeoTileRequestManagerPrivate();
 
     QGeoTiledMapData *map_;
diff --git a/src/location/maps/qgeotilerequestmanager_p.h b/src/location/maps/qgeotilerequestmanager_p.h
index bc43f37d..3f394de8 100644
--- a/src/location/maps/qgeotilerequestmanager_p.h
+++ b/src/location/maps/qgeotilerequestmanager_p.h
@@ -70,7 +70,7 @@ class QGeoTileRequestManagerPrivate;
 class QGeoTileRequestManager
 {
 public:
-    QGeoTileRequestManager(QGeoTiledMapData *map);
+    explicit QGeoTileRequestManager(QGeoTiledMapData *map);
     ~QGeoTileRequestManager();
 
     QList<QSharedPointer<QGeoTileTexture> > requestTiles(const QSet<QGeoTileSpec> &tiles);
diff --git a/src/location/maps/qgeotilespec.cpp b/src/location/maps/qgeotilespec.cpp
index 9ce3f1b8..cb768c37 100644
--- a/src/location/maps/qgeotilespec.cpp
+++ b/src/location/maps/qgeotilespec.cpp
@@ -58,6 +58,9 @@ QGeoTileSpec::~QGeoTileSpec() {
 
 QGeoTileSpec& QGeoTileSpec::operator = (const QGeoTileSpec &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp
index 4446e459..926b0ce5 100644
--- a/src/location/places/qplace.cpp
+++ b/src/location/places/qplace.cpp
@@ -146,6 +146,9 @@ QPlace::~QPlace()
 */
 QPlace &QPlace::operator= (const QPlace & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplaceattribute.cpp b/src/location/places/qplaceattribute.cpp
index c210697f..a0eff84e 100644
--- a/src/location/places/qplaceattribute.cpp
+++ b/src/location/places/qplaceattribute.cpp
@@ -163,6 +163,9 @@ QPlaceAttribute::QPlaceAttribute(const QPlaceAttribute &other)
 */
 QPlaceAttribute &QPlaceAttribute::operator=(const QPlaceAttribute &other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplacecategory.cpp b/src/location/places/qplacecategory.cpp
index fb7c8b67..73d641c3 100644
--- a/src/location/places/qplacecategory.cpp
+++ b/src/location/places/qplacecategory.cpp
@@ -61,6 +61,9 @@ QPlaceCategoryPrivate::~QPlaceCategoryPrivate()
 
 QPlaceCategoryPrivate &QPlaceCategoryPrivate::operator=(const QPlaceCategoryPrivate &other)
 {
+    if (this == &other)
+        return *this;
+
     categoryId = other.categoryId;
     name = other.name;
     icon = other.icon;
@@ -127,6 +130,9 @@ QPlaceCategory::~QPlaceCategory()
 */
 QPlaceCategory &QPlaceCategory::operator =(const QPlaceCategory &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplacecontactdetail.cpp b/src/location/places/qplacecontactdetail.cpp
index a7acc20c..5bc7fbe3 100644
--- a/src/location/places/qplacecontactdetail.cpp
+++ b/src/location/places/qplacecontactdetail.cpp
@@ -143,6 +143,9 @@ QPlaceContactDetail::QPlaceContactDetail(const QPlaceContactDetail &other)
 */
 QPlaceContactDetail &QPlaceContactDetail::operator=(const QPlaceContactDetail &other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp
index 0916ca12..d9032c0a 100644
--- a/src/location/places/qplacecontent.cpp
+++ b/src/location/places/qplacecontent.cpp
@@ -153,6 +153,9 @@ QPlaceContent::QPlaceContent(const QPlaceContent &other)
 */
 QPlaceContent &QPlaceContent::operator=(const QPlaceContent &other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp
index 00ca77f0..a48ffb37 100644
--- a/src/location/places/qplacecontentrequest.cpp
+++ b/src/location/places/qplacecontentrequest.cpp
@@ -125,6 +125,9 @@ QPlaceContentRequest::~QPlaceContentRequest()
 */
 QPlaceContentRequest &QPlaceContentRequest::operator= (const QPlaceContentRequest & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp
index 5fa051b4..8db4dfe0 100644
--- a/src/location/places/qplaceicon.cpp
+++ b/src/location/places/qplaceicon.cpp
@@ -143,6 +143,9 @@ QPlaceIcon::~QPlaceIcon()
 */
 QPlaceIcon &QPlaceIcon::operator=(const QPlaceIcon &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp
index 65568986..963ec977 100644
--- a/src/location/places/qplacematchrequest.cpp
+++ b/src/location/places/qplacematchrequest.cpp
@@ -156,6 +156,8 @@ QPlaceMatchRequest::~QPlaceMatchRequest()
 */
 QPlaceMatchRequest &QPlaceMatchRequest::operator= (const QPlaceMatchRequest & other)
 {
+    if (this == &other)
+        return *this;
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplaceratings.cpp b/src/location/places/qplaceratings.cpp
index 145b709f..7ce31bad 100644
--- a/src/location/places/qplaceratings.cpp
+++ b/src/location/places/qplaceratings.cpp
@@ -114,6 +114,9 @@ QPlaceRatings::~QPlaceRatings()
 */
 QPlaceRatings &QPlaceRatings::operator=(const QPlaceRatings &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp
index a4c97ec1..05568000 100644
--- a/src/location/places/qplacesearchrequest.cpp
+++ b/src/location/places/qplacesearchrequest.cpp
@@ -210,6 +210,9 @@ QPlaceSearchRequest::~QPlaceSearchRequest()
 */
 QPlaceSearchRequest &QPlaceSearchRequest::operator= (const QPlaceSearchRequest & other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp
index 7f3204c1..0feb8f74 100644
--- a/src/location/places/qplacesearchresult.cpp
+++ b/src/location/places/qplacesearchresult.cpp
@@ -130,7 +130,11 @@ QPlaceSearchResult::~QPlaceSearchResult()
     Assigns \a other to this search result and returns a reference to this
     search result.
 */
-QPlaceSearchResult &QPlaceSearchResult::operator =(const QPlaceSearchResult &other) {
+QPlaceSearchResult &QPlaceSearchResult::operator =(const QPlaceSearchResult &other)
+{
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp
index 3d86f35e..8d02b8ce 100644
--- a/src/location/places/qplacesupplier.cpp
+++ b/src/location/places/qplacesupplier.cpp
@@ -124,7 +124,11 @@ QPlaceSupplier::~QPlaceSupplier()
     Assigns \a other to this supplier and returns a reference to this
     supplier.
 */
-QPlaceSupplier &QPlaceSupplier::operator=(const QPlaceSupplier &other) {
+QPlaceSupplier &QPlaceSupplier::operator=(const QPlaceSupplier &other)
+{
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/places/qplaceuser.cpp b/src/location/places/qplaceuser.cpp
index 75c77ba1..6473230f 100644
--- a/src/location/places/qplaceuser.cpp
+++ b/src/location/places/qplaceuser.cpp
@@ -101,6 +101,9 @@ QPlaceUser::~QPlaceUser()
 */
 QPlaceUser &QPlaceUser::operator=(const QPlaceUser &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp
index 113f4bfd..43a81d4d 100644
--- a/src/location/qgeoaddress.cpp
+++ b/src/location/qgeoaddress.cpp
@@ -367,6 +367,9 @@ QGeoAddress::~QGeoAddress()
 */
 QGeoAddress &QGeoAddress::operator=(const QGeoAddress & address)
 {
+    if (this == &address)
+        return *this;
+
     d = address.d;
     return *this;
 }
diff --git a/src/location/qgeoareamonitor_polling_p.h b/src/location/qgeoareamonitor_polling_p.h
index a913b8ad..849f7e0b 100644
--- a/src/location/qgeoareamonitor_polling_p.h
+++ b/src/location/qgeoareamonitor_polling_p.h
@@ -67,7 +67,7 @@ class QGeoAreaMonitorPolling : public QGeoAreaMonitor
     Q_OBJECT
 
 public :
-    QGeoAreaMonitorPolling(QObject *parent = 0);
+    explicit QGeoAreaMonitorPolling(QObject *parent = 0);
     ~QGeoAreaMonitorPolling();
     void setCenter(const QGeoCoordinate &coordinate);
     void setRadius(qreal radius);
diff --git a/src/location/qgeoboundingarea.cpp b/src/location/qgeoboundingarea.cpp
index dbad8fec..195cda6c 100644
--- a/src/location/qgeoboundingarea.cpp
+++ b/src/location/qgeoboundingarea.cpp
@@ -198,6 +198,9 @@ bool QGeoBoundingArea::operator!=(const QGeoBoundingArea &other) const
 
 QGeoBoundingArea &QGeoBoundingArea::operator=(const QGeoBoundingArea &other)
 {
+    if (this == &other)
+        return *this;
+
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/location/qgeoboundingarea_p.h b/src/location/qgeoboundingarea_p.h
index ce0ba069..12387d94 100644
--- a/src/location/qgeoboundingarea_p.h
+++ b/src/location/qgeoboundingarea_p.h
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QGeoBoundingAreaPrivate : public QSharedData
 {
 public:
-    QGeoBoundingAreaPrivate(QGeoBoundingArea::AreaType type);
+    explicit QGeoBoundingAreaPrivate(QGeoBoundingArea::AreaType type);
     virtual ~QGeoBoundingAreaPrivate();
 
     virtual bool isValid() const = 0;
diff --git a/src/location/qgeoboundingbox.cpp b/src/location/qgeoboundingbox.cpp
index 357ef07c..a5dc1801 100644
--- a/src/location/qgeoboundingbox.cpp
+++ b/src/location/qgeoboundingbox.cpp
@@ -148,6 +148,9 @@ QGeoBoundingBox::~QGeoBoundingBox() {}
 */
 QGeoBoundingBox& QGeoBoundingBox::operator = (const QGeoBoundingBox & other)
 {
+    if (this == &other)
+        return *this;
+
     QGeoBoundingArea::operator=(other);
     d_ptr = other.d_ptr;
     return *this;
diff --git a/src/location/qgeoboundingcircle.cpp b/src/location/qgeoboundingcircle.cpp
index 3356e6c3..67736c70 100644
--- a/src/location/qgeoboundingcircle.cpp
+++ b/src/location/qgeoboundingcircle.cpp
@@ -121,6 +121,9 @@ QGeoBoundingCircle::~QGeoBoundingCircle() {}
 */
 QGeoBoundingCircle& QGeoBoundingCircle::operator = (const QGeoBoundingCircle & other)
 {
+    if (this == &other)
+        return *this;
+
     QGeoBoundingArea::operator=(other);
     d_ptr = other.d_ptr;
     return *this;
diff --git a/src/location/qgeocoordinate.cpp b/src/location/qgeocoordinate.cpp
index ed8c0c07..833f0fab 100644
--- a/src/location/qgeocoordinate.cpp
+++ b/src/location/qgeocoordinate.cpp
@@ -192,6 +192,9 @@ QGeoCoordinate::QGeoCoordinate(const QGeoCoordinate &other)
 
 QGeoCoordinate &QGeoCoordinate::operator=(const QGeoCoordinate &other)
 {
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return (*this);
 }
diff --git a/src/location/qgeolocation.cpp b/src/location/qgeolocation.cpp
index 6a2b5f43..634d72b1 100644
--- a/src/location/qgeolocation.cpp
+++ b/src/location/qgeolocation.cpp
@@ -123,7 +123,11 @@ QGeoLocation::~QGeoLocation()
 /*!
     Assigns \a other to this location and returns a reference to this location.
 */
-QGeoLocation &QGeoLocation::operator =(const QGeoLocation &other) {
+QGeoLocation &QGeoLocation::operator =(const QGeoLocation &other)
+{
+    if (this == &other)
+        return *this;
+
     d = other.d;
     return *this;
 }
diff --git a/src/location/qgeopositioninfosource.cpp b/src/location/qgeopositioninfosource.cpp
index 0434af8e..d7f45ebd 100644
--- a/src/location/qgeopositioninfosource.cpp
+++ b/src/location/qgeopositioninfosource.cpp
@@ -276,7 +276,7 @@ QGeoPositionInfoSource *QGeoPositionInfoSource::createDefaultSource(QObject *par
     QGeoPositionInfoSourcePrivate *d = new QGeoPositionInfoSourcePrivate;
 
     QList<QJsonObject> plugins = QGeoPositionInfoSourcePrivate::pluginsSorted();
-    foreach (QJsonObject obj, plugins) {
+    foreach (const QJsonObject &obj, plugins) {
         if (obj.value(QStringLiteral("Position")).isBool()
                 && obj.value(QStringLiteral("Position")).toBool()) {
             d->metaData = obj;
diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/location/qgeosatelliteinfosource.cpp
index 2dbb1068..33c7054e 100644
--- a/src/location/qgeosatelliteinfosource.cpp
+++ b/src/location/qgeosatelliteinfosource.cpp
@@ -160,7 +160,7 @@ QGeoSatelliteInfoSource *QGeoSatelliteInfoSource::createDefaultSource(QObject *p
     QGeoPositionInfoSourcePrivate *d = new QGeoPositionInfoSourcePrivate;
 
     QList<QJsonObject> plugins = QGeoPositionInfoSourcePrivate::pluginsSorted();
-    foreach (QJsonObject obj, plugins) {
+    foreach (const QJsonObject &obj, plugins) {
         if (obj.value(QStringLiteral("Satellite")).isBool()
                 && obj.value(QStringLiteral("Satellite")).toBool()) {
             d->metaData = obj;