Free the QVector/QList memory where memory should be released

tumic0 · Sep 28, 2024 · 7b516ca · 7b516ca
1 parent 5d86852
commit 7b516ca
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git 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<Level>();
 }
 
 bool DEMFile::load(Handle &hdl)

diff --git 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<Zoom>();
+	_bounds = QVector<Bounds>();
 }
 
 Map *Atlas::createTAR(const QString &path, const Projection &proj, bool *isDir)

diff --git 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<Tile>();
 		z->tree.RemoveAll();
 	}
 }

diff --git 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<Bounds>();
 
 	delete _zip;
 	_zip = 0;

diff --git 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<TileTree*>();
 }
 
 bool MapData::pathCb(VectorTile *tile, void *context)

diff --git 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<PathRender>();
+	_circles = QList<CircleRender>();
+	_pathLabels = QList<TextRender>();
+	_pointLabels = QList<TextRender>();
+	_areaLabels = QList<TextRender>();
+	_symbols = QList<Symbol>();
+	_lineSymbols = QList<Symbol>();
 }
 
 QList<const Style::PathRender *> Style::paths(int zoom, bool closed,