Skip to content

Commit 7726205

Browse files
committed
Followup f3482d2: mapThemeStyleOverrides is plural
1 parent 73d9c4a commit 7726205

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

python/core/qgsmapthemecollection.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class QgsMapThemeCollection : QObject
114114
/**
115115
* Get layer style overrides (for QgsMapSettings) of the visible layers for given map theme.
116116
*/
117-
QMap<QString, QString> mapThemeStyleOverride( const QString& name );
117+
QMap<QString, QString> mapThemeStyleOverrides( const QString& name );
118118

119119
/**
120120
* Reads the map theme collection state from XML

src/app/composer/qgscomposermapwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ void QgsComposerMapWidget::keepLayersVisibilityPresetSelected()
206206

207207
mKeepLayerStylesCheckBox->setChecked( true );
208208

209-
mComposerMap->setLayerStyleOverrides( QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverride( presetName ) );
209+
mComposerMap->setLayerStyleOverrides( QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverrides( presetName ) );
210210

211211
mComposerMap->cache();
212212
mComposerMap->update();

src/core/composer/qgscomposermap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ QMap<QString, QString> QgsComposerMap::layerStyleOverridesToRender( const QgsExp
599599
}
600600

601601
if ( QgsProject::instance()->mapThemeCollection()->hasMapTheme( presetName ) )
602-
return QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverride( presetName );
602+
return QgsProject::instance()->mapThemeCollection()->mapThemeStyleOverrides( presetName );
603603
else
604604
return QMap<QString, QString>();
605605
}

src/core/qgsmapthemecollection.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ void QgsMapThemeCollection::applyMapThemeCheckedLegendNodesToLayer( const QStrin
131131
}
132132

133133

134-
QMap<QString, QString> QgsMapThemeCollection::mapThemeStyleOverride( const QString& presetName )
134+
QMap<QString, QString> QgsMapThemeCollection::mapThemeStyleOverrides( const QString& presetName )
135135
{
136136
QMap<QString, QString> styleOverrides;
137137
if ( !mMapThemes.contains( presetName ) )

src/core/qgsmapthemecollection.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class CORE_EXPORT QgsMapThemeCollection : public QObject
174174
* Get layer style overrides (for QgsMapSettings) of the visible layers for given map theme.
175175
* @note Added in QGIS 3.0
176176
*/
177-
QMap<QString, QString> mapThemeStyleOverride( const QString& name );
177+
QMap<QString, QString> mapThemeStyleOverrides( const QString& name );
178178

179179
/**
180180
* Reads the map theme collection state from XML

0 commit comments

Comments
 (0)