Skip to content

Commit

Permalink
fix #15634
Browse files Browse the repository at this point in the history
(cherry picked from commit be16776)
  • Loading branch information
jef-n committed Sep 28, 2016
1 parent c7b6816 commit 8b6d355
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
10 changes: 5 additions & 5 deletions src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1007,11 +1007,11 @@ void QgsCategorizedSymbolRendererV2Widget::matchToSymbolsFromXml()

void QgsCategorizedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget *container )
{
if ( container )
{
QgsSymbolV2SelectorWidget* dlg = qobject_cast<QgsSymbolV2SelectorWidget*>( container );
delete dlg->symbol();
}
QgsSymbolV2SelectorWidget *dlg = qobject_cast<QgsSymbolV2SelectorWidget*>( container );
if ( !dlg )
return;

delete dlg->symbol();
}

void QgsCategorizedSymbolRendererV2Widget::updateSymbolsFromWidget()
Expand Down
10 changes: 5 additions & 5 deletions src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -689,11 +689,11 @@ void QgsGraduatedSymbolRendererV2Widget::refreshRanges( bool reset )

void QgsGraduatedSymbolRendererV2Widget::cleanUpSymbolSelector( QgsPanelWidget *container )
{
if ( container )
{
QgsSymbolV2SelectorWidget* dlg = qobject_cast<QgsSymbolV2SelectorWidget*>( container );
delete dlg->symbol();
}
QgsSymbolV2SelectorWidget *dlg = qobject_cast<QgsSymbolV2SelectorWidget*>( container );
if ( !dlg )
return;

delete dlg->symbol();
}

void QgsGraduatedSymbolRendererV2Widget::updateSymbolsFromWidget()
Expand Down
5 changes: 4 additions & 1 deletion src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,10 @@ void QgsRuleBasedRendererV2Widget::refineRuleRangesAccepted( QgsPanelWidget *pan

void QgsRuleBasedRendererV2Widget::ruleWidgetPanelAccepted( QgsPanelWidget *panel )
{
QgsRendererRulePropsWidget* widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
QgsRendererRulePropsWidget *widget = qobject_cast<QgsRendererRulePropsWidget*>( panel );
if ( !widget )
return;

widget->apply();

// model should know about the change and emit dataChanged signal for the view
Expand Down

0 comments on commit 8b6d355

Please sign in to comment.