From 7b516ca5e4796116ed419a679af549b60f99ad58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 28 Sep 2024 19:49:42 +0200 Subject: [PATCH] Free the QVector/QList memory where memory should be released --- src/map/IMG/demfile.cpp | 2 +- src/map/atlas.cpp | 4 ++-- src/map/jnxmap.cpp | 2 +- src/map/kmzmap.cpp | 2 +- src/map/mapsforge/mapdata.cpp | 2 +- src/map/mapsforge/style.cpp | 14 +++++++------- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/map/IMG/demfile.cpp b/src/map/IMG/demfile.cpp index 15ecfcd0..78ad48a1 100644 --- a/src/map/IMG/demfile.cpp +++ b/src/map/IMG/demfile.cpp @@ -22,7 +22,7 @@ static qint16 limit(const DEMTile *tile, quint16 factor) void DEMFile::clear() { - _levels.clear(); + _levels = QVector(); } bool DEMFile::load(Handle &hdl) diff --git a/src/map/atlas.cpp b/src/map/atlas.cpp index ebe738ca..a9f9ef1e 100644 --- a/src/map/atlas.cpp +++ b/src/map/atlas.cpp @@ -336,8 +336,8 @@ void Atlas::unload() for (int i = 0; i < _maps.count(); i++) _maps.at(i)->unload(); - _zooms.clear(); - _bounds.clear(); + _zooms = QVector(); + _bounds = QVector(); } Map *Atlas::createTAR(const QString &path, const Projection &proj, bool *isDir) diff --git a/src/map/jnxmap.cpp b/src/map/jnxmap.cpp index f85da9a2..6cc72d70 100644 --- a/src/map/jnxmap.cpp +++ b/src/map/jnxmap.cpp @@ -125,7 +125,7 @@ void JNXMap::clearTiles() { for (int i = 0; i < _zooms.size(); i++) { Zoom *z = _zooms[i]; - z->tiles.clear(); + z->tiles = QVector(); z->tree.RemoveAll(); } } diff --git a/src/map/kmzmap.cpp b/src/map/kmzmap.cpp index 4b8bd653..65260b96 100644 --- a/src/map/kmzmap.cpp +++ b/src/map/kmzmap.cpp @@ -445,7 +445,7 @@ void KMZMap::load(const Projection &in, const Projection &out, void KMZMap::unload() { - _bounds.clear(); + _bounds = QVector(); delete _zip; _zip = 0; diff --git a/src/map/mapsforge/mapdata.cpp b/src/map/mapsforge/mapdata.cpp index 0348184c..89d66857 100644 --- a/src/map/mapsforge/mapdata.cpp +++ b/src/map/mapsforge/mapdata.cpp @@ -478,7 +478,7 @@ void MapData::clearTiles() } qDeleteAll(_tiles); - _tiles.clear(); + _tiles = QList(); } bool MapData::pathCb(VectorTile *tile, void *context) diff --git a/src/map/mapsforge/style.cpp b/src/map/mapsforge/style.cpp index 94a0f03a..bc98018c 100644 --- a/src/map/mapsforge/style.cpp +++ b/src/map/mapsforge/style.cpp @@ -763,13 +763,13 @@ void Style::load(const MapData &data, qreal ratio) void Style::clear() { - _paths.clear(); - _circles.clear(); - _pathLabels.clear(); - _pointLabels.clear(); - _areaLabels.clear(); - _symbols.clear(); - _lineSymbols.clear(); + _paths = QList(); + _circles = QList(); + _pathLabels = QList(); + _pointLabels = QList(); + _areaLabels = QList(); + _symbols = QList(); + _lineSymbols = QList(); } QList Style::paths(int zoom, bool closed,