Skip to content
Permalink
Browse files

[qt6] More explicit conversions

  • Loading branch information
m-kuhn authored and nyalldawson committed Mar 31, 2021
1 parent ee47157 commit 39e90463463e068daa9ffb4364d92dcb6ca5875b
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/core/geocms/geonode/qgsgeonoderequest.cpp
  2. +1 −1 src/core/project/qgsproject.cpp
@@ -283,7 +283,7 @@ QList<QgsGeoNodeRequest::ServiceLayerDetail> QgsGeoNodeRequest::parseLayers( con
const QStringList splitUrl = layerMap.value( QStringLiteral( "detail_url" ) ).toString().split( '/' );
layerStruct.typeName = !splitUrl.isEmpty() ? splitUrl.last() : QString();
}
layerStruct.uuid = layerMap.value( QStringLiteral( "uuid" ) ).toString();
layerStruct.uuid = QUuid( layerMap.value( QStringLiteral( "uuid" ) ).toString() );
layerStruct.id = layerMap.value( QStringLiteral( "id" ) ).toString();
layerStruct.name = layerMap.value( QStringLiteral( "name" ) ).toString();
layerStruct.typeName = layerMap.value( QStringLiteral( "typename" ) ).toString();
@@ -3532,7 +3532,7 @@ QgsCoordinateReferenceSystem QgsProject::defaultCrsForNewLayers() const
// TODO QGIS 4.0 -- remove this method, and place it somewhere in app (where it belongs)
// in the meantime, we have a slightly hacky way to read the settings key using an enum which isn't available (since it lives in app)
if ( mSettings.value( QStringLiteral( "/projections/unknownCrsBehavior" ), QStringLiteral( "NoAction" ), QgsSettings::App ).toString() == QStringLiteral( "UseProjectCrs" )
|| mSettings.value( QStringLiteral( "/projections/unknownCrsBehavior" ), 0, QgsSettings::App ).toString() == 2 )
|| mSettings.value( QStringLiteral( "/projections/unknownCrsBehavior" ), 0, QgsSettings::App ).toString() == QLatin1String( "2" ) )
{
// for new layers if the new layer crs method is set to either prompt or use project, then we use the project crs
defaultCrs = crs();

0 comments on commit 39e9046

Please sign in to comment.