remove QgsLegendModel

qgis · Aug 5, 2016 · bbb9b53 · bbb9b53
1 parent ab57541
commit bbb9b53
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 1,182 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -48,6 +48,7 @@ This page tries to maintain a list with incompatible changes that happened in pr
 so there is no longer a need for the separate cache class. Code which previously called QgsCRSCache::updateCRSCache()
 should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).</li>
 <li>QgsLabel and QgsLabelAttributes. Replaced by labeling based on PAL library, see QgsLabelingEngineV2.</li>
+<li>QgsLegendModel was removed.
 <li>QgsMapCanvasMap. It is an internal class used by map canvas.</li>
 <li>QgsMapRenderer. It has been replaced by QgsMapRendererJob with subclasses and QgsMapSettings.</li>
 <li>QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.</li>

diff --git a/python/core/composer/qgscomposerlegend.sip b/python/core/composer/qgscomposerlegend.sip
@@ -60,10 +60,6 @@ class QgsComposerLegend : QgsComposerItem
      */
     bool resizeToContents() const;
 
-    /** Returns pointer to the legend model*/
-    //! @deprecated in 2.6 - use modelV2()
-    QgsLegendModel* model() /Deprecated/;
-
     //! @note added in 2.6
     QgsLegendModelV2* modelV2();
 

diff --git a/python/core/composer/qgslegendmodel.sip b/python/core/composer/qgslegendmodel.sip
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -207,7 +207,6 @@
 %Include composer/qgscomposerutils.sip
 %Include composer/qgscomposition.sip
 %Include composer/qgsdoubleboxscalebarstyle.sip
-%Include composer/qgslegendmodel.sip
 %Include composer/qgsnumericscalebarstyle.sip
 %Include composer/qgspaperitem.sip
 %Include composer/qgsscalebarstyle.sip

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -267,7 +267,6 @@ SET(QGIS_CORE_SRCS
   composer/qgscomposition.cpp
   composer/qgsdoubleboxscalebarstyle.cpp
   composer/qgsgroupungroupitemscommand.cpp
-  composer/qgslegendmodel.cpp
   composer/qgsnumericscalebarstyle.cpp
   composer/qgspaperitem.cpp
   composer/qgsscalebarstyle.cpp
@@ -533,7 +532,6 @@ SET(QGIS_CORE_MOC_HDRS
   composer/qgscomposertexttable.h
   composer/qgscomposition.h
   composer/qgsgroupungroupitemscommand.h
-  composer/qgslegendmodel.h
   composer/qgspaperitem.h
 
   raster/qgsrasterlayer.h

diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -49,8 +49,6 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
 {
   mLegendModel2 = new QgsLegendModelV2( QgsProject::instance()->layerTreeRoot() );
 
-  connect( &mLegendModel, SIGNAL( layersChanged() ), this, SLOT( synchronizeWithModel() ) );
-
   connect( &composition->atlasComposition(), SIGNAL( renderEnded() ), this, SLOT( onAtlasEnded() ) );
   connect( &composition->atlasComposition(), SIGNAL( featureChanged( QgsFeature* ) ), this, SLOT( onAtlasFeature( QgsFeature* ) ) );
 
@@ -341,10 +339,6 @@ void QgsComposerLegend::synchronizeWithModel()
 
 void QgsComposerLegend::updateLegend()
 {
-  // take layer list from map renderer (to have legend order)
-  mLegendModel.blockSignals( true );
-  mLegendModel.setLayerSet( mComposition ? mComposition->mapSettings().layers() : QStringList() );
-  mLegendModel.blockSignals( false );
   adjustBoxSize();
   updateItem();
 }

diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -20,7 +20,6 @@
 
 #include "qgscomposeritem.h"
 #include "qgslayertreemodel.h"
-#include "qgslegendmodel.h"
 #include "qgslegendsettings.h"
 
 class QgsLayerTreeModel;
@@ -87,10 +86,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
      */
     bool resizeToContents() const;
 
-    /** Returns pointer to the legend model*/
-    //! @deprecated in 2.6 - use modelV2()
-    Q_DECL_DEPRECATED QgsLegendModel* model() {return &mLegendModel;}
-
     //! @note added in 2.6
     QgsLegendModelV2* modelV2() { return mLegendModel2; }
 
@@ -284,8 +279,6 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     //! use new custom layer tree and update model. if new root is null pointer, will use project's tree
     void setCustomLayerTree( QgsLayerTreeGroup* rootGroup );
 
-    QgsLegendModel mLegendModel;
-
     QgsLegendModelV2* mLegendModel2;
     QgsLayerTreeGroup* mCustomLayerTree;