From 0b31551a0871986059036c880893c2198c5466e4 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Thu, 12 Jan 2023 09:08:14 +1000
Subject: [PATCH] Fix some warnings

---
 .../vector/qgsvectorlayerproperties.sip.in           |  1 +
 src/gui/vector/qgsvectorlayerproperties.cpp          | 12 +++++-------
 src/gui/vector/qgsvectorlayerproperties.h            |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in b/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in
index ec4565292b5..c529899bef3 100644
--- a/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in
+++ b/python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in
@@ -28,6 +28,7 @@ Adds a properties page factory to the vector layer properties dialog.
 %End
 
   protected slots:
+    void optionsStackedWidget_CurrentChanged( int index ) final;
 
   signals:
 
diff --git a/src/gui/vector/qgsvectorlayerproperties.cpp b/src/gui/vector/qgsvectorlayerproperties.cpp
index 292aaff89c7..70f0ef78daa 100644
--- a/src/gui/vector/qgsvectorlayerproperties.cpp
+++ b/src/gui/vector/qgsvectorlayerproperties.cpp
@@ -1329,9 +1329,8 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
               while ( QFile::exists( safePath ) )
               {
                 const QFileInfo fi { filePath };
-                safePath = QString( filePath ).replace( '.' + fi.completeSuffix(), QStringLiteral( "_%1.%2" )
-                                                        .arg( QString::number( i ) )
-                                                        .arg( fi.completeSuffix() ) );
+                safePath = QString( filePath ).replace( '.' + fi.completeSuffix(),
+                                                        QStringLiteral( "_%1.%2" ).arg( QString::number( i ), fi.completeSuffix() ) );
                 i++;
               }
             }
@@ -1356,8 +1355,7 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
           case DB:
           {
             QString infoWindowTitle = QObject::tr( "Save style '%1' to DB (%2)" )
-                                      .arg( styleName )
-                                      .arg( mLayer->providerType() );
+                                      .arg( styleName, mLayer->providerType() );
             QString msgError;
 
             QgsVectorLayerSaveStyleDialog::SaveToDbSettings dbSettings = dlg.saveToDbSettings();
@@ -1375,7 +1373,7 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
               int i = 1;
               while ( names.contains( name ) )
               {
-                name = QStringLiteral( "%1 %2" ).arg( name ).arg( QString::number( i ) );
+                name = QStringLiteral( "%1 %2" ).arg( name, QString::number( i ) );
                 i++;
               }
             }
@@ -1891,7 +1889,7 @@ void QgsVectorLayerProperties::addWmsDimensionInfoToTreeWidget( const QgsMapLaye
 
   QTreeWidgetItem *childWmsDimensionDefaultValue = new QTreeWidgetItem();
   childWmsDimensionDefaultValue->setText( 0, tr( "Default display" ) );
-  childWmsDimensionDefaultValue->setText( 1, QgsMapLayerServerProperties::wmsDimensionDefaultDisplayLabels()[wmsDim.defaultDisplayType] );
+  childWmsDimensionDefaultValue->setText( 1, QgsMapLayerServerProperties::wmsDimensionDefaultDisplayLabels().value( wmsDim.defaultDisplayType ) );
   childWmsDimensionDefaultValue->setFlags( Qt::ItemIsEnabled );
   wmsDimensionItem->addChild( childWmsDimensionDefaultValue );
 
diff --git a/src/gui/vector/qgsvectorlayerproperties.h b/src/gui/vector/qgsvectorlayerproperties.h
index 15b3778867a..d2b91c06000 100644
--- a/src/gui/vector/qgsvectorlayerproperties.h
+++ b/src/gui/vector/qgsvectorlayerproperties.h
@@ -76,7 +76,7 @@ class GUI_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
     void addPropertiesPageFactory( const QgsMapLayerConfigWidgetFactory *factory );
 
   protected slots:
-    void optionsStackedWidget_CurrentChanged( int index ) override SIP_SKIP;
+    void optionsStackedWidget_CurrentChanged( int index ) final;
 
   private slots: