Skip to content

Commit bbb9b53

Browse files
3nids3nids
committedAug 5, 2016
remove QgsLegendModel
·
ltr-3_40final-3_0_0
1 parent ab57541 commit bbb9b53

File tree

12 files changed

+1
-1182
lines changed

12 files changed

+1
-1182
lines changed
 

‎doc/api_break.dox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
4848
so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
4949
should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
5050
<li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
51+
<li>QgsLegendModel was removed.
5152
<li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
5253
<li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
5354
<li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>

‎python/core/composer/qgscomposerlegend.sip

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ class QgsComposerLegend : QgsComposerItem
6060
*/
6161
bool resizeToContents() const;
6262

63-
/** Returns pointer to the legend model*/
64-
//! @deprecated in 2.6 - use modelV2()
65-
QgsLegendModel* model() /Deprecated/;
66-
6763
//! @note added in 2.6
6864
QgsLegendModelV2* modelV2();
6965

‎python/core/composer/qgslegendmodel.sip

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎python/core/core.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
%Include composer/qgscomposerutils.sip
208208
%Include composer/qgscomposition.sip
209209
%Include composer/qgsdoubleboxscalebarstyle.sip
210-
%Include composer/qgslegendmodel.sip
211210
%Include composer/qgsnumericscalebarstyle.sip
212211
%Include composer/qgspaperitem.sip
213212
%Include composer/qgsscalebarstyle.sip

‎src/core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ SET(QGIS_CORE_SRCS
267267
composer/qgscomposition.cpp
268268
composer/qgsdoubleboxscalebarstyle.cpp
269269
composer/qgsgroupungroupitemscommand.cpp
270-
composer/qgslegendmodel.cpp
271270
composer/qgsnumericscalebarstyle.cpp
272271
composer/qgspaperitem.cpp
273272
composer/qgsscalebarstyle.cpp
@@ -533,7 +532,6 @@ SET(QGIS_CORE_MOC_HDRS
533532
composer/qgscomposertexttable.h
534533
composer/qgscomposition.h
535534
composer/qgsgroupungroupitemscommand.h
536-
composer/qgslegendmodel.h
537535
composer/qgspaperitem.h
538536

539537
raster/qgsrasterlayer.h

‎src/core/composer/qgscomposerlegend.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
4949
{
5050
mLegendModel2 = new QgsLegendModelV2( QgsProject::instance()->layerTreeRoot() );
5151

52-
connect( &mLegendModel, SIGNAL( layersChanged() ), this, SLOT( synchronizeWithModel() ) );
53-
5452
connect( &composition->atlasComposition(), SIGNAL( renderEnded() ), this, SLOT( onAtlasEnded() ) );
5553
connect( &composition->atlasComposition(), SIGNAL( featureChanged( QgsFeature* ) ), this, SLOT( onAtlasFeature( QgsFeature* ) ) );
5654

@@ -341,10 +339,6 @@ void QgsComposerLegend::synchronizeWithModel()
341339

342340
void QgsComposerLegend::updateLegend()
343341
{
344-
// take layer list from map renderer (to have legend order)
345-
mLegendModel.blockSignals( true );
346-
mLegendModel.setLayerSet( mComposition ? mComposition->mapSettings().layers() : QStringList() );
347-
mLegendModel.blockSignals( false );
348342
adjustBoxSize();
349343
updateItem();
350344
}

‎src/core/composer/qgscomposerlegend.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "qgscomposeritem.h"
2222
#include "qgslayertreemodel.h"
23-
#include "qgslegendmodel.h"
2423
#include "qgslegendsettings.h"
2524

2625
class QgsLayerTreeModel;
@@ -87,10 +86,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
8786
*/
8887
bool resizeToContents() const;
8988

90-
/** Returns pointer to the legend model*/
91-
//! @deprecated in 2.6 - use modelV2()
92-
Q_DECL_DEPRECATED QgsLegendModel* model() {return &mLegendModel;}
93-
9489
//! @note added in 2.6
9590
QgsLegendModelV2* modelV2() { return mLegendModel2; }
9691

@@ -284,8 +279,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
284279
//! use new custom layer tree and update model. if new root is null pointer, will use project's tree
285280
void setCustomLayerTree( QgsLayerTreeGroup* rootGroup );
286281

287-
QgsLegendModel mLegendModel;
288-
289282
QgsLegendModelV2* mLegendModel2;
290283
QgsLayerTreeGroup* mCustomLayerTree;
291284

0 commit comments

Comments
 (0)
Please sign in to comment.