Skip to content

Commit 5565829

Browse files
committed
Rename QgsLegendModelV2 to QgsLegendModel
1 parent c783be1 commit 5565829

File tree

7 files changed

+17
-16
lines changed

7 files changed

+17
-16
lines changed

doc/api_break.dox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
102102
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
103103
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
104104
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
105+
<td><td>QgsLegendModelV2<td>QgsLegendModel
105106
<tr><td>QgsLegendSymbolItemV2<td>QgsLegendSymbolItem
106107
<tr><td>QgsLineStringV2<td>QgsLineString
107108
<tr><td>QgsLineSymbolLayerV2<td>QgsLineSymbolLayer

python/core/composer/qgscomposerlegend.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
*
66
* @note added in 2.6
77
*/
8-
class QgsLegendModelV2 : QgsLayerTreeModel
8+
class QgsLegendModel : QgsLayerTreeModel
99
{
1010
%TypeHeaderCode
1111
#include <qgscomposerlegend.h>
1212
%End
1313

1414
public:
15-
QgsLegendModelV2( QgsLayerTreeGroup* rootNode, QObject *parent /TransferThis/ = 0 );
15+
QgsLegendModel( QgsLayerTreeGroup* rootNode, QObject *parent /TransferThis/ = 0 );
1616

1717
QVariant data( const QModelIndex& index, int role ) const;
1818

@@ -61,7 +61,7 @@ class QgsComposerLegend : QgsComposerItem
6161
bool resizeToContents() const;
6262

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

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

src/core/composer/qgscomposerlegend.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
4646
, mForceResize( false )
4747
, mSizeToContents( true )
4848
{
49-
mLegendModel = new QgsLegendModelV2( QgsProject::instance()->layerTreeRoot() );
49+
mLegendModel = new QgsLegendModel( QgsProject::instance()->layerTreeRoot() );
5050

5151
connect( &composition->atlasComposition(), SIGNAL( renderEnded() ), this, SLOT( onAtlasEnded() ) );
5252
connect( &composition->atlasComposition(), SIGNAL( featureChanged( QgsFeature* ) ), this, SLOT( onAtlasFeature( QgsFeature* ) ) );
@@ -737,14 +737,14 @@ void QgsComposerLegend::onAtlasEnded()
737737
#include "qgslayertreemodellegendnode.h"
738738
#include "qgsvectorlayer.h"
739739

740-
QgsLegendModelV2::QgsLegendModelV2( QgsLayerTreeGroup* rootNode, QObject* parent )
740+
QgsLegendModel::QgsLegendModel( QgsLayerTreeGroup* rootNode, QObject* parent )
741741
: QgsLayerTreeModel( rootNode, parent )
742742
{
743743
setFlag( QgsLayerTreeModel::AllowLegendChangeState, false );
744744
setFlag( QgsLayerTreeModel::AllowNodeReorder, true );
745745
}
746746

747-
QVariant QgsLegendModelV2::data( const QModelIndex& index, int role ) const
747+
QVariant QgsLegendModel::data( const QModelIndex& index, int role ) const
748748
{
749749
// handle custom layer node labels
750750
if ( QgsLayerTreeNode* node = index2node( index ) )
@@ -766,7 +766,7 @@ QVariant QgsLegendModelV2::data( const QModelIndex& index, int role ) const
766766
return QgsLayerTreeModel::data( index, role );
767767
}
768768

769-
Qt::ItemFlags QgsLegendModelV2::flags( const QModelIndex& index ) const
769+
Qt::ItemFlags QgsLegendModel::flags( const QModelIndex& index ) const
770770
{
771771
// make the legend nodes selectable even if they are not by default
772772
if ( index2legendNode( index ) )

src/core/composer/qgscomposerlegend.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ class QgsLegendRenderer;
3434
*
3535
* @note added in 2.6
3636
*/
37-
class CORE_EXPORT QgsLegendModelV2 : public QgsLayerTreeModel
37+
class CORE_EXPORT QgsLegendModel : public QgsLayerTreeModel
3838
{
3939
Q_OBJECT
4040

4141
public:
42-
QgsLegendModelV2( QgsLayerTreeGroup* rootNode, QObject *parent = nullptr );
42+
QgsLegendModel( QgsLayerTreeGroup* rootNode, QObject *parent = nullptr );
4343

4444
QVariant data( const QModelIndex& index, int role ) const override;
4545

@@ -88,7 +88,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
8888
/**
8989
* Returns the legend model
9090
*/
91-
QgsLegendModelV2* model() { return mLegendModel; }
91+
QgsLegendModel* model() { return mLegendModel; }
9292

9393
//! @note added in 2.6
9494
void setAutoUpdateModel( bool autoUpdate );
@@ -281,7 +281,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
281281
//! use new custom layer tree and update model. if new root is null pointer, will use project's tree
282282
void setCustomLayerTree( QgsLayerTreeGroup* rootGroup );
283283

284-
QgsLegendModelV2* mLegendModel;
284+
QgsLegendModel* mLegendModel;
285285
QgsLayerTreeGroup* mCustomLayerTree;
286286

287287
QgsLegendSettings mSettings;

src/server/qgswmsconfigparser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ QgsComposition* QgsWmsConfigParser::createPrintComposition( const QString& compo
239239
}
240240

241241
// get model and layer tree root of the legend
242-
QgsLegendModelV2* model = currentLegend->model();
242+
QgsLegendModel* model = currentLegend->model();
243243
QStringList layerSet;
244244
Q_FOREACH ( QgsMapLayer* layer, map->layers() )
245245
layerSet << layer->id();
@@ -548,7 +548,7 @@ void QgsWmsConfigParser::removeHighlightLayers( const QStringList& layerIds )
548548
}
549549
}
550550

551-
void QgsWmsConfigParser::setLayerIdsToLegendModel( QgsLegendModelV2* model, const QStringList& layerSet, double scale )
551+
void QgsWmsConfigParser::setLayerIdsToLegendModel( QgsLegendModel* model, const QStringList& layerSet, double scale )
552552
{
553553
if ( !model )
554554
{

src/server/qgswmsconfigparser.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class QgsComposerLegend;
2626
class QgsComposerMap;
2727
class QgsComposition;
2828
class QgsMapLayer;
29-
class QgsLegendModelV2;
29+
class QgsLegendModel;
3030

3131

3232
class SERVER_EXPORT QgsWmsConfigParser
@@ -161,7 +161,7 @@ class SERVER_EXPORT QgsWmsConfigParser
161161
const QStringList& labelWeightSplit, const QStringList& labelFontSplit, const QStringList& labelBufferSizeSplit,
162162
const QStringList& labelBufferColorSplit );
163163

164-
static void setLayerIdsToLegendModel( QgsLegendModelV2* model, const QStringList& layerIds, double scale );
164+
static void setLayerIdsToLegendModel( QgsLegendModel* model, const QStringList& layerIds, double scale );
165165
};
166166

167167
#endif // QGSWMSCONFIGPARSER_H

src/server/qgswmsprojectparser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
517517
QgsComposerLegend* legend = qobject_cast< QgsComposerLegend *>( *itemIt );
518518
if ( legend )
519519
{
520-
QgsLegendModelV2* model = legend->model();
520+
QgsLegendModel* model = legend->model();
521521
#if 0
522522
QgsLayerTreeGroup* root = model->rootGroup();
523523
QStringList layerIds = root->findLayerIds();

0 commit comments

Comments
 (0)