sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings

Browse Source
This commit is contained in:
Nyall Dawson 2023-07-05 09:42:53 +10:00
parent 9e12fd66aa
commit cf2c68196f
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/qgisapp.cpp
View File

@ -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;
}
}

27
src/gui/qgsmaplayerstylemanagerwidget.cpp
View File

@ -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;
}
}