Skip to content

Commit 185ad05

Browse files
authored
Remove deprecated QgsDataDefinedSymbolDialog class (#3315)
It's not used anymore, and QgsDataDefinedButton should be used in its place.
1 parent 31c75ef commit 185ad05

File tree

8 files changed

+7
-319
lines changed

8 files changed

+7
-319
lines changed

doc/api_break.dox

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,13 @@ plugins calling these methods will need to be updated.</li>
5050
be returned in place of a null pointer.</li>
5151
</ul>
5252

53+
\subsection qgis_api_break_3_0_QgsDataDefinedSymbolDialog QgsDataDefinedSymbolDialog
54+
55+
<ul>
56+
<li>QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsDataDefinedButton
57+
instead.</li>
58+
</ul>
59+
5360
\subsection qgis_api_break_3_0_QgsDiagramLayerSettings QgsDiagramLayerSettings
5461

5562
<ul>

python/gui/gui.sip

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
%Include symbology-ng/qgscolorrampcombobox.sip
226226
%Include symbology-ng/qgscptcitycolorrampv2dialog.sip
227227
%Include symbology-ng/qgsdashspacedialog.sip
228-
%Include symbology-ng/qgsdatadefinedsymboldialog.sip
229228
%Include symbology-ng/qgsellipsesymbollayerv2widget.sip
230229
%Include symbology-ng/qgsgraduatedhistogramwidget.sip
231230
%Include symbology-ng/qgsgraduatedsymbolrendererv2widget.sip

python/gui/symbology-ng/qgsdatadefinedsymboldialog.sip

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

src/gui/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ SET(QGIS_GUI_SRCS
1919
symbology-ng/qgscolorrampcombobox.cpp
2020
symbology-ng/qgscptcitycolorrampv2dialog.cpp
2121
symbology-ng/qgsdashspacedialog.cpp
22-
symbology-ng/qgsdatadefinedsymboldialog.cpp
2322
symbology-ng/qgsellipsesymbollayerv2widget.cpp
2423
symbology-ng/qgsgraduatedhistogramwidget.cpp
2524
symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -471,7 +470,6 @@ SET(QGIS_GUI_MOC_HDRS
471470
symbology-ng/qgscolorrampcombobox.h
472471
symbology-ng/qgscptcitycolorrampv2dialog.h
473472
symbology-ng/qgsdashspacedialog.h
474-
symbology-ng/qgsdatadefinedsymboldialog.h
475473
symbology-ng/qgsellipsesymbollayerv2widget.h
476474
symbology-ng/qgsgraduatedhistogramwidget.h
477475
symbology-ng/qgsgraduatedsymbolrendererv2widget.h

src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp

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

src/gui/symbology-ng/qgsdatadefinedsymboldialog.h

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

src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
* *
1414
***************************************************************************/
1515
#include "qgsellipsesymbollayerv2widget.h"
16-
#include "qgsdatadefinedsymboldialog.h"
1716
#include "qgsellipsesymbollayerv2.h"
1817
#include "qgsmaplayerregistry.h"
1918
#include "qgsvectorlayer.h"

src/gui/symbology-ng/qgssymbollayerv2widget.cpp

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

2525
#include "characterwidget.h"
2626
#include "qgsdashspacedialog.h"
27-
#include "qgsdatadefinedsymboldialog.h"
2827
#include "qgssymbolv2selectordialog.h"
2928
#include "qgssvgcache.h"
3029
#include "qgssymbollayerv2utils.h"

0 commit comments

Comments
 (0)