Files renamed and cache only accessed through engine

This isn't completely what was requested on the ticket, but it makes the cache more separate,
so easier to pull in/out.
Mainly this is a slight reworking of the caching to make it a bit simpler for future prefetching.
In particular:
mapGeometry renamed to mapScene
mapImages renames to tileRequestManager
and mapImages::setVisible is now tileRequestManager::requestTiles

The data flow has been simplified so the requestManager speaks directly to the tiledMappingManagerEngine and this engine takes care of inspecting the single cache.

Task-number: QTBUG-25560

Change-Id: I31b2e26c45f7a7ac56fe138cf1a8906a228a93d3
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

1 files changed, 88 insertions, 0 deletions

diff --git a/src/location/maps/qgeotilerequestmanager_p.h b/src/location/maps/qgeotilerequestmanager_p.h
new file mode 100644
index 00000000..bc43f37d
--- /dev/null
+++ b/src/location/maps/qgeotilerequestmanager_p.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** 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 QGEOTILEREQUESTMANAGER_P_H
+#define QGEOTILEREQUESTMANAGER_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 <QSet>
+#include <QList>
+#include <QSharedPointer>
+#include <QString>
+
+QT_BEGIN_NAMESPACE
+
+class QGeoTiledMapData;
+class QGeoTiledMappingManagerEngine;
+class QGeoTileSpec;
+class QGeoTileCache;
+class QGeoTileTexture;
+
+class QGeoTileRequestManagerPrivate;
+
+class QGeoTileRequestManager
+{
+public:
+    QGeoTileRequestManager(QGeoTiledMapData *map);
+    ~QGeoTileRequestManager();
+
+    QList<QSharedPointer<QGeoTileTexture> > requestTiles(const QSet<QGeoTileSpec> &tiles);
+
+    void tileError(const QGeoTileSpec &tile, const QString &errorString);
+    void tileFetched(QSharedPointer<QGeoTileTexture> texture);
+private:
+    QGeoTileRequestManagerPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(QGeoTileRequestManager)
+    Q_DISABLE_COPY(QGeoTileRequestManager)
+};
+
+QT_END_NAMESPACE
+
+#endif // QGEOTILEREQUESTMANAGER_P_H