update some documentation references to QgsDataDefinedButton/QgsDataDefinedSymbolDialog

Author: jef-n

doc/api_break.dox

@@ -252,6 +252,7 @@ so there is no longer a need for the separate cache class. Code which previously
 should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinateTransformCache::instance()->invalidateCrs( authid ).
 - QgsDataDefined was removed. Use the QgsProperty framework instead.
 - QgsDataDefinedButton was removed. Use QgsPropertyOverrideButton instead.
+- QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsPropertyOverrideButton
 - QgsFileNameWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsFormAnnotationItem. Use QgsFormAnnotation instead.
 - QgsHtmlAnnotationItem. Use QgsHtmlAnnotation instead.
@@ -271,7 +272,7 @@ should now call QgsCoordinateReferenceSystem::invalidateCache() and QgsCoordinat
 - QgsPhotoWidgetWrapper was removed. Use QgsExternalResourceWidgetWrapper instead.
 - QgsPseudoColorShader. This shader has been broken for some time and was replaced by QgsSingleBandPseudoColorRenderer.
 - QgsProjectBadLayerGuiHandler was removed. It was unused in QGIS code and barely useful. Implement your own QgsProjectBadLayerHandler subclass if needed.
-- QgsRendererV2DataDefinedMenus was removed. Use QgsDataDefinedButton instead.
+- QgsRendererV2DataDefinedMenus was removed. Use QgsPropertyOverrideButton instead.
 - QgsSizeScaleWidget. Use QgsPropertyAssistantWidget instead.
 - QgsLegacyHelpers.
 - QgsProviderCountCalcEvent and QgsProviderExtentCalcEvent. These classes were unused in QGIS core and unmaintained.
@@ -812,19 +813,6 @@ were removed. Use QgsExpressionContext variant instead.
 were removed. Use QgsExpressionContext variant instead.
 
 
-QgsDataDefinedButton        {#qgis_api_break_3_0_QgsDataDefinedButton}
---------------------
-
-- registerGetExpressionContextCallback has been removed in favor of registerExpressionContextGenerator
-
-
-QgsDataDefinedSymbolDialog        {#qgis_api_break_3_0_QgsDataDefinedSymbolDialog}
---------------------------
-
-- QgsDataDefinedSymbolDialog was removed. Code using this dialog should be reworked to use QgsDataDefinedButton
-instead.
-
-
 QgsDataDefinedValueDialog        {#qgis_api_break_3_0_QgsDataDefinedValueDialog}
 --------------------------
 

src/app/dwg/qgsdwgimportdialog.cpp

@@ -320,7 +320,7 @@ void QgsDwgImportDialog::createGroup( QgsLayerTreeGroup *group, QString name, QS
     sll->setDataDefinedProperty( QgsSymbolLayer::PropertyOutlineWidth, QgsProperty::fromField( "linewidth" ) );
     // sll->setUseCustomDashPattern( true );
     // sll->setCustomDashPatternUnit( QgsSymbolV2::MapUnit );
-    // sll->setDataDefinedProperty( "customdash", new QgsDataDefined( true, false, "", "linetype" ) );
+    // sll->setDataDefinedProperty( QgsSymbolLayer::PropertyCustomDash, QgsProperty::fromField( "linetype" ) );
     sym = new QgsLineSymbol();
     sym->changeSymbolLayer( 0, sll );
     sym->setOutputUnit( QgsUnitTypes::RenderMillimeters );
@@ -336,7 +336,7 @@ void QgsDwgImportDialog::createGroup( QgsLayerTreeGroup *group, QString name, QS
     sll->setDataDefinedProperty( QgsSymbolLayer::PropertyOutlineWidth, QgsProperty::fromField( "width" ) );
     // sll->setUseCustomDashPattern( true );
     // sll->setCustomDashPatternUnit( QgsSymbolV2::MapUnit );
-    // sll->setDataDefinedProperty( "customdash", new QgsDataDefined( true, false, "", "linetype" ) );
+    // sll->setDataDefinedProperty( QgsSymbolLayer::PropertyCustomDash, QgsProperty::fromField( "linetype" ) );
     sym = new QgsLineSymbol();
     sym->changeSymbolLayer( 0, sll );
     sym->setOutputUnit( QgsUnitTypes::RenderMapUnits );

src/core/composer/qgscomposerutils.cpp

@@ -345,7 +345,6 @@ QgsProperty QgsComposerUtils::readOldDataDefinedProperty( const QgsComposerObjec
     return QgsProperty();
   }
 
-  //set values for QgsDataDefined
   QString active = ddElem.attribute( QStringLiteral( "active" ) );
   bool isActive = false;
   if ( active.compare( QLatin1String( "true" ), Qt::CaseInsensitive ) == 0 )

src/ui/qgsdatadefinedsymboldialogbase.ui

@@ -168,7 +168,7 @@
     "QgsMapCanvas": ["WheelAction", "setLayerSet(QList< QgsMapCanvasLayer > &layers)", "clearExtentHistory()", "setCurrentLayer(QgsMapLayer *layer)", "updateOverview()", "enableOverviewMode(QgsMapOverviewCanvas *overview)"],
     "QgsMapToolEdit": ["QgsMapToolEdit(QgsMapCanvas *canvas)", "createGeometryRubberBand(QgsWkbTypes::GeometryType geometryType=QgsWkbTypes::LineGeometry, bool alternativeBand=false) const "],
     "QgsLayerTreeViewDefaultActions": ["actionShowFeatureCount(QObject *parent=nullptr)", "actionShowInOverview(QObject *parent=nullptr)", "showFeatureCount()", "uniqueGroupName(QgsLayerTreeGroup *parentGroup)", "actionZoomToLayer(QgsMapCanvas *canvas, QObject *parent=nullptr)", "zoomToGroup()", "zoomToLayers(QgsMapCanvas *canvas, const QList< QgsMapLayer * > &layers)", "zoomToLayer(QgsMapCanvas *canvas)", "zoomToLayer()", "makeTopLevel()", "renameGroupOrLayer()", "actionAddGroup(QObject *parent=nullptr)", "addGroup()", "actionGroupSelected(QObject *parent=nullptr)", "groupSelected()", "actionRemoveGroupOrLayer(QObject *parent=nullptr)", "zoomToGroup(QgsMapCanvas *canvas)", "actionZoomToGroup(QgsMapCanvas *canvas, QObject *parent=nullptr)", "QgsLayerTreeViewDefaultActions(QgsLayerTreeView *view)", "removeGroupOrLayer()", "actionRenameGroupOrLayer(QObject *parent=nullptr)", "actionMakeTopLevel(QObject *parent=nullptr)", "showInOverview()"],
-    "QgsDataDefinedValueDialog": ["symbolDataDefined() const ", "dataDefinedChanged()", "init(const QString& description)", "setDataDefined(QgsSymbol *symbol, const QgsDataDefined &dd)=0", "value(const QgsSymbol *) const =0", "symbolDataDefined(const QgsSymbol *) const =0"],
+    "QgsDataDefinedValueDialog": ["symbolDataDefined() const ", "dataDefinedChanged()", "init(const QString& description)", "value(const QgsSymbol *) const =0", "symbolDataDefined(const QgsSymbol *) const =0"],
     "QgsLayerItem": ["iconLine()", "iconTable()", "iconPoint()", "iconRaster()", "QgsLayerItem(QgsDataItem *parent, const QString &name, const QString &path, const QString &uri, LayerType layerType, const QString &providerKey)", "iconPolygon()", "LayerType", "iconDefault()"],
     "pal::CostCalculator": ["setPolygonCandidatesCost(int nblp, QList< LabelPosition * > &lPos, RTree< pal::FeaturePart *, double, 2, double > *obstacles, double bbx[4], double bby[4])"],
     "pal::Util": ["unmulti(const GEOSGeometry *the_geom)"],
@@ -182,7 +182,6 @@
     "QgsShapeburstFillSymbolLayer": ["setOffsetMapUnitScale(const QgsMapUnitScale &scale)", "ShapeburstColorType", "distanceMapUnitScale() const ", "setDistanceMapUnitScale(const QgsMapUnitScale &scale)", "QgsShapeburstFillSymbolLayer(const QColor &color=DEFAULT_SIMPLEFILL_COLOR, const QColor &color2=Qt::white, ShapeburstColorType colorType=SimpleTwoColor, int blurRadius=0, bool useWholeShape=true, double maxDistance=5)", "offsetMapUnitScale() const ", "create(const QgsStringMap &properties=QgsStringMap())"],
     "QgsRangeConfigDlg": ["QgsRangeConfigDlg(QgsVectorLayer *vl, int fieldIdx, QWidget *parent)", "rangeWidgetChanged(int index)"],
     "QgsMapMouseEvent": ["SnappingMode"],
-    "QgsDataDefined": ["insertExpressionParam(const QString &key, const QVariant &param)", "expression()", "isActive() const ", "setActive(bool active)"],
     "QgsScaleExpression": ["Type", "operator bool() const "],
     "QgsSvgMarkerSymbolLayer": ["outlineWidthMapUnitScale() const ", "path() const ", "setOutlineWidthMapUnitScale(const QgsMapUnitScale &scale)", "setOutlineWidth(double w)", "outlineWidthUnit() const ", "QgsSvgMarkerSymbolLayer(const QString &name=DEFAULT_SVGMARKER_NAME, double size=DEFAULT_SVGMARKER_SIZE, double angle=DEFAULT_SVGMARKER_ANGLE, QgsSymbol::ScaleMethod scaleMethod=DEFAULT_SCALE_METHOD)", "create(const QgsStringMap &properties=QgsStringMap())", "setOutlineWidthUnit(QgsSymbol::OutputUnit unit)", "setPath(const QString &path)", "createFromSld(QDomElement &element)", "outlineWidth() const "],
     "QgsDateTimeEditWrapper": ["QgsDateTimeEditWrapper(QgsVectorLayer *vl, int fieldIdx, QWidget *editor, QWidget *parent=nullptr)"],
@@ -195,7 +194,7 @@
     "QgsLabelingEngine": ["processProvider(QgsAbstractLabelProvider *provider, QgsRenderContext &context, pal::Pal &p)", "Flag"],  # spellok
     "QgsSymbolSelectorDialog": ["moveLayerByOffset(int offset)", "QgsSymbolSelectorDialog(QgsSymbol *symbol, QgsStyle *style, const QgsVectorLayer *vl, QWidget *parent=nullptr, bool embedded=false)", "lockLayer()", "moveLayerUp()", "updateUi()", "addLayer()", "moveLayerDown()", "layerChanged()", "loadSymbol()", "setWidget(QWidget *widget)", "updateLayerPreview()", "symbolModified()", "updateLockButton()", "removeLayer()", "currentLayer()", "updatePreview()"],
     "QgsCacheIndexFeatureId": ["QgsCacheIndexFeatureId(QgsVectorLayerCache *)"],
-    "QgsSymbolLayerWidget": ["registerDataDefinedButton(QgsDataDefinedButton *button, const QString &propertyName, QgsDataDefinedButton::DataType type, const QString &description)", "setSymbolLayer(QgsSymbolLayer *layer)=0", "updateDataDefinedProperty()", "QgsSymbolLayerWidget(QWidget *parent, const QgsVectorLayer *vl=nullptr)", "symbolLayer()=0"],
+    "QgsSymbolLayerWidget": ["setSymbolLayer(QgsSymbolLayer *layer)=0", "updateDataDefinedProperty()", "QgsSymbolLayerWidget(QWidget *parent, const QgsVectorLayer *vl=nullptr)", "symbolLayer()=0"],
     "QgsRendererPropertiesDialog": ["apply()", "onOK()", "QgsRendererPropertiesDialog(QgsVectorLayer *layer, QgsStyle *style, bool embedded=false)"],
     "QgsAttributeTableFilterModel": ["fidToIndexList(QgsFeatureId fid)", "FilterMode", "mapFromMaster(const QModelIndex &sourceIndex) const ", "mapToMaster(const QModelIndex &proxyIndex) const "],
     "QgsRasterRendererWidget": ["min(int index=0)", "rasterLayer() const ", "selectedBand(int index=0)", "stdDev()", "setMax(const QString &value, int index=0)", "LoadMinMaxAlgo", "setMin(const QString &value, int index=0)", "setRasterLayer(QgsRasterLayer *layer)", "max(int index=0)", "QgsRasterRendererWidget(QgsRasterLayer *layer, const QgsRectangle &extent)", "setStdDev(const QString &value)", "renderer()=0"],
@@ -346,7 +345,6 @@
     "QgsBrowserWatcher": ["item() const ", "QgsBrowserWatcher(QgsDataItem *item)", "finished(QgsDataItem *item, const QVector< QgsDataItem * > &items)"],
     "QgsVectorLayerUndoCommandChangeAttribute": ["QgsVectorLayerUndoCommandChangeAttribute(QgsVectorLayerEditBuffer *buffer, QgsFeatureId fid, int fieldIndex, const QVariant &newValue, const QVariant &oldValue)"],
     "QgsDiagramLayerSettings": ["readXML(const QDomElement &elem, const QgsVectorLayer *layer)", "Placement", "writeXML(QDomElement &layerElem, QDomDocument &doc, const QgsVectorLayer *layer) const "],
-    "QgsDataDefinedButton": ["lineStyleDesc()", "customDashDesc()", "intDesc()", "colorAlphaDesc()", "capStyleDesc()", "doublePosDesc()", "gradientSpreadDesc()", "unitsMmMuPercentDesc()", "intPosOneDesc()", "doubleDesc()", "svgPathDesc()", "double180RotDesc()", "unitsMmMuDesc()", "boolDesc()", "gradientCoordModeDesc()", "charDesc()", "filePathDesc()", "gradientTypeDesc()", "penJoinStyleDesc()", "intPosDesc()", "paperOrientationDesc()", "fillStyleDesc()", "textHorzAlignDesc()", "markerStyleDesc()", "definedProperty() const ", "colorNoAlphaDesc()", "blendModesDesc()", "DataType", "verticalAnchorDesc()", "paperSizeDesc()", "double0to1Desc()", "intTranspDesc()", "horizontalAnchorDesc()", "anyStringDesc()", "doubleXYDesc()", "textVertAlignDesc()"],
     "QgsValueMapWidgetFactory": ["QgsValueMapWidgetFactory(const QString &name)"],
     "QgsComposerLayerItem": ["showFeatureCount() const ", "setDefaultStyle(double scaleDenominator=-1, const QString &rule=\"\")", "QgsComposerLayerItem(const QString &text)", "setLayerID(const QString &id)", "layerID() const ", "setShowFeatureCount(bool show)"],
     "QgsSingleBandPseudoColorRenderer": ["classificationMax() const ", "setClassificationMax(double max)", "create(const QDomElement &elem, QgsRasterInterface *input)", "setClassificationMin(double min)", "classificationMinMaxOrigin() const ", "setClassificationMinMaxOrigin(int origin)", "shader()", "classificationMin() const "],
@@ -725,7 +723,6 @@
     "QgsErrorItem",
     "QgsCheckboxWidgetFactory",
     "QgsComposerLayerItem",
-    "QgsDataDefined",
     "Triangulation",
     "QgsGlowWidget",
     "QgsVectorFileWriter::Option",
@@ -791,7 +788,6 @@
     "QgsColorRampShader",
     "QgsMapUnitScale",
     "pal::Util",
-    "QgsDataDefinedSymbolDialog",
     "QgsGpsdConnection",
     "pal::PointSet",
     "QgsDateTimeEditWrapper",
@@ -1180,7 +1176,6 @@
     "QgsLinearlyInterpolatedDiagramRenderer",
     "QgsOwsConnection",
     "QgsGenericProjectionSelector",
-    "QgsDataDefinedButton",
     "QgsColorSchemeModel",
     "QgsBlurWidget",
     "QgsSQLStatement::NodeColumnSorted",
@@ -1741,7 +1736,6 @@
                             'QgsExpression::Node',
                             'QgsTransformWidget',
                             'QgsGroupWmsDataDialog',
-                            'QgsDataDefinedSymbolDialog',
                             'QgsColorBrewerPalette',
                             'LinTriangleInterpolator',
                             'QgsFontUtils',