Skip to content

Commit 645514a

Browse files
wonder-skwonder-sk
committedNov 14, 2016
Remove setLayerName(), layerName() from QgsLayerTreeLayer
(replaced by setName(), name() overridden from the parent)
·
ltr-3_40final-3_0_0
1 parent 9950b08 commit 645514a

File tree

9 files changed

+15
-25
lines changed

9 files changed

+15
-25
lines changed
 

‎doc/api_break.dox

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,12 @@ QgsLayerTreeGroup {#qgis_api_break_3_0_QgsLayerTreeGroup}
941941
- readChildrenFromXML() has been renamed to readChildrenFromXml()
942942

943943

944+
QgsLayerTreeLayer {#qgis_api_break_3_0_QgsLayerTreeLayer}
945+
-----------------
946+
947+
- setLayerName(), layerName() were renamed to setName(), name()
948+
949+
944950
QgsLayerTreeModel {#qgis_api_break_3_0_QgsLayerTreeMode}
945951
-----------------
946952

‎python/core/layertree/qgslayertreelayer.sip

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ class QgsLayerTreeLayer : QgsLayerTreeNode
3838
//! @note added in 3.0
3939
void setName( const QString& n );
4040

41-
QString layerName() const;
42-
void setLayerName( const QString& n );
43-
4441
Qt::CheckState isVisible() const;
4542
void setVisible( Qt::CheckState visible );
4643

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ void QgsComposerLegendWidget::on_mItemTreeView_doubleClicked( const QModelIndex
996996
}
997997
else if ( QgsLayerTree::isLayer( currentNode ) )
998998
{
999-
currentText = QgsLayerTree::toLayer( currentNode )->layerName();
999+
currentText = QgsLayerTree::toLayer( currentNode )->name();
10001000
QVariant v = currentNode->customProperty( QStringLiteral( "legend/title-label" ) );
10011001
if ( !v.isNull() )
10021002
currentText = v.toString();

‎src/app/qgsprojectlayergroupdialog.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ QStringList QgsProjectLayerGroupDialog::selectedLayerNames() const
9292
{
9393
QgsLayerTreeNode* node = model->index2node( index );
9494
if ( QgsLayerTree::isLayer( node ) )
95-
layerNames << QgsLayerTree::toLayer( node )->layerName();
95+
layerNames << QgsLayerTree::toLayer( node )->name();
9696
}
9797
return layerNames;
9898
}

‎src/core/layertree/qgslayertreelayer.cpp

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,11 @@ void QgsLayerTreeLayer::attachToLayer()
7272
}
7373

7474
QString QgsLayerTreeLayer::name() const
75-
{
76-
return layerName();
77-
}
78-
79-
void QgsLayerTreeLayer::setName( const QString& n )
80-
{
81-
setLayerName( n );
82-
}
83-
84-
QString QgsLayerTreeLayer::layerName() const
8575
{
8676
return mLayer ? mLayer->name() : mLayerName;
8777
}
8878

89-
void QgsLayerTreeLayer::setLayerName( const QString& n )
79+
void QgsLayerTreeLayer::setName( const QString& n )
9080
{
9181
if ( mLayer )
9282
{
@@ -144,7 +134,7 @@ void QgsLayerTreeLayer::writeXml( QDomElement& parentElement )
144134
QDomDocument doc = parentElement.ownerDocument();
145135
QDomElement elem = doc.createElement( QStringLiteral( "layer-tree-layer" ) );
146136
elem.setAttribute( QStringLiteral( "id" ), mLayerId );
147-
elem.setAttribute( QStringLiteral( "name" ), layerName() );
137+
elem.setAttribute( QStringLiteral( "name" ), name() );
148138
elem.setAttribute( QStringLiteral( "checked" ), QgsLayerTreeUtils::checkStateToXml( mVisible ) );
149139
elem.setAttribute( QStringLiteral( "expanded" ), mExpanded ? "1" : "0" );
150140

@@ -155,7 +145,7 @@ void QgsLayerTreeLayer::writeXml( QDomElement& parentElement )
155145

156146
QString QgsLayerTreeLayer::dump() const
157147
{
158-
return QStringLiteral( "LAYER: %1 visible=%2 expanded=%3 id=%4\n" ).arg( layerName() ).arg( mVisible ).arg( mExpanded ).arg( layerId() );
148+
return QStringLiteral( "LAYER: %1 visible=%2 expanded=%3 id=%4\n" ).arg( name() ).arg( mVisible ).arg( mExpanded ).arg( layerId() );
159149
}
160150

161151
QgsLayerTreeLayer* QgsLayerTreeLayer::clone() const

‎src/core/layertree/qgslayertreelayer.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ class CORE_EXPORT QgsLayerTreeLayer : public QgsLayerTreeNode
5858
//! @note added in 3.0
5959
void setName( const QString& n ) override;
6060

61-
QString layerName() const;
62-
void setLayerName( const QString& n );
63-
6461
Qt::CheckState isVisible() const { return mVisible; }
6562
void setVisible( Qt::CheckState visible );
6663

‎src/core/layertree/qgslayertreemodel.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
198198
if ( QgsLayerTree::isLayer( node ) )
199199
{
200200
QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node );
201-
QString name = nodeLayer->layerName();
201+
QString name = nodeLayer->name();
202202
if ( nodeLayer->customProperty( QStringLiteral( "showFeatureCount" ), 0 ).toInt() && role == Qt::DisplayRole )
203203
{
204204
QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( nodeLayer->layer() );
@@ -417,7 +417,7 @@ bool QgsLayerTreeModel::setData( const QModelIndex& index, const QVariant& value
417417
if ( QgsLayerTree::isLayer( node ) )
418418
{
419419
QgsLayerTreeLayer* layer = QgsLayerTree::toLayer( node );
420-
layer->setLayerName( value.toString() );
420+
layer->setName( value.toString() );
421421
emit dataChanged( index, index );
422422
}
423423
else if ( QgsLayerTree::isGroup( node ) )

‎src/core/layertree/qgslayertreemodellegendnode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ void QgsSymbolLegendNode::updateLabel()
457457

458458
if ( mEmbeddedInParent )
459459
{
460-
QString layerName = mLayerNode->layerName();
460+
QString layerName = mLayerNode->name();
461461
if ( !mLayerNode->customProperty( QStringLiteral( "legend/title-label" ) ).isNull() )
462462
layerName = mLayerNode->customProperty( QStringLiteral( "legend/title-label" ) ).toString();
463463

‎src/core/layertree/qgslayertreeutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ static QDomElement _writeOldLegendLayer( QDomDocument& doc, QgsLayerTreeLayer* n
113113
layerElem.setAttribute( QStringLiteral( "drawingOrder" ), drawingOrder );
114114
layerElem.setAttribute( QStringLiteral( "open" ), nodeLayer->isExpanded() ? "true" : "false" );
115115
layerElem.setAttribute( QStringLiteral( "checked" ), QgsLayerTreeUtils::checkStateToXml( nodeLayer->isVisible() ) );
116-
layerElem.setAttribute( QStringLiteral( "name" ), nodeLayer->layerName() );
116+
layerElem.setAttribute( QStringLiteral( "name" ), nodeLayer->name() );
117117
layerElem.setAttribute( QStringLiteral( "showFeatureCount" ), nodeLayer->customProperty( QStringLiteral( "showFeatureCount" ) ).toInt() );
118118

119119
QDomElement fileGroupElem = doc.createElement( QStringLiteral( "filegroup" ) );

0 commit comments

Comments
 (0)
Please sign in to comment.