Reduce setCameraData calls to minimum

Remove checks for cameraCapabilities during each
setCameraData call. This checks are already performed
on plugin initialization. Refactor QGeoMapPrivate
to reduce resize calls. Rename updateRequired to sgNodeChanged
to reflect real useage. Add setter setSize for QGeoMap.

Change-Id: If4e3501fa99a8a97cbc471990837b08c43b8e723
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
index 3b996ecc..f09d55c2 100644
--- a/src/location/maps/qgeomap_p_p.h
+++ b/src/location/maps/qgeomap_p_p.h
@@ -50,6 +50,7 @@
 #include "qgeocameradata_p.h"
 #include "qgeomaptype_p.h"
 #include <QtCore/private/qobject_p.h>
+#include <QtCore/QSize>
 
 
 QT_BEGIN_NAMESPACE
@@ -65,18 +66,13 @@ public:
     QGeoMapPrivate(QGeoMappingManagerEngine *engine);
     virtual ~QGeoMapPrivate();
 
-    void setCameraData(const QGeoCameraData &cameraData);
-    void resize(int width, int height);
-
 protected:
-    virtual void mapResized(int width, int height) = 0;
+    virtual void changeMapSize(const QSize &size) = 0;
     virtual void changeCameraData(const QGeoCameraData &oldCameraData) = 0;
     virtual void changeActiveMapType(const QGeoMapType mapType) = 0;
 
 protected:
-    int m_width;
-    int m_height;
-    double m_aspectRatio;
+    QSize m_size;
     QPointer<QGeoMappingManagerEngine> m_engine;
     QGeoMapController *m_controller;
     QGeoCameraData m_cameraData;