Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[Backport release-3_40] Fix maybe uninitialized warnings in QgsLayerTreeRegistryBridge::layersAdded #60606

Merged
merged 1 commit into from
Feb 14, 2025
Merged

[Backport release-3_40] Fix maybe uninitialized warnings in QgsLayerTreeRegistryBridge::layersAdded #60606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/core/layertree/qgslayertreeregistrybridge.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
if ( !mEnabled )
return;

QList<QgsLayerTreeNode *> nodes;
QList<QgsLayerTreeNode *> newNodes;
for ( QgsMapLayer *layer : layers )
{
QgsLayerTreeLayer *nodeLayer;
QgsLayerTreeLayer *nodeLayer = nullptr;
switch ( mInsertionMethod )
{
case Qgis::LayerTreeInsertionMethod::OptimalInInsertionGroup:
Expand All @@ -72,6 +72,7 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
if ( !targetGroup )
targetGroup = mRoot;

// returned layer is already owned by the group!
nodeLayer = QgsLayerTreeUtils::insertLayerAtOptimalPlacement( targetGroup, layer );
break;
}
Expand All @@ -80,13 +81,15 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
case Qgis::LayerTreeInsertionMethod::TopOfTree:
{
nodeLayer = new QgsLayerTreeLayer( layer );
newNodes << nodeLayer;
break;
}
}

nodeLayer->setItemVisibilityChecked( mNewLayersVisible );
if ( !nodeLayer )
continue;

nodes << nodeLayer;
nodeLayer->setItemVisibilityChecked( mNewLayersVisible );

// check whether the layer is marked as embedded
const QString projectFile = mProject->layerIsEmbedded( nodeLayer->layerId() );
Expand All @@ -102,13 +105,13 @@ void QgsLayerTreeRegistryBridge::layersAdded( const QList<QgsMapLayer *> &layers
case Qgis::LayerTreeInsertionMethod::AboveInsertionPoint:
if ( QgsLayerTreeGroup *group = mInsertionPointGroup )
{
group->insertChildNodes( mInsertionPointPosition, nodes );
group->insertChildNodes( mInsertionPointPosition, newNodes );
break;
}
// if no group for the insertion point, then insert into root instead
[[fallthrough]];
case Qgis::LayerTreeInsertionMethod::TopOfTree:
mRoot->insertChildNodes( 0, nodes );
mRoot->insertChildNodes( 0, newNodes );
break;
case Qgis::LayerTreeInsertionMethod::OptimalInInsertionGroup:
break;
Expand Down
Loading