Skip to content

Commit 772f593

Browse files
committed
rename QgsComposerLegend::modelV2() to model()
1 parent 820cc56 commit 772f593

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

doc/api_break.dox

+7
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ corresponding counterparts in QgsUnitTypes should be used instead.</li>
145145
<li>GenericDataSourceURI has been renamed to GenericDataSourceUri</li>
146146
</ul>
147147

148+
\subsection qgis_api_break_3_0_QgsComposerLegend QgsComposerLegend
149+
150+
<ul>
151+
<li>model() now returns the new QgsLegendModel (previousyl QgsLegendModelV2, see \ref qgis_api_break_3_0_renamed_classes).</li>
152+
<li>modelV2() has been renamed to model().</li>
153+
</ul>
154+
148155
\subsection qgis_api_break_3_0_QgsComposerLegendItem QgsComposerLegendItem
149156

150157
<ul>

python/core/composer/qgscomposerlegend.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class QgsComposerLegend : QgsComposerItem
6161
bool resizeToContents() const;
6262

6363
//! @note added in 2.6
64-
QgsLegendModelV2* modelV2();
64+
QgsLegendModelV2* model();
6565

6666
//! @note added in 2.6
6767
void setAutoUpdateModel( bool autoUpdate );

src/app/composer/qgscomposerlegendwidget.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend )
7575

7676
if ( legend )
7777
{
78-
mItemTreeView->setModel( legend->modelV2() );
78+
mItemTreeView->setModel( legend->model() );
7979
mItemTreeView->setMenuProvider( new QgsComposerLegendMenuProvider( mItemTreeView, this ) );
8080
connect( legend, SIGNAL( itemChanged() ), this, SLOT( setGuiElements() ) );
8181
mWrapCharLineEdit->setText( legend->wrapChar() );
@@ -654,7 +654,7 @@ void QgsComposerLegendWidget::on_mAddToolButton_clicked()
654654
if ( layer )
655655
{
656656
mLegend->beginCommand( "Legend item added" );
657-
mLegend->modelV2()->rootGroup()->addLayer( layer );
657+
mLegend->model()->rootGroup()->addLayer( layer );
658658
mLegend->endCommand();
659659
}
660660
}
@@ -710,7 +710,7 @@ void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
710710
Q_FOREACH ( const QPersistentModelIndex& index, indexes )
711711
{
712712
if ( index.isValid() && mItemTreeView->layerTreeModel()->index2node( index ) )
713-
mLegend->modelV2()->removeRow( index.row(), index.parent() );
713+
mLegend->model()->removeRow( index.row(), index.parent() );
714714
}
715715

716716
mLegend->adjustBoxSize();
@@ -844,7 +844,7 @@ void QgsComposerLegendWidget::on_mAddGroupToolButton_clicked()
844844
if ( mLegend )
845845
{
846846
mLegend->beginCommand( tr( "Legend group added" ) );
847-
mLegend->modelV2()->rootGroup()->addGroup( tr( "Group" ) );
847+
mLegend->model()->rootGroup()->addGroup( tr( "Group" ) );
848848
mLegend->updateItem();
849849
mLegend->endCommand();
850850
}

src/core/composer/qgscomposerlegend.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,11 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
8686
*/
8787
bool resizeToContents() const;
8888

89-
//! @note added in 2.6
90-
QgsLegendModelV2* modelV2() { return mLegendModel2; }
89+
90+
/**
91+
* Returns the legend model
92+
*/
93+
QgsLegendModelV2* model() { return mLegendModel; }
9194

9295
//! @note added in 2.6
9396
void setAutoUpdateModel( bool autoUpdate );
@@ -279,7 +282,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
279282
//! use new custom layer tree and update model. if new root is null pointer, will use project's tree
280283
void setCustomLayerTree( QgsLayerTreeGroup* rootGroup );
281284

282-
QgsLegendModelV2* mLegendModel2;
285+
QgsLegendModelV2* mLegendModel;
283286
QgsLayerTreeGroup* mCustomLayerTree;
284287

285288
QgsLegendSettings mSettings;

0 commit comments

Comments
 (0)