diff options
Diffstat (limited to 'src/imports')
25 files changed, 83 insertions, 83 deletions
diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index f1043a30..2202a046 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -8,7 +8,7 @@ QT += declarative quick-private network location declarative qt3d core-private g DESTDIR = $$QT.location.imports/$$TARGETPATH target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH -INCLUDEPATH += ../../location/mapsgl +INCLUDEPATH += ../../location/maps INCLUDEPATH *= $$PWD # On some platforms, build both versions because debug and release diff --git a/src/imports/location/mapnode.cpp b/src/imports/location/mapnode.cpp index 45838486..c2bd8aa9 100644 --- a/src/imports/location/mapnode.cpp +++ b/src/imports/location/mapnode.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "mapnode_p.h" -#include "map.h" +#include "qgeomap.h" #include <Qt3D/qglpainter.h> #include <Qt3D/qglframebufferobjectsurface.h> #include <QtGui/QOpenGLFramebufferObject> @@ -49,7 +49,7 @@ #define GL_MULTISAMPLE 0x809D #endif -MapNode::MapNode(Map* map): QSGGeometryNode(), +MapNode::MapNode(QGeoMap* map): QSGGeometryNode(), m_fbo(0), m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4), m_texture(0), diff --git a/src/imports/location/mapnode_p.h b/src/imports/location/mapnode_p.h index d80d8f80..c0f4c30f 100644 --- a/src/imports/location/mapnode_p.h +++ b/src/imports/location/mapnode_p.h @@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE -class Map; +class QGeoMap; class QOpenGLFramebufferObject; class QGLPainter; class MapNode : public QSGGeometryNode { public: - MapNode(Map *m_map); + MapNode(QGeoMap *m_map); ~MapNode(); void setSize(const QSize &size); @@ -91,7 +91,7 @@ private: QSGTextureMaterial m_material; QSGGeometry m_geometry; QSGPlainTexture *m_texture; - Map *m_map; + QGeoMap *m_map; QSize m_size; bool m_initialized; bool m_dirtyFBO; diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index 35520d3c..38882ca9 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -41,7 +41,7 @@ #include "qdeclarativecirclemapitem_p.h" #include "qdeclarativegeomapquickitem_p.h" -#include "projection_p.h" +#include "qgeoprojection_p.h" #include <cmath> #include <QPen> #include <QPainter> @@ -126,7 +126,7 @@ inline static qreal qgeocoordinate_radToDeg(qreal rad) return rad * 180 / M_PI; } -static void updatePolygon(QPolygonF& points,const Map& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) +static void updatePolygon(QPolygonF& points,const QGeoMap& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) { qreal minX, maxX, minY, maxY; @@ -255,11 +255,11 @@ void QDeclarativeCircleMapItem::updateMapItemAssumeDirty() updateMapItem(); } -void QDeclarativeCircleMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativeCircleMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData))); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(handleCameraDataChanged(QGeoCameraData))); dirtyGeoGeometry_ = true; updateMapItem(); } @@ -388,7 +388,7 @@ void QDeclarativeCircleMapItem::updateMapItem() update(); } -void QDeclarativeCircleMapItem::handleCameraDataChanged(const CameraData& cameraData) +void QDeclarativeCircleMapItem::handleCameraDataChanged(const QGeoCameraData& cameraData) { if (cameraData.zoomFactor() != zoomLevel_) { zoomLevel_ = cameraData.zoomFactor(); diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h index 14ab51a3..65279d05 100644 --- a/src/imports/location/qdeclarativecirclemapitem_p.h +++ b/src/imports/location/qdeclarativecirclemapitem_p.h @@ -64,7 +64,7 @@ public: QDeclarativeCircleMapItem(QQuickItem *parent = 0); ~QDeclarativeCircleMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); @@ -92,7 +92,7 @@ protected Q_SLOTS: void updateMapItemAssumeDirty(); private Q_SLOTS: - void handleCameraDataChanged(const CameraData& cameraData); + void handleCameraDataChanged(const QGeoCameraData& cameraData); private: //TODO: pimpl diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index ceea6de4..523e8fe5 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -49,10 +49,10 @@ #include <QtCore/qnumeric.h> #include <QThread> -#include "tilecache.h" -#include "tile.h" -#include "cameradata.h" -#include "mapcontroller.h" +#include "qgeotilecache.h" +#include "qgeotile.h" +#include "qgeocameradata.h" +#include "qgeomapcontroller.h" #include "mapnode_p.h" #include <cmath> @@ -123,9 +123,9 @@ QDeclarativeGeoMap::QDeclarativeGeoMap(QQuickItem *parent) setFlags(QQuickItem::ItemHasContents | QQuickItem::ItemClipsChildrenToShape); // Create internal flickable and pinch area. - tileCache_ = new TileCache(); - map_ = new Map(tileCache_, this); - map_->setActiveMapType(MapType()); + tileCache_ = new QGeoTileCache(); + map_ = new QGeoMap(tileCache_, this); + map_->setActiveMapType(QGeoMapType()); flickable_ = new QDeclarativeGeoMapFlickable(this); flickable_->setMap(map_); pinchArea_ = new QDeclarativeGeoMapPinchArea(this, this); @@ -231,7 +231,7 @@ void QDeclarativeGeoMap::keyPressEvent(QKeyEvent *e) if (!mappingManagerInitialized_) return; QLOC_TRACE2(" key: ", e->key()); - CameraData cameraData = map_->cameraData(); + QGeoCameraData cameraData = map_->cameraData(); if (e->key() == Qt::Key_Left) { if (e->modifiers() & Qt::ShiftModifier) { map_->mapController()->pan(-1.0 * map_->width() / 8.0, 0); @@ -377,7 +377,7 @@ void QDeclarativeGeoMap::mappingManagerInitialized() map_->mapController()->setBearing(bearing_); map_->mapController()->setTilt(tilt_); - QList<MapType> types = mappingManager_->supportedMapTypes(); + QList<QGeoMapType> types = mappingManager_->supportedMapTypes(); for (int i = 0; i < types.size(); ++i) { QDeclarativeGeoMapType *type = new QDeclarativeGeoMapType(types[i], this); supportedMapTypes_.append(type); diff --git a/src/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 4108941d..4bab6bfd 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -54,7 +54,7 @@ #include "qdeclarativegeomapitemview_p.h" #include "qdeclarativegeomapflickable_p.h" #include "qdeclarativegeomappincharea_p.h" -#include "mapcontroller.h" +#include "qgeomapcontroller.h" #include "qgeomappingmanager.h" //#define QT_DECLARATIVE_LOCATION_TRACE 1 @@ -69,18 +69,18 @@ #define QLOC_TRACE2(msg1, msg2) #endif -#include "cameradata.h" -#include "map.h" +#include "qgeocameradata.h" +#include "qgeomap.h" #include "qdeclarativegeomaptype_p.h" QT_BEGIN_NAMESPACE class QGLPainter; class QGLSceneNode; -class TileCache; +class QGeoTileCache; class Tile; -class TileSpec; -class MapSphere; +class QGeoTileSpec; +class QGeoMapSphere; class QGeoCoordinate; class QGeoMapObject; @@ -230,8 +230,8 @@ private: QQuickCanvas* canvas_; int touchTimer_; - TileCache *tileCache_; - Map *map_; + QGeoTileCache *tileCache_; + QGeoMap *map_; QList<QObject*> mapItems_; diff --git a/src/imports/location/qdeclarativegeomapflickable.cpp b/src/imports/location/qdeclarativegeomapflickable.cpp index 418db37d..659b8f57 100644 --- a/src/imports/location/qdeclarativegeomapflickable.cpp +++ b/src/imports/location/qdeclarativegeomapflickable.cpp @@ -44,9 +44,9 @@ #include <QPropertyAnimation> #include <QEasingCurve> #include "qdeclarativegeomapflickable_p.h" -#include "mapcontroller.h" +#include "qgeomapcontroller.h" #include <QTimer> -#include "map.h" +#include "qgeomap.h" #include "math.h" #define QML_MAP_FLICK_DEFAULTMAXVELOCITY 2500 @@ -159,7 +159,7 @@ QDeclarativeGeoMapFlickable::~QDeclarativeGeoMapFlickable() { } -void QDeclarativeGeoMapFlickable::setMap(Map* map) +void QDeclarativeGeoMapFlickable::setMap(QGeoMap* map) { if (map_ || !map) return; diff --git a/src/imports/location/qdeclarativegeomapflickable_p.h b/src/imports/location/qdeclarativegeomapflickable_p.h index 4b14fecc..e96d89e9 100644 --- a/src/imports/location/qdeclarativegeomapflickable_p.h +++ b/src/imports/location/qdeclarativegeomapflickable_p.h @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; class QPropertyAnimation; -class CameraData; -class Map; +class QGeoCameraData; +class QGeoMap; class QDeclarativeGeoMapFlickable: public QObject { @@ -73,7 +73,7 @@ public: bool enabled() const; void setEnabled(bool enabled); - void setMap(Map* map); + void setMap(QGeoMap* map); bool mousePressEvent(QMouseEvent *event); bool mouseMoveEvent(QMouseEvent *event); @@ -113,7 +113,7 @@ private: QPointF lastPos_; QPointF pressPos_; bool flicking_; - Map* map_; + QGeoMap* map_; QPropertyAnimation* animation_; bool enabled_; bool moving_; diff --git a/src/imports/location/qdeclarativegeomapitembase.cpp b/src/imports/location/qdeclarativegeomapitembase.cpp index a4524b2c..ca26e02b 100644 --- a/src/imports/location/qdeclarativegeomapitembase.cpp +++ b/src/imports/location/qdeclarativegeomapitembase.cpp @@ -71,7 +71,7 @@ void QDeclarativeGeoMapItemBase::dragEnded() { } -void QDeclarativeGeoMapItemBase::setMap(QDeclarativeGeoMap *quickMap, Map *map) { +void QDeclarativeGeoMapItemBase::setMap(QDeclarativeGeoMap *quickMap, QGeoMap *map) { if (quickMap == quickMap_) return; if (quickMap && quickMap_) diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h index fd106a9c..cf49205a 100644 --- a/src/imports/location/qdeclarativegeomapitembase_p.h +++ b/src/imports/location/qdeclarativegeomapitembase_p.h @@ -56,20 +56,20 @@ public: QDeclarativeGeoMapItemBase(QQuickItem *parent = 0); virtual ~QDeclarativeGeoMapItemBase(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); virtual void setPositionOnMap(const QGeoCoordinate& coordinate, const QPointF& offset); virtual bool contains(QPointF point); virtual void dragStarted(); virtual void dragEnded(); QDeclarativeGeoMap* quickMap() {return quickMap_;} - Map* map() {return map_;} + QGeoMap* map() {return map_;} protected Q_SLOT: virtual void updateMapItem() = 0; private: - Map* map_; + QGeoMap* map_; QDeclarativeGeoMap* quickMap_; }; diff --git a/src/imports/location/qdeclarativegeomappincharea.cpp b/src/imports/location/qdeclarativegeomappincharea.cpp index 88592391..d215e517 100644 --- a/src/imports/location/qdeclarativegeomappincharea.cpp +++ b/src/imports/location/qdeclarativegeomappincharea.cpp @@ -47,7 +47,7 @@ #include <QtDeclarative/qdeclarativeinfo.h> #include <QDebug> #include "math.h" -#include "map.h" +#include "qgeomap.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomappincharea_p.h b/src/imports/location/qdeclarativegeomappincharea_p.h index 05685c09..7a5d677a 100644 --- a/src/imports/location/qdeclarativegeomappincharea_p.h +++ b/src/imports/location/qdeclarativegeomappincharea_p.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE class QGraphicsSceneMouseEvent; class QDeclarativeGeoMap; class QTouchEvent; -class Map; +class QGeoMap; class QDeclarativeGeoMapPinchEvent : public QObject { diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index 49da9c64..d2bf1cb7 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -158,13 +158,13 @@ void QDeclarativeGeoMapQuickItem::setCoordinate(QDeclarativeCoordinate *coordina emit coordinateChanged(); } -void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativeGeoMapQuickItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map && quickMap) { QObject::connect(quickMap, SIGNAL(heightChanged()), this, SLOT(updateMapItem())); QObject::connect(quickMap, SIGNAL(widthChanged()), this, SLOT(updateMapItem())); - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(updateMapItem())); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(updateMapItem())); updateMapItem(); } } diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h index 10f08c02..121b8e9e 100644 --- a/src/imports/location/qdeclarativegeomapquickitem_p.h +++ b/src/imports/location/qdeclarativegeomapquickitem_p.h @@ -62,7 +62,7 @@ public: QDeclarativeGeoMapQuickItem(QQuickItem *parent = 0); ~QDeclarativeGeoMapQuickItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); void setCoordinate(QDeclarativeCoordinate *coordinate); QDeclarativeCoordinate* coordinate(); diff --git a/src/imports/location/qdeclarativegeomaptype.cpp b/src/imports/location/qdeclarativegeomaptype.cpp index eb51d326..d08fda58 100644 --- a/src/imports/location/qdeclarativegeomaptype.cpp +++ b/src/imports/location/qdeclarativegeomaptype.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \ingroup qml-location */ -QDeclarativeGeoMapType::QDeclarativeGeoMapType(const MapType mapType, QObject* parent) +QDeclarativeGeoMapType::QDeclarativeGeoMapType(const QGeoMapType mapType, QObject* parent) : QObject(parent), mapType_(mapType) {} diff --git a/src/imports/location/qdeclarativegeomaptype_p.h b/src/imports/location/qdeclarativegeomaptype_p.h index c48583e7..5121df0f 100644 --- a/src/imports/location/qdeclarativegeomaptype_p.h +++ b/src/imports/location/qdeclarativegeomaptype_p.h @@ -43,7 +43,7 @@ #define QDECLARATIVEGEOMAPTYPE_H #include <QtDeclarative/qdeclarative.h> -#include "maptype.h" +#include "qgeomaptype.h" #include <QObject> QT_BEGIN_NAMESPACE @@ -60,18 +60,18 @@ class QDeclarativeGeoMapType : public QObject public: enum MapStyle { - NoMap = MapType::NoMap, - StreetMap = MapType::StreetMap, - SatelliteMapDay = MapType::SatelliteMapDay, - SatelliteMapNight = MapType::SatelliteMapNight, - TerrainMap = MapType::TerrainMap, - HybridMap = MapType::HybridMap, - TransitMap = MapType::TransitMap, - GrayStreetMap = MapType::GrayStreetMap, + NoMap = QGeoMapType::NoMap, + StreetMap = QGeoMapType::StreetMap, + SatelliteMapDay = QGeoMapType::SatelliteMapDay, + SatelliteMapNight = QGeoMapType::SatelliteMapNight, + TerrainMap = QGeoMapType::TerrainMap, + HybridMap = QGeoMapType::HybridMap, + TransitMap = QGeoMapType::TransitMap, + GrayStreetMap = QGeoMapType::GrayStreetMap, CustomMap = 100 }; - QDeclarativeGeoMapType(const MapType mapType, QObject* parent = 0); + QDeclarativeGeoMapType(const QGeoMapType mapType, QObject* parent = 0); ~QDeclarativeGeoMapType(); MapStyle style() const; @@ -79,10 +79,10 @@ public: QString description() const; bool mobile() const; - const MapType mapType(){return mapType_;} + const QGeoMapType mapType(){return mapType_;} private: - MapType mapType_; + QGeoMapType mapType_; }; diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 40a56b34..f537544f 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -111,7 +111,7 @@ struct Vertex QVector2D position; }; -static void updatePolygon(QPolygonF& points,const Map& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) +static void updatePolygon(QPolygonF& points,const QGeoMap& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) { qreal minX, maxX, minY, maxY; //TODO: dateline handling @@ -197,11 +197,11 @@ QDeclarativeMapLineProperties *QDeclarativePolygonMapItem::border() return &border_; } -void QDeclarativePolygonMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativePolygonMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData))); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(handleCameraDataChanged(QGeoCameraData))); dirtyGeometry_ = true; updateMapItem(); } @@ -380,7 +380,7 @@ void QDeclarativePolygonMapItem::updateMapItem() update(); } -void QDeclarativePolygonMapItem::handleCameraDataChanged(const CameraData& cameraData) +void QDeclarativePolygonMapItem::handleCameraDataChanged(const QGeoCameraData& cameraData) { if (cameraData.zoomFactor() != zoomLevel_) { zoomLevel_ = cameraData.zoomFactor(); diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h index 91de848d..617274ae 100644 --- a/src/imports/location/qdeclarativepolygonmapitem_p.h +++ b/src/imports/location/qdeclarativepolygonmapitem_p.h @@ -63,7 +63,7 @@ public: QDeclarativePolygonMapItem(QQuickItem *parent = 0); ~QDeclarativePolygonMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); @@ -89,7 +89,7 @@ protected Q_SLOTS: private Q_SLOTS: // map size changed - void handleCameraDataChanged(const CameraData& cameraData); + void handleCameraDataChanged(const QGeoCameraData& cameraData); void updateAfterCoordinateChanged(); private: diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index 9eaadb2b..efe10cae 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -143,7 +143,7 @@ struct Vertex QVector2D position; }; -void QDeclarativePolylineMapItem::updatePolyline(QPolygonF& points,const Map& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) +void QDeclarativePolylineMapItem::updatePolyline(QPolygonF& points,const QGeoMap& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) { qreal minX, maxX, minY, maxY; //TODO: dateline handling @@ -213,11 +213,11 @@ void QDeclarativePolylineMapItem::updateAfterCoordinateChanged() } } -void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativePolylineMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map){ - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData))); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(handleCameraDataChanged(QGeoCameraData))); dirtyGeometry_ = true; updateMapItem(); } @@ -384,7 +384,7 @@ void QDeclarativePolylineMapItem::updateMapItem() update(); } -void QDeclarativePolylineMapItem::handleCameraDataChanged(const CameraData& cameraData) +void QDeclarativePolylineMapItem::handleCameraDataChanged(const QGeoCameraData& cameraData) { if (cameraData.zoomFactor() != zoomLevel_) { zoomLevel_ = cameraData.zoomFactor(); diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h index b85c8ead..984d26a1 100644 --- a/src/imports/location/qdeclarativepolylinemapitem_p.h +++ b/src/imports/location/qdeclarativepolylinemapitem_p.h @@ -86,9 +86,9 @@ public: QDeclarativePolylineMapItem(QQuickItem *parent = 0); ~QDeclarativePolylineMapItem(); - static void updatePolyline(QPolygonF& points,const Map& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h); + static void updatePolyline(QPolygonF& points,const QGeoMap& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); @@ -111,7 +111,7 @@ protected Q_SLOTS: private Q_SLOTS: // map size changed - void handleCameraDataChanged(const CameraData& cameraData); + void handleCameraDataChanged(const QGeoCameraData& cameraData); private: static void path_append(QDeclarativeListProperty<QDeclarativeCoordinate> *prop, QDeclarativeCoordinate *coordinate); diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp index c1b94109..29d8d615 100644 --- a/src/imports/location/qdeclarativerectanglemapitem.cpp +++ b/src/imports/location/qdeclarativerectanglemapitem.cpp @@ -120,11 +120,11 @@ QDeclarativeRectangleMapItem::~QDeclarativeRectangleMapItem() { } -void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)),this, SLOT(handleCameraDataChanged(CameraData))); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)),this, SLOT(handleCameraDataChanged(QGeoCameraData))); dirtyGeometry_ = true; updateMapItem(); } @@ -281,7 +281,7 @@ void QDeclarativeRectangleMapItem::updateMapItem() update(); } -void QDeclarativeRectangleMapItem::handleCameraDataChanged(const CameraData& cameraData) +void QDeclarativeRectangleMapItem::handleCameraDataChanged(const QGeoCameraData& cameraData) { if (cameraData.zoomFactor() != zoomLevel_) { zoomLevel_ = cameraData.zoomFactor(); diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h index 3686dd5d..a4825a6e 100644 --- a/src/imports/location/qdeclarativerectanglemapitem_p.h +++ b/src/imports/location/qdeclarativerectanglemapitem_p.h @@ -64,7 +64,7 @@ public: QDeclarativeRectangleMapItem(QQuickItem *parent = 0); ~QDeclarativeRectangleMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); @@ -93,7 +93,7 @@ protected Q_SLOTS: private Q_SLOTS: // map size changed - void handleCameraDataChanged(const CameraData& cameraData); + void handleCameraDataChanged(const QGeoCameraData& cameraData); private: QDeclarativeCoordinate* topLeft_; diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index 33468ead..a5430c4e 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -73,7 +73,7 @@ TODO: an example here. do we want to use a RouteModel? */ -static void updatePolyline(QPolygonF& points,const Map& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) +static void updatePolyline(QPolygonF& points,const QGeoMap& map, const QList<QGeoCoordinate> &path, qreal& w, qreal& h) { qreal minX, maxX, minY, maxY; @@ -132,11 +132,11 @@ void QDeclarativeRouteMapItem::updateAfterLinePropertiesChanged() updateMapItem(); } -void QDeclarativeRouteMapItem::setMap(QDeclarativeGeoMap* quickMap, Map *map) +void QDeclarativeRouteMapItem::setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map) { QDeclarativeGeoMapItemBase::setMap(quickMap,map); if (map) { - QObject::connect(map, SIGNAL(cameraDataChanged(CameraData)), this, SLOT(handleCameraDataChanged(CameraData))); + QObject::connect(map, SIGNAL(cameraDataChanged(QGeoCameraData)), this, SLOT(handleCameraDataChanged(QGeoCameraData))); dirtyGeometry_ = true; updateMapItem(); } @@ -223,7 +223,7 @@ void QDeclarativeRouteMapItem::updateMapItem() setPositionOnMap(path_.at(0), polyline_.at(0)); } -void QDeclarativeRouteMapItem::handleCameraDataChanged(const CameraData& cameraData) +void QDeclarativeRouteMapItem::handleCameraDataChanged(const QGeoCameraData& cameraData) { if (cameraData.zoomFactor() != zoomLevel_) { zoomLevel_ = cameraData.zoomFactor(); diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h index 86da1bb3..7e9ca72a 100644 --- a/src/imports/location/qdeclarativeroutemapitem_p.h +++ b/src/imports/location/qdeclarativeroutemapitem_p.h @@ -64,7 +64,7 @@ public: QDeclarativeRouteMapItem(QQuickItem *parent = 0); ~QDeclarativeRouteMapItem(); - virtual void setMap(QDeclarativeGeoMap* quickMap, Map *map); + virtual void setMap(QDeclarativeGeoMap* quickMap, QGeoMap *map); //from QuickItem virtual QSGNode *updatePaintNode(QSGNode *, UpdatePaintNodeData *); @@ -84,7 +84,7 @@ protected Q_SLOTS: private Q_SLOTS: // map size changed - void handleCameraDataChanged(const CameraData& cameraData); + void handleCameraDataChanged(const QGeoCameraData& cameraData); private: QDeclarativeMapLineProperties line_; |