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

Update to latest maplibre-gl-native, including rename from QMapboxGL to QMapLibreGL

Browse source
This commit is contained in:
Dan Paulat 2022-10-20 22:54:53 -05:00
parent 243e874b55
commit 2ac141ea1a
30 changed files with 143 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -72,7 +72,7 @@ public:
std::string mapboxApiKey =
manager::SettingsManager::general_settings()->mapbox_api_key();
settings_.resetToTemplate(QMapboxGLSettings::MapboxSettings);
settings_.resetToTemplate(QMapLibreGL::Settings::MapboxSettings);
settings_.setApiKey(QString {mapboxApiKey.c_str()});
settings_.setCacheDatabasePath(QString {cacheDbPath.c_str()});
settings_.setCacheDatabaseMaximumSize(20 * 1024 * 1024);
@ -80,7 +80,6 @@ public:
~MainWindowImpl() = default;
void ConfigureMapLayout();
void ConnectAlertSignals();
void ConnectMapSignals();
void ConnectOtherSignals();
void HandleFocusChange(QWidget* focused);
@ -98,9 +97,9 @@ public:
void UpdateRadarSite();
void UpdateVcp();
MainWindow* mainWindow_;
QMapboxGLSettings settings_;
map::MapWidget* activeMap_;
MainWindow* mainWindow_;
QMapLibreGL::Settings settings_;
map::MapWidget* activeMap_;
ui::Level2ProductsWidget* level2ProductsWidget_;
ui::Level2SettingsWidget* level2SettingsWidget_;