summaryrefslogtreecommitdiff
path: root/src/location/maps/qgeomap_p_p.h
diff options
context:
space:
mode:
authorBasel Hashisho <basel.hashisho@nokia.com>2012-02-17 12:07:01 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-09 16:04:55 +0100
commit53e5f30e06091f5b05c9283657e454bc45896075 (patch)
treea9a5be51418b008f61165b510f1d87aa748a020e /src/location/maps/qgeomap_p_p.h
parentf61e60ec2d66e181caf9e81b126936075e6fca5d (diff)
downloadqtlocation-53e5f30e06091f5b05c9283657e454bc45896075.tar.gz
Refactoring of QtLocation API
Refactoring QGeoMap, QGeoMappingManager, QGeoMappingManagerEngine Introducing QGeoMapData, QGeoTiledMap, QGeoTiledMappingManagerEngine, QGeoTileFetcher QGeoMap: Container for QGeoMapData QGeoMapData: No tiles data/functionality QGeoTiledMapData: Implements tiles data/functionality. QGeoMappingManager: Looses tiles-related data/functionality. QGeoMappingManagerEngine => QGeoMappingManagerEngine (no tiles data/functionality) QGeoTiledMappingManagerEngine (implements tiles-related data/functionality). QGeoTileFetcher: Implements tile fetching functionality from tiles provider. This commit compiles and runs through mapviewer example. Tests also were adjusted to fit refactored architecture. Change-Id: Id2b62d62d5cd4aaca8295c67e44c009cde636462 Reviewed-by: Alex <alex.blasche@nokia.com>
Diffstat (limited to 'src/location/maps/qgeomap_p_p.h')
-rw-r--r--src/location/maps/qgeomap_p_p.h145
1 files changed, 0 insertions, 145 deletions
diff --git a/src/location/maps/qgeomap_p_p.h b/src/location/maps/qgeomap_p_p.h
deleted file mode 100644
index a2ed3496..00000000
--- a/src/location/maps/qgeomap_p_p.h
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtLocation module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QGEOMAP_P_P_H
-#define QGEOMAP_P_P_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Qt API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QList>
-#include <QSet>
-#include <QVector>
-#include <QPair>
-#include <QPolygonF>
-#include <QSizeF>
-#include <QMatrix4x4>
-#include <QString>
-#include <QSharedPointer>
-#include <QWeakPointer>
-
-#include "qgeocameradata_p.h"
-#include "qgeomaptype.h"
-
-#include "qdoublevector3d_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QGeoMappingManager;
-
-class QGeoTile;
-class QGeoTileCache;
-class QGeoTileSpec;
-class QGeoMap;
-class QGeoMapController;
-class QGeoProjection;
-
-class QGeoCameraTiles;
-class QGeoMapImages;
-class QGeoMapGeometry;
-
-class QGLCamera;
-class QGLSceneNode;
-class QGLPainter;
-
-class QGeoMapPrivate
-{
-public:
- QGeoMapPrivate(QGeoMap *parent, QGeoTileCache *cache);
- virtual ~QGeoMapPrivate();
-
- QGeoTileCache* tileCache();
-
- void setMappingManager(QGeoMappingManager *manager);
- QGeoMappingManager *manager() const;
-
- QGeoMapController* mapController();
-
- QGLCamera* glCamera() const;
- void paintGL(QGLPainter *painter);
-
- void setCameraData(const QGeoCameraData &cameraData);
- QGeoCameraData cameraData() const;
-
- void resize(int width, int height);
- int width() const;
- int height() const;
- double aspectRatio() const;
-
- const QGeoMapType activeMapType() const;
- void setActiveMapType(const QGeoMapType &mapType);
-
- QGeoCoordinate screenPositionToCoordinate(const QPointF &pos) const;
- QPointF coordinateToScreenPosition(const QGeoCoordinate &coordinate) const;
-
- void tileFetched(const QGeoTileSpec &spec);
-
-private:
- int width_;
- int height_;
- double aspectRatio_;
-
- QGeoMap *map_;
- QGeoTileCache* cache_;
- QWeakPointer<QGeoMappingManager> manager_;
- QString pluginString_;
- QGeoMapController *controller_;
-
- QGeoCameraData cameraData_;
- QSet<QGeoTileSpec> visibleTiles_;
-
- QGeoCameraTiles *cameraTiles_;
- QGeoMapGeometry *mapGeometry_;
- QGeoMapImages *mapImages_;
-
- QGeoMapType activeMapType_;
-};
-
-QT_END_NAMESPACE
-
-#endif // QGEOMAP_P_P_H