Skip to content

Commit 3efc28d

Browse files
wonder-skwonder-sk
committedDec 11, 2016
Remove legacy class QgsComposerLegendItem and subclasses
·
ltr-3_40final-3_0_0
1 parent 57ff36b commit 3efc28d

21 files changed

+4
-931
lines changed
 

‎doc/api_break.dox

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ All the functionality from the old QgsColorDialog has been moved to the new clas
236236
- QgsComposerAttributeTable and associated classes (eg QgsComposerAttributeTableCompare,
237237
QgsComposerAttributeTableColumnModel, QgsComposerTableSortColumnsProxyModel) were removed.
238238
Use QgsComposerAttributeTableV2 instead.
239+
- QgsComposerLegendItem and subclasses were removed (QgsComposerSymbolItem, QgsComposerRasterSymbolItem, QgsComposerLayerItem, QgsComposerGroupItem, QgsComposerStyleItem).
239240
- QgsComposerTable was removed. Use QgsComposerAttributeTableV2 instead.
240241
- ComposerTextTable was removed. Use ComposerTextTableV2 instead.
241242
- QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,

‎python/core/composer/qgscomposerlegenditem.sip

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

‎python/core/core.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@
191191
%Include composer/qgscomposeritemgroup.sip
192192
%Include composer/qgscomposerlabel.sip
193193
%Include composer/qgscomposerlegend.sip
194-
%Include composer/qgscomposerlegenditem.sip
195194
%Include composer/qgscomposerlegendstyle.sip
196195
%Include composer/qgscomposermap.sip
197196
%Include composer/qgscomposermapgrid.sip

‎src/app/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ SET(QGIS_APP_SRCS
145145
composer/qgscomposerpolygonwidget.cpp
146146
composer/qgscomposerpolylinewidget.cpp
147147
composer/qgscomposertablebackgroundcolorsdialog.cpp
148-
composer/qgscomposerlegenditemdialog.cpp
149148
composer/qgscomposerlegendlayersdialog.cpp
150149
composer/qgscomposerlegendwidget.cpp
151150
composer/qgscompositionwidget.cpp
@@ -308,7 +307,6 @@ SET (QGIS_APP_MOC_HDRS
308307
composer/qgscomposeritemwidget.h
309308
composer/qgscomposerlabelwidget.h
310309
composer/qgscomposerlegendwidget.h
311-
composer/qgscomposerlegenditemdialog.h
312310
composer/qgscomposerlegendlayersdialog.h
313311
composer/qgscomposermanager.h
314312
composer/qgscomposermapgridwidget.h

‎src/app/composer/qgscomposerlegenditemdialog.cpp

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

‎src/app/composer/qgscomposerlegenditemdialog.h

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

‎src/app/composer/qgscomposerlegendlayersdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ class QgsComposerLegendLayersDialog: public QDialog, private Ui::QgsComposerLege
3838
QMap<QListWidgetItem*, QgsMapLayer*> mItemLayerMap;
3939
};
4040

41-
#endif //QGSCOMPOSERLEGENDITEMDIALOG_H
41+
#endif //QGSCOMPOSERLEGENDLAYERSDIALOG_H

‎src/app/composer/qgscomposerlegendwidget.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
#include "qgscomposerlegendwidget.h"
1919
#include "qgscomposerlegend.h"
20-
#include "qgscomposerlegenditem.h"
21-
#include "qgscomposerlegenditemdialog.h"
2220
#include "qgscomposerlegendlayersdialog.h"
2321
#include "qgscomposeritemwidget.h"
2422
#include "qgscomposermap.h"

‎src/core/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ SET(QGIS_CORE_SRCS
256256
composer/qgscomposeritemgroup.cpp
257257
composer/qgscomposerlabel.cpp
258258
composer/qgscomposerlegend.cpp
259-
composer/qgscomposerlegenditem.cpp
260259
composer/qgscomposerlegendstyle.cpp
261260
composer/qgscomposermap.cpp
262261
composer/qgscomposermapgrid.cpp
@@ -769,7 +768,6 @@ SET(QGIS_CORE_HDRS
769768
composer/qgscomposerarrow.h
770769
composer/qgscomposerframe.h
771770
composer/qgscomposeritemcommand.h
772-
composer/qgscomposerlegenditem.h
773771
composer/qgscomposerlegendstyle.h
774772
composer/qgscomposermultiframecommand.h
775773
composer/qgscomposertexttable.h

‎src/core/composer/qgscomposerlegend.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include "qgscomposerlegendstyle.h"
2020
#include "qgscomposerlegend.h"
21-
#include "qgscomposerlegenditem.h"
2221
#include "qgscomposermap.h"
2322
#include "qgscomposition.h"
2423
#include "qgscomposermodel.h"

‎src/core/composer/qgscomposerlegend.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
class QgsLayerTreeModel;
2626
class QgsSymbol;
27-
class QgsComposerGroupItem;
28-
class QgsComposerLayerItem;
2927
class QgsComposerMap;
3028
class QgsLegendRenderer;
3129

0 commit comments

Comments
 (0)
Please sign in to comment.