root/QtPBFImagePlugin
1
0
Fork 0
mirror of https://github.com/tumic0/QtPBFImagePlugin.git synced 2024-11-24 03:35:54 +01:00
Code Issues Projects Releases Wiki Activity

A better regexp handling

Browse Source
This commit is contained in:
Martin Tůma 2020-12-22 22:30:05 +01:00
parent 60691060ea
commit 29d4008068
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/style.cpp
View File

@ -205,14 +205,14 @@ bool Style::Layer::Filter::match(const PBF::Feature &feature) const
QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const QString Style::Layer::Template::value(int zoom, const PBF::Feature &feature) const
{ {
QRegularExpression rx("(\\{[^\\}]*\\})"); QRegularExpression rx("\\{[^\\}]*\\}");
QString text(_field.value(zoom)); QString text(_field.value(zoom));
QRegularExpressionMatchIterator it = rx.globalMatch(text); QRegularExpressionMatchIterator it = rx.globalMatch(text);
QStringList keys; QStringList keys;
while (it.hasNext()) { while (it.hasNext()) {
QRegularExpressionMatch match = it.next(); QRegularExpressionMatch match = it.next();
QString val = match.captured(1); QString val = match.captured(0);
keys.append(val.mid(1, val.size() - 2)); keys.append(val.mid(1, val.size() - 2));
} }
for (int i = 0; i < keys.size(); i++) { for (int i = 0; i < keys.size(); i++) {