Skip to content

Commit 5852c8e

Browse files
committedJun 2, 2014
[layertree] minor consolidation of insert/remove functions
1 parent 990e2bf commit 5852c8e

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed
 

‎src/core/layertree/qgslayertreegroup.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void QgsLayerTreeGroup::insertChildNode( int index, QgsLayerTreeNode* node )
7272
void QgsLayerTreeGroup::insertChildNodes( int index, QList<QgsLayerTreeNode*> nodes )
7373
{
7474
// low-level insert
75-
insertChildren( index, nodes );
75+
insertChildrenPrivate( index, nodes );
7676

7777
updateVisibilityFromChildren();
7878
}
@@ -86,7 +86,7 @@ void QgsLayerTreeGroup::removeChildNode( QgsLayerTreeNode *node )
8686
{
8787
int i = mChildren.indexOf( node );
8888
if ( i >= 0 )
89-
removeChildAt( i );
89+
removeChildren( i, 1 );
9090
}
9191

9292
void QgsLayerTreeGroup::removeLayer( QgsMapLayer* layer )
@@ -98,7 +98,7 @@ void QgsLayerTreeGroup::removeLayer( QgsMapLayer* layer )
9898
QgsLayerTreeLayer* childLayer = QgsLayerTree::toLayer( child );
9999
if ( childLayer->layer() == layer )
100100
{
101-
removeChildAt( mChildren.indexOf( child ) );
101+
removeChildren( mChildren.indexOf( child ), 1 );
102102
break;
103103
}
104104
}
@@ -107,7 +107,7 @@ void QgsLayerTreeGroup::removeLayer( QgsMapLayer* layer )
107107

108108
void QgsLayerTreeGroup::removeChildren( int from, int count )
109109
{
110-
removeChildrenRange( from, count );
110+
removeChildrenPrivate( from, count );
111111

112112
updateVisibilityFromChildren();
113113
}

‎src/core/layertree/qgslayertreenode.cpp

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ QgsLayerTreeNode::QgsLayerTreeNode( const QgsLayerTreeNode& other )
3939
QList<QgsLayerTreeNode*> clonedChildren;
4040
foreach ( QgsLayerTreeNode* child, other.mChildren )
4141
clonedChildren << child->clone();
42-
insertChildren( -1, clonedChildren );
42+
insertChildrenPrivate( -1, clonedChildren );
4343
}
4444

4545
QgsLayerTreeNode::~QgsLayerTreeNode()
@@ -91,14 +91,7 @@ void QgsLayerTreeNode::writeCommonXML( QDomElement& element )
9191
mProperties.writeXml( element, doc );
9292
}
9393

94-
void QgsLayerTreeNode::insertChild( int index, QgsLayerTreeNode *node )
95-
{
96-
QList<QgsLayerTreeNode*> nodes;
97-
nodes << node;
98-
insertChildren( index, nodes );
99-
}
100-
101-
void QgsLayerTreeNode::insertChildren( int index, QList<QgsLayerTreeNode*> nodes )
94+
void QgsLayerTreeNode::insertChildrenPrivate( int index, QList<QgsLayerTreeNode*> nodes )
10295
{
10396
foreach ( QgsLayerTreeNode* node, nodes )
10497
{
@@ -126,12 +119,7 @@ void QgsLayerTreeNode::insertChildren( int index, QList<QgsLayerTreeNode*> nodes
126119
emit addedChildren( this, index, indexTo );
127120
}
128121

129-
void QgsLayerTreeNode::removeChildAt( int i )
130-
{
131-
removeChildrenRange( i, 1 );
132-
}
133-
134-
void QgsLayerTreeNode::removeChildrenRange( int from, int count )
122+
void QgsLayerTreeNode::removeChildrenPrivate( int from, int count )
135123
{
136124
if ( count <= 0 )
137125
return;

‎src/core/layertree/qgslayertreenode.h

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,10 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject
130130
void readCommonXML( QDomElement& element );
131131
void writeCommonXML( QDomElement& element );
132132

133-
// the child must not be in any tree yet!
134-
void insertChildren( int index, QList<QgsLayerTreeNode*> nodes );
135-
void insertChild( int index, QgsLayerTreeNode* node );
136-
void removeChildAt( int i );
137-
void removeChildrenRange( int from, int count );
133+
//! Low-level insertion of children to the node. The children must not have any parent yet!
134+
void insertChildrenPrivate( int index, QList<QgsLayerTreeNode*> nodes );
135+
//! Low-level removal of children from the node.
136+
void removeChildrenPrivate( int from, int count );
138137

139138

140139
protected:

0 commit comments

Comments
 (0)
Please sign in to comment.