Skip to content

Commit b30ac31

Browse files
committed
[layertree] Rename childLayerIds() to findLayerIds()
1 parent 04dc5d8 commit b30ac31

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/core/layertree/qgslayertreegroup.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ void QgsLayerTreeGroup::setVisible( Qt::CheckState state )
259259
}
260260
}
261261

262-
QStringList QgsLayerTreeGroup::childLayerIds() const
262+
QStringList QgsLayerTreeGroup::findLayerIds() const
263263
{
264264
QStringList lst;
265265
foreach ( QgsLayerTreeNode* child, mChildren )
266266
{
267267
if ( QgsLayerTree::isGroup( child ) )
268-
lst << QgsLayerTree::toGroup( child )->childLayerIds();
268+
lst << QgsLayerTree::toGroup( child )->findLayerIds();
269269
else if ( QgsLayerTree::isLayer( child ) )
270270
lst << QgsLayerTree::toLayer( child )->layerId();
271271
}

src/core/layertree/qgslayertreegroup.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class CORE_EXPORT QgsLayerTreeGroup : public QgsLayerTreeNode
5454

5555
QgsLayerTreeLayer* findLayer( const QString& layerId );
5656
QList<QgsLayerTreeLayer*> findLayers() const;
57+
QStringList findLayerIds() const;
5758
QgsLayerTreeGroup* findGroup( const QString& name );
5859

5960
static QgsLayerTreeGroup* readXML( QDomElement& element );
@@ -68,8 +69,6 @@ class CORE_EXPORT QgsLayerTreeGroup : public QgsLayerTreeNode
6869
Qt::CheckState isVisible() const { return mChecked; }
6970
void setVisible( Qt::CheckState state );
7071

71-
QStringList childLayerIds() const;
72-
7372
protected slots:
7473
void layerDestroyed();
7574
void nodeVisibilityChanged( QgsLayerTreeNode* node );

src/core/qgsproject.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,7 @@ QgsLayerTreeGroup* QgsProject::createEmbeddedGroup( const QString& groupName, co
18471847
mLayerTreeRegistryBridge->setEnabled( true );
18481848

18491849
// consider the layers might be identify disabled in its project
1850-
foreach ( QString layerId, newGroup->childLayerIds() )
1850+
foreach ( QString layerId, newGroup->findLayerIds() )
18511851
{
18521852
if ( embeddedIdentifyDisabledLayers.contains( layerId ) )
18531853
{

src/gui/layertree/qgslayertreeviewdefaultactions.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ void QgsLayerTreeViewDefaultActions::zoomToLayer( QgsMapCanvas* canvas )
168168
void QgsLayerTreeViewDefaultActions::zoomToGroup( QgsMapCanvas* canvas )
169169
{
170170
QList<QgsMapLayer*> layers;
171-
foreach ( QString layerId, mView->currentGroupNode()->childLayerIds() )
171+
foreach ( QString layerId, mView->currentGroupNode()->findLayerIds() )
172172
layers << QgsMapLayerRegistry::instance()->mapLayer( layerId );
173173

174174
zoomToLayers( canvas, layers );

0 commit comments

Comments
 (0)