sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Followup f3482d2: mapThemeStyleOverrides is plural

Browse Source
This commit is contained in:
Matthias Kuhn 2016-11-23 15:51:10 +01:00
parent 73d9c4a295
commit 7726205dc3
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsmapthemecollection.sip
View File

@ -114,7 +114,7 @@ class QgsMapThemeCollection : QObject
/**
* Get layer style overrides (for QgsMapSettings) of the visible layers for given map theme.
*/
QMap<QString, QString> mapThemeStyleOverride( const QString& name );
QMap<QString, QString> mapThemeStyleOverrides( const QString& name );
/**
* Reads the map theme collection state from XML

2
src/app/composer/qgscomposermapwidget.cpp
View File

@ -206,7 +206,7 @@ void QgsComposerMapWidget::keepLayersVisibilityPresetSelected()
mKeepLayerStylesCheckBox->setChecked( true );
mComposerMap->setLayerStyleOverrides( QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverride( presetName ) );
mComposerMap->setLayerStyleOverrides( QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverrides( presetName ) );
mComposerMap->cache();
mComposerMap->update();

2
src/core/composer/qgscomposermap.cpp
View File

@ -599,7 +599,7 @@ QMap<QString, QString> QgsComposerMap::layerStyleOverridesToRender( const QgsExp
}
if ( QgsProject::instance()->mapThemeCollection()->hasMapTheme( presetName ) )
return QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverride( presetName );
return QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverrides( presetName );
else
return QMap<QString, QString>();
}

2
src/core/qgsmapthemecollection.cpp
View File

@ -131,7 +131,7 @@ void QgsMapThemeCollection::applyMapThemeCheckedLegendNodesToLayer( const QStrin
}
QMap<QString, QString> QgsMapThemeCollection::mapThemeStyleOverride( const QString& presetName )
QMap<QString, QString> QgsMapThemeCollection::mapThemeStyleOverrides( const QString& presetName )
{
QMap<QString, QString> styleOverrides;
if ( !mMapThemes.contains( presetName ) )

2
src/core/qgsmapthemecollection.h
View File

@ -174,7 +174,7 @@ class CORE_EXPORT QgsMapThemeCollection : public QObject
* Get layer style overrides (for QgsMapSettings) of the visible layers for given map theme.
* @note Added in QGIS 3.0
*/
QMap<QString, QString> mapThemeStyleOverride( const QString& name );
QMap<QString, QString> mapThemeStyleOverrides( const QString& name );
/**
* Reads the map theme collection state from XML