diff options
Diffstat (limited to 'src/location/maps/qgeotilecache_p.h')
-rw-r--r-- | src/location/maps/qgeotilecache_p.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/location/maps/qgeotilecache_p.h b/src/location/maps/qgeotilecache_p.h index eee09de3..b9d98e98 100644 --- a/src/location/maps/qgeotilecache_p.h +++ b/src/location/maps/qgeotilecache_p.h @@ -64,6 +64,8 @@ #include "qgeotilespec_p.h" #include "qgeotiledmappingmanagerengine_p.h" +#include <QImage> + QT_BEGIN_NAMESPACE class QGeoMappingManager; @@ -71,7 +73,6 @@ class QGeoMappingManager; class QGeoTile; class QGeoCachedTileMemory; class QGeoTileCache; -class QGLTexture2D; class QPixmap; class QThread; @@ -98,7 +99,7 @@ public: ~QGeoTileTexture(); QGeoTileSpec spec; - QGLTexture2D *texture; + QImage image; bool textureBound; }; @@ -132,15 +133,12 @@ public: int minTextureUsage() const; int textureUsage() const; - void GLContextAvailable(); - QSharedPointer<QGeoTileTexture> get(const QGeoTileSpec &spec); QString directory() const; // can be called without a specific tileCache pointer static void evictFromDiskCache(QGeoCachedTileDisk *td); static void evictFromMemoryCache(QGeoCachedTileMemory *tm); - static void evictFromTextureCache(QGeoTileTexture *tt); void insert(const QGeoTileSpec &spec, const QByteArray &bytes, @@ -168,9 +166,6 @@ private: int minTextureUsage_; int extraTextureUsage_; - - static QMutex cleanupMutex_; - static QList<QGLTexture2D*> cleanupList_; }; QT_END_NAMESPACE |