diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/geotestplugin/qplacemanagerengine_test.h | 9 | ||||
| -rw-r--r-- | tests/auto/utils/qlocationtestutils.cpp | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index 7245ccf1..f015afe7 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -474,9 +474,12 @@ public: results.append(r); } } else if (!query.categories().isEmpty()) { - QSet<QPlaceCategory> categories = query.categories().toSet(); - foreach (const QPlace &place, m_places) { - if (place.categories().toSet().intersect(categories).isEmpty()) + const auto &categoryList = query.categories(); + const QSet<QPlaceCategory> categories(categoryList.cbegin(), categoryList.cend()); + for (const QPlace &place : qAsConst(m_places)) { + const auto &placeCategoryList = place.categories(); + const QSet<QPlaceCategory> placeCategories(placeCategoryList.cbegin(), placeCategoryList.cend()); + if (!placeCategories.intersects(categories)) continue; QPlaceResult r; diff --git a/tests/auto/utils/qlocationtestutils.cpp b/tests/auto/utils/qlocationtestutils.cpp index d6e77855..df595daa 100644 --- a/tests/auto/utils/qlocationtestutils.cpp +++ b/tests/auto/utils/qlocationtestutils.cpp @@ -46,8 +46,7 @@ QString QLocationTestUtils::addNmeaChecksumAndBreaks(const QString &sentence) int result = 0; for (int i=1; i<sentence.length()-1; i++) result ^= sentence[i].toLatin1(); - QString sum; - sum.sprintf("%02x", result); + const QString sum = QString::asprintf("%02x", result); return sentence + sum + "\r\n"; } |