Skip to content
Permalink
Browse files

Fix build problems

  • Loading branch information
wonder-sk committed Jun 20, 2017
1 parent ea0b689 commit 0bd29c3f9874081e48b4b22151d1d3e58bbc1177
@@ -28,6 +28,9 @@ class QgsDataDefinedSizeLegend
QgsDataDefinedSizeLegend();

QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
%Docstring
Copy constructor
%End

enum LegendType
{
@@ -741,6 +741,9 @@ Returns list with all diagram settings in the renderer


QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );
%Docstring
Copy constructor
%End

};

@@ -40,6 +40,7 @@ class CORE_EXPORT QgsDataDefinedSizeLegend
public:
QgsDataDefinedSizeLegend();

//! Copy constructor
QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other );
QgsDataDefinedSizeLegend &operator=( const QgsDataDefinedSizeLegend &other );

@@ -702,6 +702,7 @@ class CORE_EXPORT QgsLinearlyInterpolatedDiagramRenderer : public QgsDiagramRend

QSizeF diagramSize( const QgsFeature &, const QgsRenderContext &c ) const override;

//! Copy constructor
QgsLinearlyInterpolatedDiagramRenderer( const QgsLinearlyInterpolatedDiagramRenderer &other );

private:
@@ -466,7 +466,11 @@ QgsCategorizedSymbolRendererWidget::QgsCategorizedSymbolRendererWidget( QgsVecto
advMenu->addAction( tr( "Match to symbols from file..." ), this, SLOT( matchToSymbolsFromXml() ) );
advMenu->addAction( tr( "Symbol levels..." ), this, SLOT( showSymbolLevels() ) );
if ( mCategorizedSymbol->type() == QgsSymbol::Marker )
advMenu->addAction( tr( "Data-defined size legend..." ), this, &QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend );
{
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend..." ) );
// only from Qt 5.6 there is convenience addAction() with new style connection
connect( actionDdsLegend, &QAction::triggered, this, &QgsCategorizedSymbolRendererWidget::dataDefinedSizeLegend );
}

btnAdvanced->setMenu( advMenu );

@@ -513,7 +513,11 @@ QgsGraduatedSymbolRendererWidget::QgsGraduatedSymbolRendererWidget( QgsVectorLay

advMenu->addAction( tr( "Symbol levels..." ), this, SLOT( showSymbolLevels() ) );
if ( mGraduatedSymbol->type() == QgsSymbol::Marker )
advMenu->addAction( tr( "Data-defined size legend..." ), this, &QgsGraduatedSymbolRendererWidget::dataDefinedSizeLegend );
{
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend..." ) );
// only from Qt 5.6 there is convenience addAction() with new style connection
connect( actionDdsLegend, &QAction::triggered, this, &QgsGraduatedSymbolRendererWidget::dataDefinedSizeLegend );
}

btnAdvanced->setMenu( advMenu );

@@ -66,7 +66,11 @@ QgsSingleSymbolRendererWidget::QgsSingleSymbolRendererWidget( QgsVectorLayer *la

advMenu->addAction( tr( "Symbol levels..." ), this, &QgsSingleSymbolRendererWidget::showSymbolLevels );
if ( mSingleSymbol->type() == QgsSymbol::Marker )
advMenu->addAction( tr( "Data-defined size legend..." ), this, &QgsSingleSymbolRendererWidget::dataDefinedSizeLegend );
{
QAction *actionDdsLegend = advMenu->addAction( tr( "Data-defined size legend..." ) );
// only from Qt 5.6 there is convenience addAction() with new style connection
connect( actionDdsLegend, &QAction::triggered, this, &QgsSingleSymbolRendererWidget::dataDefinedSizeLegend );
}
}

QgsSingleSymbolRendererWidget::~QgsSingleSymbolRendererWidget()

0 comments on commit 0bd29c3

Please sign in to comment.
You can’t perform that action at this time.