Remove deprecated QgsDataDefinedSymbolDialog class (#3315)

It's not used anymore, and QgsDataDefinedButton should be used in its place.
qgis · Jul 20, 2016 · 185ad05 · 185ad05
1 parent 31c75ef
commit 185ad05
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 319 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -50,6 +50,13 @@ plugins calling these methods will need to be updated.</li>
 be returned in place of a null pointer.</li>
 </ul>
 
+\subsection qgis_api_break_3_0_QgsDataDefinedSymbolDialog QgsDataDefinedSymbolDialog
+
+<ul>
+<li>QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsDataDefinedButton
+instead.</li>
+</ul>
+
 \subsection qgis_api_break_3_0_QgsDiagramLayerSettings QgsDiagramLayerSettings
 
 <ul>

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -225,7 +225,6 @@
 %Include symbology-ng/qgscolorrampcombobox.sip
 %Include symbology-ng/qgscptcitycolorrampv2dialog.sip
 %Include symbology-ng/qgsdashspacedialog.sip
-%Include symbology-ng/qgsdatadefinedsymboldialog.sip
 %Include symbology-ng/qgsellipsesymbollayerv2widget.sip
 %Include symbology-ng/qgsgraduatedhistogramwidget.sip
 %Include symbology-ng/qgsgraduatedsymbolrendererv2widget.sip

diff --git a/python/gui/symbology-ng/qgsdatadefinedsymboldialog.sip b/python/gui/symbology-ng/qgsdatadefinedsymboldialog.sip
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -19,7 +19,6 @@ SET(QGIS_GUI_SRCS
   symbology-ng/qgscolorrampcombobox.cpp
   symbology-ng/qgscptcitycolorrampv2dialog.cpp
   symbology-ng/qgsdashspacedialog.cpp
-  symbology-ng/qgsdatadefinedsymboldialog.cpp
   symbology-ng/qgsellipsesymbollayerv2widget.cpp
   symbology-ng/qgsgraduatedhistogramwidget.cpp
   symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -471,7 +470,6 @@ SET(QGIS_GUI_MOC_HDRS
   symbology-ng/qgscolorrampcombobox.h
   symbology-ng/qgscptcitycolorrampv2dialog.h
   symbology-ng/qgsdashspacedialog.h
-  symbology-ng/qgsdatadefinedsymboldialog.h
   symbology-ng/qgsellipsesymbollayerv2widget.h
   symbology-ng/qgsgraduatedhistogramwidget.h
   symbology-ng/qgsgraduatedsymbolrendererv2widget.h

diff --git a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp
diff --git a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.h b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.h
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
@@ -13,7 +13,6 @@
  *                                                                         *
  ***************************************************************************/
 #include "qgsellipsesymbollayerv2widget.h"
-#include "qgsdatadefinedsymboldialog.h"
 #include "qgsellipsesymbollayerv2.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsvectorlayer.h"

diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -24,7 +24,6 @@
 
 #include "characterwidget.h"
 #include "qgsdashspacedialog.h"
-#include "qgsdatadefinedsymboldialog.h"
 #include "qgssymbolv2selectordialog.h"
 #include "qgssvgcache.h"
 #include "qgssymbollayerv2utils.h"