Remove QgsDataDefinedButton

Now completely replaced by QgsPropertyOverrideButton
qgis · Feb 14, 2017 · be46f78 · be46f78
1 parent 1b5bf1d
commit be46f78
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 1,636 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -250,6 +250,7 @@ Use QgsComposerAttributeTableV2 instead.
 - QgsCRSCache was removed. QgsCoordinateReferenceSystem now internally uses a cache for CRS creation,
 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 ).
+- QgsDataDefinedButton was removed. Use QgsPropertyOverrideButton instead.
 - QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsFormAnnotationItem. Use QgsFormAnnotation instead.
 - QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.

diff --git a/python/gui/gui.sip b/python/gui/gui.sip
@@ -51,7 +51,6 @@
 %Include qgsconfigureshortcutsdialog.sip
 %Include qgscredentialdialog.sip
 %Include qgscustomdrophandler.sip
-%Include qgsdatadefinedbutton.sip
 %Include qgsdetaileditemdata.sip
 %Include qgsdetaileditemdelegate.sip
 %Include qgsdetaileditemwidget.sip

diff --git a/python/gui/qgsdatadefinedbutton.sip b/python/gui/qgsdatadefinedbutton.sip
diff --git a/src/app/composer/qgscomposeritemwidget.h b/src/app/composer/qgscomposeritemwidget.h
@@ -24,7 +24,6 @@
 
 class QgsComposerItem;
 class QgsAtlasComposition;
-class QgsDataDefinedButton;
 
 
 // NOTE - the inheritance here is tricky, as we need to avoid the multiple inheritance

diff --git a/src/app/composer/qgscompositionwidget.h b/src/app/composer/qgscompositionwidget.h
@@ -19,7 +19,6 @@
 
 class QgsComposition;
 class QgsComposerMap;
-class QgsDataDefinedButton;
 
 /** \ingroup app
  * Struct to hold map composer paper properties.

diff --git a/src/core/qgsexpressioncontextgenerator.h b/src/core/qgsexpressioncontextgenerator.h
@@ -25,7 +25,7 @@
  * You need to implement this interface in a class and register this class with
  * QgsFieldExpressionWidget::registerExpressionGenerator().
  *
- * This is used for example in QgsDataDefinedButton or QgsFieldExpressionWidget
+ * This is used for example in QgsPropertyOverrideButton or QgsFieldExpressionWidget
  * classes which will ask for a new QgsExpressionContext every time the expression
  * editor is opened. This way they are able to provide an up-to-date expression
  * editor even when the environment changes.

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -194,7 +194,6 @@ SET(QGIS_GUI_SRCS
   qgscredentialdialog.cpp
   qgscursors.cpp
   qgscustomdrophandler.cpp
-  qgsdatadefinedbutton.cpp
   qgsdatumtransformdialog.cpp
   qgsdetaileditemdata.cpp
   qgsdetaileditemdelegate.cpp
@@ -355,7 +354,6 @@ SET(QGIS_GUI_MOC_HDRS
   qgscompoundcolorwidget.h
   qgsconfigureshortcutsdialog.h
   qgscredentialdialog.h
-  qgsdatadefinedbutton.h
   qgsdatumtransformdialog.h
   qgsdetaileditemdelegate.h
   qgsdetaileditemwidget.h