From 16c2fae408d81ef91d77690e7c8c1a40067ef9ad Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 27 Feb 2024 23:47:10 -0600 Subject: [PATCH] QMapLibre test refactoring --- test/source/scwx/qt/map/map_provider.test.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/source/scwx/qt/map/map_provider.test.cpp b/test/source/scwx/qt/map/map_provider.test.cpp index 8b330de9..3a6a64a5 100644 --- a/test/source/scwx/qt/map/map_provider.test.cpp +++ b/test/source/scwx/qt/map/map_provider.test.cpp @@ -3,10 +3,10 @@ #include #include -#include #include #include +#include #include namespace scwx @@ -45,22 +45,22 @@ TEST_P(ByMapProviderTest, MapProviderLayers) // Configure map provider const MapProviderInfo& mapProviderInfo = GetMapProviderInfo(mapProvider); - // Configure QMapLibreGL - QMapLibreGL::Settings mapSettings {}; - mapSettings.resetToTemplate(mapProviderInfo.settingsTemplate_); + // Configure QMapLibre + QMapLibre::Settings mapSettings {}; + mapSettings.setProviderTemplate(mapProviderInfo.providerTemplate_); mapSettings.setApiKey(QString::fromStdString(apiKey)); - QMapLibreGL::Map map(nullptr, mapSettings, QSize(1, 1)); + QMapLibre::Map map(nullptr, mapSettings, QSize(1, 1)); application.processEvents(); // Connect style load completion signal QObject::connect( &map, - &QMapLibreGL::Map::mapChanged, - [&](QMapLibreGL::Map::MapChange mapChange) + &QMapLibre::Map::mapChanged, + [&](QMapLibre::Map::MapChange mapChange) { if (mapChange == - QMapLibreGL::Map::MapChange::MapChangeDidFinishLoadingStyle) + QMapLibre::Map::MapChange::MapChangeDidFinishLoadingStyle) { application.exit(); }