From ee1b91329e0ed6d75935420bfd3e0d3d605150c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Mon, 5 Feb 2024 10:08:58 +0100 Subject: [PATCH] Optimizations --- src/style.cpp | 8 ++++---- src/text.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/style.cpp b/src/style.cpp index 889a5ea..27b3bb4 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -204,7 +204,7 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const { - QRegularExpression rx("\\{[^\\}]*\\}"); + static QRegularExpression rx("\\{[^\\}]*\\}"); QString text(_field.value(zoom)); QRegularExpressionMatchIterator it = rx.globalMatch(text); QStringList keys; @@ -546,11 +546,11 @@ void Style::Layer::setTextProperties(Tile &tile) const void Style::Layer::addSymbol(Tile &tile, const QPainterPath &path, const PBF::Feature &feature, const Sprites &sprites) const { - QString text = _layout.text(tile.zoom(), feature); + QString text(_layout.text(tile.zoom(), feature)); if (text.isEmpty()) return; - QString icon = _layout.icon(tile.zoom(), feature); + QString icon(_layout.icon(tile.zoom(), feature)); tile.text().addLabel(text, sprites.icon(icon), path); } @@ -597,7 +597,7 @@ bool Style::load(const QString &fileName) _layers.append(Layer(layers[i].toObject())); } - QDir styleDir = QFileInfo(fileName).absoluteDir(); + QDir styleDir(QFileInfo(fileName).absoluteDir()); loadSprites(styleDir, "sprite.json", "sprite.png", _sprites); loadSprites(styleDir, "sprite@2x.json", "sprite@2x.png", _sprites2x); diff --git a/src/text.cpp b/src/text.cpp index 19b957e..a2d7edc 100644 --- a/src/text.cpp +++ b/src/text.cpp @@ -73,7 +73,7 @@ void Text::addLabel(const QString &text, const QImage &icon, ti->setHalo(_halo); addItem(ti); - QList ci = collidingItems(ti); + QList ci(collidingItems(ti)); for (int i = 0; i < ci.size(); i++) ci[i]->setVisible(false); }