root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-01-19 04:02:09 +01:00
Code Issues Projects Releases Activity

Dummy non-class callback functions are not needed

Browse Source
This commit is contained in:
Martin Tůma 2020-07-02 23:51:15 +02:00
parent 29a821f8b2
commit 51becc4bf1
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/map/imgmap.cpp
View File

@ -167,11 +167,6 @@ void IMGMap::ll2xy(QList<MapData::Point> &points)
} }
} }
static void render(RasterTile &tile)
{
tile.render();
}
void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags) void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
{ {
Q_UNUSED(flags); Q_UNUSED(flags);
@ -224,7 +219,7 @@ void IMGMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
} }
} }
QFuture<void> future = QtConcurrent::map(tiles, render); QFuture<void> future = QtConcurrent::map(tiles, &RasterTile::render);
future.waitForFinished(); future.waitForFinished();
for (int i = 0; i < tiles.size(); i++) { for (int i = 0; i < tiles.size(); i++) {

7
src/map/mbtilesmap.cpp
View File

@ -49,11 +49,6 @@ private:
#define META_TYPE(type) static_cast<QMetaType::Type>(type) #define META_TYPE(type) static_cast<QMetaType::Type>(type)
static void render(MBTile &tile)
{
tile.load();
}
static double index2mercator(int index, int zoom) static double index2mercator(int index, int zoom)
{ {
return rad2deg(-M_PI + 2 * M_PI * ((double)index / (1<<zoom))); return rad2deg(-M_PI + 2 * M_PI * ((double)index / (1<<zoom)));
@ -314,7 +309,7 @@ void MBTilesMap::draw(QPainter *painter, const QRectF &rect, Flags flags)
} }
} }
QFuture<void> future = QtConcurrent::map(tiles, render); QFuture<void> future = QtConcurrent::map(tiles, &MBTile::load);
future.waitForFinished(); future.waitForFinished();
for (int i = 0; i < tiles.size(); i++) { for (int i = 0; i < tiles.size(); i++) {

9
src/map/tileloader.cpp
View File

@ -41,11 +41,6 @@ private:
QImage _image; QImage _image;
}; };
static void render(TileImage &ti)
{
ti.load();
}
static QString quadKey(const QPoint &xy, int zoom) static QString quadKey(const QPoint &xy, int zoom)
{ {
QString qk; QString qk;
@ -101,7 +96,7 @@ void TileLoader::loadTilesAsync(QVector<Tile> &list)
if (!dl.empty()) if (!dl.empty())
_downloader->get(dl, _authorization); _downloader->get(dl, _authorization);
QFuture<void> future = QtConcurrent::map(imgs, render); QFuture<void> future = QtConcurrent::map(imgs, &TileImage::load);
future.waitForFinished(); future.waitForFinished();
for (int i = 0; i < imgs.size(); i++) { for (int i = 0; i < imgs.size(); i++) {
@ -153,7 +148,7 @@ void TileLoader::loadTilesSync(QVector<Tile> &list)
} }
} }
QFuture<void> future = QtConcurrent::map(imgs, render); QFuture<void> future = QtConcurrent::map(imgs, &TileImage::load);
future.waitForFinished(); future.waitForFinished();
for (int i = 0; i < imgs.size(); i++) for (int i = 0; i < imgs.size(); i++)