Remove legacy class QgsComposerLegendItem and subclasses

qgis · Dec 11, 2016 · 3efc28d · 3efc28d
1 parent 57ff36b
commit 3efc28d
Show file tree

Hide file tree

Showing 21 changed files with 4 additions and 931 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -236,6 +236,7 @@ All the functionality from the old QgsColorDialog has been moved to the new clas
 - QgsComposerAttributeTable and associated classes (eg QgsComposerAttributeTableCompare,
 QgsComposerAttributeTableColumnModel, QgsComposerTableSortColumnsProxyModel) were removed.
 Use QgsComposerAttributeTableV2 instead.
+- QgsComposerLegendItem and subclasses were removed (QgsComposerSymbolItem, QgsComposerRasterSymbolItem, QgsComposerLayerItem, QgsComposerGroupItem, QgsComposerStyleItem).
 - QgsComposerTable was removed. Use QgsComposerAttributeTableV2 instead.
 - ComposerTextTable was removed. Use ComposerTextTableV2 instead.
 - QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,

diff --git a/python/core/composer/qgscomposerlegenditem.sip b/python/core/composer/qgscomposerlegenditem.sip
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -191,7 +191,6 @@
 %Include composer/qgscomposeritemgroup.sip
 %Include composer/qgscomposerlabel.sip
 %Include composer/qgscomposerlegend.sip
-%Include composer/qgscomposerlegenditem.sip
 %Include composer/qgscomposerlegendstyle.sip
 %Include composer/qgscomposermap.sip
 %Include composer/qgscomposermapgrid.sip

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -145,7 +145,6 @@ SET(QGIS_APP_SRCS
   composer/qgscomposerpolygonwidget.cpp
   composer/qgscomposerpolylinewidget.cpp
   composer/qgscomposertablebackgroundcolorsdialog.cpp
-  composer/qgscomposerlegenditemdialog.cpp
   composer/qgscomposerlegendlayersdialog.cpp
   composer/qgscomposerlegendwidget.cpp
   composer/qgscompositionwidget.cpp
@@ -308,7 +307,6 @@ SET (QGIS_APP_MOC_HDRS
   composer/qgscomposeritemwidget.h
   composer/qgscomposerlabelwidget.h
   composer/qgscomposerlegendwidget.h
-  composer/qgscomposerlegenditemdialog.h
   composer/qgscomposerlegendlayersdialog.h
   composer/qgscomposermanager.h
   composer/qgscomposermapgridwidget.h

diff --git a/src/app/composer/qgscomposerlegenditemdialog.cpp b/src/app/composer/qgscomposerlegenditemdialog.cpp
diff --git a/src/app/composer/qgscomposerlegenditemdialog.h b/src/app/composer/qgscomposerlegenditemdialog.h
diff --git a/src/app/composer/qgscomposerlegendlayersdialog.h b/src/app/composer/qgscomposerlegendlayersdialog.h
@@ -38,4 +38,4 @@ class QgsComposerLegendLayersDialog: public QDialog, private Ui::QgsComposerLege
     QMap<QListWidgetItem*, QgsMapLayer*> mItemLayerMap;
 };
 
-#endif //QGSCOMPOSERLEGENDITEMDIALOG_H
+#endif //QGSCOMPOSERLEGENDLAYERSDIALOG_H
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -17,8 +17,6 @@
 
 #include "qgscomposerlegendwidget.h"
 #include "qgscomposerlegend.h"
-#include "qgscomposerlegenditem.h"
-#include "qgscomposerlegenditemdialog.h"
 #include "qgscomposerlegendlayersdialog.h"
 #include "qgscomposeritemwidget.h"
 #include "qgscomposermap.h"

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -256,7 +256,6 @@ SET(QGIS_CORE_SRCS
   composer/qgscomposeritemgroup.cpp
   composer/qgscomposerlabel.cpp
   composer/qgscomposerlegend.cpp
-  composer/qgscomposerlegenditem.cpp
   composer/qgscomposerlegendstyle.cpp
   composer/qgscomposermap.cpp
   composer/qgscomposermapgrid.cpp
@@ -769,7 +768,6 @@ SET(QGIS_CORE_HDRS
   composer/qgscomposerarrow.h
   composer/qgscomposerframe.h
   composer/qgscomposeritemcommand.h
-  composer/qgscomposerlegenditem.h
   composer/qgscomposerlegendstyle.h
   composer/qgscomposermultiframecommand.h
   composer/qgscomposertexttable.h

diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -18,7 +18,6 @@
 
 #include "qgscomposerlegendstyle.h"
 #include "qgscomposerlegend.h"
-#include "qgscomposerlegenditem.h"
 #include "qgscomposermap.h"
 #include "qgscomposition.h"
 #include "qgscomposermodel.h"

diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
@@ -24,8 +24,6 @@
 
 class QgsLayerTreeModel;
 class QgsSymbol;
-class QgsComposerGroupItem;
-class QgsComposerLayerItem;
 class QgsComposerMap;
 class QgsLegendRenderer;