Followup f3482d2: mapThemeStyleOverrides is plural

qgis · Nov 23, 2016 · 7726205 · 7726205
1 parent 73d9c4a
commit 7726205
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/python/core/qgsmapthemecollection.sip b/python/core/qgsmapthemecollection.sip
@@ -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

diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
@@ -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();

diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
@@ -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>();
   }

diff --git a/src/core/qgsmapthemecollection.cpp b/src/core/qgsmapthemecollection.cpp
@@ -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 ) )

diff --git a/src/core/qgsmapthemecollection.h b/src/core/qgsmapthemecollection.h
@@ -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