blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 19:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

GCC fixes for MapProvider iterator

Browse source
This commit is contained in:
Dan Paulat 2023-04-30 18:38:48 -05:00
parent 98ab8904be
commit 1c1864e45d
3 changed files with 24 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/source/scwx/qt/map/map_provider.hpp
View file

@ -19,8 +19,9 @@ enum class MapProvider
MapTiler,
Unknown
};
typedef util::Iterator<MapProvider, MapProvider::Mapbox, MapProvider::MapTiler>
MapProviderIterator;
typedef scwx::util::
Iterator<MapProvider, MapProvider::Mapbox, MapProvider::MapTiler>
MapProviderIterator;
struct MapStyle
{

24
scwx-qt/source/scwx/qt/settings/general_settings.cpp
View file

@ -41,15 +41,21 @@ public:
mapProvider_.SetValidator(
[](const std::string& value)
{
return std::find_if(map::MapProviderIterator().begin(),
map::MapProviderIterator().end(),
[&value](map::MapProvider mapProvider)
{
std::string mapProviderName =
map::GetMapProviderName(mapProvider);
boost::to_lower(mapProviderName);
return value == mapProviderName;
}) != map::MapProviderIterator().end();
for (map::MapProvider mapProvider : map::MapProviderIterator())
{
// If the value is equal to a lower case map provider name
std::string mapProviderName =
map::GetMapProviderName(mapProvider);
boost::to_lower(mapProviderName);
if (value == mapProviderName)
{
// Regard as a match, valid
return true;
}
}
// No match found, invalid
return false;
});
mapboxApiKey_.SetValidator([](const std::string& value)
{ return !value.empty(); });

15
scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
View file

@ -329,16 +329,13 @@ void SettingsDialogImpl::SetupGeneralTab()
mapProvider_.SetMapFromValueFunction(
[](const std::string& text) -> std::string
{
auto it = std::find_if(
map::MapProviderIterator().begin(),
map::MapProviderIterator().end(),
[&text](map::MapProvider mapProvider)
{ return boost::iequals(text, GetMapProviderName(mapProvider)); });
if (it != map::MapProviderIterator().end())
for (map::MapProvider mapProvider : map::MapProviderIterator())
{
// Return map provider label
return GetMapProviderName(*it);
if (boost::iequals(text, map::GetMapProviderName(mapProvider)))
{
// Return map provider label
return GetMapProviderName(mapProvider);
}
}
// Map provider label not found, return unknown