From 645514a23b266a3af9446dbd56adf69477e8541c Mon Sep 17 00:00:00 2001 From: Martin Dobias Date: Tue, 15 Nov 2016 00:56:22 +0800 Subject: [PATCH] Remove setLayerName(), layerName() from QgsLayerTreeLayer (replaced by setName(), name() overridden from the parent) --- doc/api_break.dox | 6 ++++++ python/core/layertree/qgslayertreelayer.sip | 3 --- src/app/composer/qgscomposerlegendwidget.cpp | 2 +- src/app/qgsprojectlayergroupdialog.cpp | 2 +- src/core/layertree/qgslayertreelayer.cpp | 16 +++------------- src/core/layertree/qgslayertreelayer.h | 3 --- src/core/layertree/qgslayertreemodel.cpp | 4 ++-- .../layertree/qgslayertreemodellegendnode.cpp | 2 +- src/core/layertree/qgslayertreeutils.cpp | 2 +- 9 files changed, 15 insertions(+), 25 deletions(-) diff --git a/doc/api_break.dox b/doc/api_break.dox index c5d2a06be28..b61e5aa7880 100644 --- a/doc/api_break.dox +++ b/doc/api_break.dox @@ -941,6 +941,12 @@ QgsLayerTreeGroup {#qgis_api_break_3_0_QgsLayerTreeGroup} - readChildrenFromXML() has been renamed to readChildrenFromXml() +QgsLayerTreeLayer {#qgis_api_break_3_0_QgsLayerTreeLayer} +----------------- + +- setLayerName(), layerName() were renamed to setName(), name() + + QgsLayerTreeModel {#qgis_api_break_3_0_QgsLayerTreeMode} ----------------- diff --git a/python/core/layertree/qgslayertreelayer.sip b/python/core/layertree/qgslayertreelayer.sip index 2c399473357..a961dc99eb6 100644 --- a/python/core/layertree/qgslayertreelayer.sip +++ b/python/core/layertree/qgslayertreelayer.sip @@ -38,9 +38,6 @@ class QgsLayerTreeLayer : QgsLayerTreeNode //! @note added in 3.0 void setName( const QString& n ); - QString layerName() const; - void setLayerName( const QString& n ); - Qt::CheckState isVisible() const; void setVisible( Qt::CheckState visible ); diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp index 287715c03b8..36e1b38e8bc 100644 --- a/src/app/composer/qgscomposerlegendwidget.cpp +++ b/src/app/composer/qgscomposerlegendwidget.cpp @@ -996,7 +996,7 @@ void QgsComposerLegendWidget::on_mItemTreeView_doubleClicked( const QModelIndex } else if ( QgsLayerTree::isLayer( currentNode ) ) { - currentText = QgsLayerTree::toLayer( currentNode )->layerName(); + currentText = QgsLayerTree::toLayer( currentNode )->name(); QVariant v = currentNode->customProperty( QStringLiteral( "legend/title-label" ) ); if ( !v.isNull() ) currentText = v.toString(); diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp index efa4c922ed0..63dbcfec050 100644 --- a/src/app/qgsprojectlayergroupdialog.cpp +++ b/src/app/qgsprojectlayergroupdialog.cpp @@ -92,7 +92,7 @@ QStringList QgsProjectLayerGroupDialog::selectedLayerNames() const { QgsLayerTreeNode* node = model->index2node( index ); if ( QgsLayerTree::isLayer( node ) ) - layerNames << QgsLayerTree::toLayer( node )->layerName(); + layerNames << QgsLayerTree::toLayer( node )->name(); } return layerNames; } diff --git a/src/core/layertree/qgslayertreelayer.cpp b/src/core/layertree/qgslayertreelayer.cpp index b7ef0457c92..3274655f61a 100644 --- a/src/core/layertree/qgslayertreelayer.cpp +++ b/src/core/layertree/qgslayertreelayer.cpp @@ -72,21 +72,11 @@ void QgsLayerTreeLayer::attachToLayer() } QString QgsLayerTreeLayer::name() const -{ - return layerName(); -} - -void QgsLayerTreeLayer::setName( const QString& n ) -{ - setLayerName( n ); -} - -QString QgsLayerTreeLayer::layerName() const { return mLayer ? mLayer->name() : mLayerName; } -void QgsLayerTreeLayer::setLayerName( const QString& n ) +void QgsLayerTreeLayer::setName( const QString& n ) { if ( mLayer ) { @@ -144,7 +134,7 @@ void QgsLayerTreeLayer::writeXml( QDomElement& parentElement ) QDomDocument doc = parentElement.ownerDocument(); QDomElement elem = doc.createElement( QStringLiteral( "layer-tree-layer" ) ); elem.setAttribute( QStringLiteral( "id" ), mLayerId ); - elem.setAttribute( QStringLiteral( "name" ), layerName() ); + elem.setAttribute( QStringLiteral( "name" ), name() ); elem.setAttribute( QStringLiteral( "checked" ), QgsLayerTreeUtils::checkStateToXml( mVisible ) ); elem.setAttribute( QStringLiteral( "expanded" ), mExpanded ? "1" : "0" ); @@ -155,7 +145,7 @@ void QgsLayerTreeLayer::writeXml( QDomElement& parentElement ) QString QgsLayerTreeLayer::dump() const { - return QStringLiteral( "LAYER: %1 visible=%2 expanded=%3 id=%4\n" ).arg( layerName() ).arg( mVisible ).arg( mExpanded ).arg( layerId() ); + return QStringLiteral( "LAYER: %1 visible=%2 expanded=%3 id=%4\n" ).arg( name() ).arg( mVisible ).arg( mExpanded ).arg( layerId() ); } QgsLayerTreeLayer* QgsLayerTreeLayer::clone() const diff --git a/src/core/layertree/qgslayertreelayer.h b/src/core/layertree/qgslayertreelayer.h index 7b94d4ba509..d9037175680 100644 --- a/src/core/layertree/qgslayertreelayer.h +++ b/src/core/layertree/qgslayertreelayer.h @@ -58,9 +58,6 @@ class CORE_EXPORT QgsLayerTreeLayer : public QgsLayerTreeNode //! @note added in 3.0 void setName( const QString& n ) override; - QString layerName() const; - void setLayerName( const QString& n ); - Qt::CheckState isVisible() const { return mVisible; } void setVisible( Qt::CheckState visible ); diff --git a/src/core/layertree/qgslayertreemodel.cpp b/src/core/layertree/qgslayertreemodel.cpp index 3314912f771..ee7988f1a9b 100644 --- a/src/core/layertree/qgslayertreemodel.cpp +++ b/src/core/layertree/qgslayertreemodel.cpp @@ -198,7 +198,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const if ( QgsLayerTree::isLayer( node ) ) { QgsLayerTreeLayer* nodeLayer = QgsLayerTree::toLayer( node ); - QString name = nodeLayer->layerName(); + QString name = nodeLayer->name(); if ( nodeLayer->customProperty( QStringLiteral( "showFeatureCount" ), 0 ).toInt() && role == Qt::DisplayRole ) { QgsVectorLayer* vlayer = qobject_cast( nodeLayer->layer() ); @@ -417,7 +417,7 @@ bool QgsLayerTreeModel::setData( const QModelIndex& index, const QVariant& value if ( QgsLayerTree::isLayer( node ) ) { QgsLayerTreeLayer* layer = QgsLayerTree::toLayer( node ); - layer->setLayerName( value.toString() ); + layer->setName( value.toString() ); emit dataChanged( index, index ); } else if ( QgsLayerTree::isGroup( node ) ) diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp index e4d68782340..93ca467c667 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.cpp +++ b/src/core/layertree/qgslayertreemodellegendnode.cpp @@ -457,7 +457,7 @@ void QgsSymbolLegendNode::updateLabel() if ( mEmbeddedInParent ) { - QString layerName = mLayerNode->layerName(); + QString layerName = mLayerNode->name(); if ( !mLayerNode->customProperty( QStringLiteral( "legend/title-label" ) ).isNull() ) layerName = mLayerNode->customProperty( QStringLiteral( "legend/title-label" ) ).toString(); diff --git a/src/core/layertree/qgslayertreeutils.cpp b/src/core/layertree/qgslayertreeutils.cpp index 935beaeb2c4..78319e46625 100644 --- a/src/core/layertree/qgslayertreeutils.cpp +++ b/src/core/layertree/qgslayertreeutils.cpp @@ -113,7 +113,7 @@ static QDomElement _writeOldLegendLayer( QDomDocument& doc, QgsLayerTreeLayer* n layerElem.setAttribute( QStringLiteral( "drawingOrder" ), drawingOrder ); layerElem.setAttribute( QStringLiteral( "open" ), nodeLayer->isExpanded() ? "true" : "false" ); layerElem.setAttribute( QStringLiteral( "checked" ), QgsLayerTreeUtils::checkStateToXml( nodeLayer->isVisible() ) ); - layerElem.setAttribute( QStringLiteral( "name" ), nodeLayer->layerName() ); + layerElem.setAttribute( QStringLiteral( "name" ), nodeLayer->name() ); layerElem.setAttribute( QStringLiteral( "showFeatureCount" ), nodeLayer->customProperty( QStringLiteral( "showFeatureCount" ) ).toInt() ); QDomElement fileGroupElem = doc.createElement( QStringLiteral( "filegroup" ) );