From cf2c68196f049316df1a7f8009075fac52ef1ea7 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Wed, 5 Jul 2023 09:42:53 +1000
Subject: [PATCH] Fix some warnings

---
 src/app/qgisapp.cpp                       |  6 ++---
 src/gui/qgsmaplayerstylemanagerwidget.cpp | 27 +++++++++--------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 18d3490d391..81924bf53b6 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -8298,13 +8298,13 @@ void QgisApp::saveStyleFile( QgsMapLayer *layer )
       break;
 
     case Qgis::LayerType::Mesh:
-      QgsMeshLayerProperties( layer, mMapCanvas ).saveStyleAs();
+      QgsMeshLayerProperties( layer, mMapCanvas ).saveStyleToFile();
       break;
 
     case Qgis::LayerType::VectorTile:
       QgsVectorTileLayerProperties( qobject_cast<QgsVectorTileLayer *>( layer ),
                                     mMapCanvas,
-                                    visibleMessageBar() ).saveStyleAs();
+                                    visibleMessageBar() ).saveStyleToFile();
       break;
 
     case Qgis::LayerType::PointCloud:
@@ -8315,9 +8315,9 @@ void QgisApp::saveStyleFile( QgsMapLayer *layer )
 
     // Not available for these
     case Qgis::LayerType::Annotation:
+    case Qgis::LayerType::TiledMesh:
     case Qgis::LayerType::Plugin:
     case Qgis::LayerType::Group:
-    default:
       break;
   }
 }
diff --git a/src/gui/qgsmaplayerstylemanagerwidget.cpp b/src/gui/qgsmaplayerstylemanagerwidget.cpp
index 3e94e00e0f1..d0a6724df58 100644
--- a/src/gui/qgsmaplayerstylemanagerwidget.cpp
+++ b/src/gui/qgsmaplayerstylemanagerwidget.cpp
@@ -20,19 +20,14 @@
 #include <QFileDialog>
 
 #include "qgsmaplayerstylemanagerwidget.h"
-#include "qgssettings.h"
 #include "qgslogger.h"
 #include "qgsmaplayer.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaplayerconfigwidget.h"
 #include "qgsmaplayerstylemanager.h"
-#include "qgsvectordataprovider.h"
-#include "qgsrasterdataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectortilelayer.h"
-#include "qgsrasterlayer.h"
 #include "qgsapplication.h"
-#include "qgsproviderregistry.h"
 #include "qgsvectorlayerproperties.h"
 #include "qgsvectortilelayerproperties.h"
 #include "qgsrasterlayerproperties.h"
@@ -196,25 +191,25 @@ void QgsMapLayerStyleManagerWidget::saveAsDefault()
       break;
 
     case Qgis::LayerType::Raster:
-      QgsRasterLayerProperties( mLayer, mMapCanvas ).saveDefaultStyle();
+      QgsRasterLayerProperties( mLayer, mMapCanvas ).saveStyleAsDefault();
       break;
 
     case Qgis::LayerType::Mesh:
-      QgsMeshLayerProperties( mLayer, mMapCanvas ).saveDefaultStyle();
+      QgsMeshLayerProperties( mLayer, mMapCanvas ).saveStyleAsDefault();
       break;
 
     case Qgis::LayerType::VectorTile:
       QgsVectorTileLayerProperties( qobject_cast<QgsVectorTileLayer *>( mLayer ),
                                     mMapCanvas,
-                                    mMapLayerConfigWidgetContext.messageBar() ).saveDefaultStyle();
+                                    mMapLayerConfigWidgetContext.messageBar() ).saveStyleAsDefault();
       break;
 
     // Not available for these
     case Qgis::LayerType::PointCloud:
     case Qgis::LayerType::Annotation:
+    case Qgis::LayerType::TiledMesh:
     case Qgis::LayerType::Plugin:
     case Qgis::LayerType::Group:
-    default:
       break;
   }
 }
@@ -250,9 +245,9 @@ void QgsMapLayerStyleManagerWidget::loadDefault()
     // Not available for these
     case Qgis::LayerType::PointCloud:
     case Qgis::LayerType::Annotation:
+    case Qgis::LayerType::TiledMesh:
     case Qgis::LayerType::Plugin:
     case Qgis::LayerType::Group:
-    default:
       break;
   }
 }
@@ -276,21 +271,21 @@ void QgsMapLayerStyleManagerWidget::saveStyle()
       break;
 
     case Qgis::LayerType::Mesh:
-      QgsMeshLayerProperties( mLayer, mMapCanvas ).saveStyleAs();
+      QgsMeshLayerProperties( mLayer, mMapCanvas ).saveStyleToFile();
       break;
 
     case Qgis::LayerType::VectorTile:
       QgsVectorTileLayerProperties( qobject_cast<QgsVectorTileLayer *>( mLayer ),
                                     mMapCanvas,
-                                    mMapLayerConfigWidgetContext.messageBar() ).saveStyleAs();
+                                    mMapLayerConfigWidgetContext.messageBar() ).saveStyleToFile();
       break;
 
     // Not available for these
     case Qgis::LayerType::PointCloud:
     case Qgis::LayerType::Annotation:
+    case Qgis::LayerType::TiledMesh:
     case Qgis::LayerType::Plugin:
     case Qgis::LayerType::Group:
-    default:
       break;
   }
 }
@@ -310,11 +305,11 @@ void QgsMapLayerStyleManagerWidget::loadStyle()
       break;
 
     case Qgis::LayerType::Raster:
-      QgsRasterLayerProperties( mLayer, mMapCanvas ).loadStyle();
+      QgsRasterLayerProperties( mLayer, mMapCanvas ).loadStyleFromFile();
       break;
 
     case Qgis::LayerType::Mesh:
-      QgsMeshLayerProperties( mLayer, mMapCanvas ).loadStyle();
+      QgsMeshLayerProperties( mLayer, mMapCanvas ).loadStyleFromFile();
       break;
 
     case Qgis::LayerType::VectorTile:
@@ -326,9 +321,9 @@ void QgsMapLayerStyleManagerWidget::loadStyle()
     // Not available for these
     case Qgis::LayerType::PointCloud:
     case Qgis::LayerType::Annotation:
+    case Qgis::LayerType::TiledMesh:
     case Qgis::LayerType::Plugin:
     case Qgis::LayerType::Group:
-    default:
       break;
   }
 }