Skip to content
Permalink
Browse files

Followup f3482d2: mapThemeStyleOverrides is plural

  • Loading branch information
m-kuhn committed Nov 23, 2016
1 parent 73d9c4a commit 7726205dc307e8c00680949877e070459e4ee40d
@@ -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
@@ -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();
@@ -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>();
}
@@ -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 ) )
@@ -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

0 comments on commit 7726205

Please sign in to comment.
You can’t perform that action at this time.