rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

LP-10 Fix shadowing warning in OPMapGadgetConfiguration

Browse Source
This commit is contained in:
Stefan Karlsson 2015-07-12 22:33:38 +02:00
parent c57ca08911
commit e44bafaee5
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/opmap/opmapgadget.cpp
View File

@ -45,7 +45,7 @@ void OPMapGadget::saveDefaultLocation(double lng, double lat, double zoom)
m_config->setLatitude(lat);
m_config->setLongitude(lng);
m_config->setZoom(zoom);
m_config->saveConfig();
m_config->save();
}
}

16
ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.cpp
View File

@ -105,23 +105,13 @@ IUAVGadgetConfiguration *OPMapGadgetConfiguration::clone()
return m;
}
void OPMapGadgetConfiguration::saveConfig() const
void OPMapGadgetConfiguration::save() const
{
if (!m_settings) {
return;
}
m_settings->setValue("mapProvider", m_mapProvider);
m_settings->setValue("defaultZoom", m_defaultZoom);
m_settings->setValue("defaultLatitude", m_defaultLatitude);
m_settings->setValue("defaultLongitude", m_defaultLongitude);
m_settings->setValue("useOpenGL", m_useOpenGL);
m_settings->setValue("showTileGridLines", m_showTileGridLines);
m_settings->setValue("accessMode", m_accessMode);
m_settings->setValue("useMemoryCache", m_useMemoryCache);
m_settings->setValue("uavSymbol", m_uavSymbol);
m_settings->setValue("cacheLocation", Utils::RemoveStoragePath(m_cacheLocation));
m_settings->setValue("maxUpdateRate", m_maxUpdateRate);
m_settings->setValue("overlayOpacity", m_opacity);
saveConfig(m_settings);
}
void OPMapGadgetConfiguration::saveConfig(QSettings *qSettings) const
{

2
ground/openpilotgcs/src/plugins/opmap/opmapgadgetconfiguration.h
View File

@ -101,7 +101,7 @@ public:
{
return m_opacity;
}
void saveConfig() const;
void save() const;
public slots:
void setMapProvider(QString provider)
{