Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix server build, follow up 772f593 again
sorry for the noise
  • Loading branch information
3nids committed Aug 8, 2016
1 parent 5baa9a4 commit 313a049
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/server/qgswmsconfigparser.cpp
Expand Up @@ -202,7 +202,7 @@ QgsComposition* QgsWmsConfigParser::createPrintComposition( const QString& compo
{
if (( *legendIt )->autoUpdateModel() )
{
setLayerIdsToLegendModel(( *legendIt )->modelV2(), bkLayerSet, currentMap->scale() );
setLayerIdsToLegendModel(( *legendIt )->model(), bkLayerSet, currentMap->scale() );
}
}

Expand Down Expand Up @@ -231,7 +231,7 @@ QgsComposition* QgsWmsConfigParser::createPrintComposition( const QString& compo
}

// get model and layer tree root of the legend
QgsLegendModelV2* model = currentLegend->modelV2();
QgsLegendModelV2* model = currentLegend->model();
QStringList layerSet = map->layerSet();
setLayerIdsToLegendModel( model, layerSet, map->scale() );
}
Expand Down
2 changes: 1 addition & 1 deletion src/server/qgswmsprojectparser.cpp
Expand Up @@ -518,7 +518,7 @@ QgsComposition* QgsWmsProjectParser::initComposition( const QString& composerTem
QgsComposerLegend* legend = dynamic_cast< QgsComposerLegend *>( *itemIt );
if ( legend )
{
QgsLegendModelV2* model = legend->modelV2();
QgsLegendModelV2* model = legend->model();
#if 0
QgsLayerTreeGroup* root = model->rootGroup();
QStringList layerIds = root->findLayerIds();
Expand Down

0 comments on commit 313a049

Please sign in to comment.