Skip to content
Permalink
Browse files

Fix some compiler warnings

  • Loading branch information
nyalldawson committed Dec 3, 2014
1 parent b278ea1 commit 16b4dfe12bbe621b7e76942f694b54b683907895
Showing with 17 additions and 8 deletions.
  1. +3 −2 src/server/qgswmsconfigparser.cpp
  2. +14 −5 src/server/qgswmsprojectparser.cpp
  3. +0 −1 src/ui/qgsexpressionbuilder.ui
@@ -22,6 +22,7 @@
#include "qgscomposerlabel.h"
#include "qgscomposerlegend.h"
#include "qgscomposermap.h"
#include "qgscomposermapgrid.h"
#include "qgscomposerhtml.h"
#include "qgscomposerframe.h"
#include "qgscomposition.h"
@@ -161,8 +162,8 @@ QgsComposition* QgsWMSConfigParser::createPrintComposition( const QString& compo
}

//grid space x / y
currentMap->setGridIntervalX( parameterMap.value( mapId + ":GRID_INTERVAL_X" ).toDouble() );
currentMap->setGridIntervalY( parameterMap.value( mapId + ":GRID_INTERVAL_Y" ).toDouble() );
currentMap->grid()->setIntervalX( parameterMap.value( mapId + ":GRID_INTERVAL_X" ).toDouble() );
currentMap->grid()->setIntervalY( parameterMap.value( mapId + ":GRID_INTERVAL_Y" ).toDouble() );
}
//update legend
// if it has an auto-update model
@@ -30,6 +30,7 @@
#include "qgscomposerlabel.h"
#include "qgscomposerlegend.h"
#include "qgscomposermap.h"
#include "qgscomposerframe.h"
#include "qgscomposerhtml.h"
#include "qgscomposerpicture.h"
#include "qgscomposerscalebar.h"
@@ -435,14 +436,22 @@ QgsComposition* QgsWMSProjectParser::initComposition( const QString& composerTem
QgsComposerPicture* pic = dynamic_cast< QgsComposerPicture *>( *itemIt );
if ( pic )
{
pic->setPictureFile( mProjectParser->convertToAbsolutePath(( pic )->pictureFile() ) );
pic->setPicturePath( mProjectParser->convertToAbsolutePath(( pic )->picturePath() ) );
continue;
}
const QgsComposerHtml* html = composition->getComposerHtmlByItem( *itemIt );
if ( html )

// an html item will be a composer frame and if it is we can try to get
// its multiframe parent and then try to cast that to a composer html
const QgsComposerFrame* frame = dynamic_cast<const QgsComposerFrame *>( *itemIt );
if ( frame )
{
htmlList.push_back( html );
continue;
const QgsComposerMultiFrame * multiFrame = frame->multiFrame();
const QgsComposerHtml* composerHtml = dynamic_cast<const QgsComposerHtml *>( multiFrame );
if ( composerHtml )
{
htmlList.push_back( composerHtml );
continue;
}
}
}

@@ -543,7 +543,6 @@
</widget>
</item>
</layout>
<zorder>splitter_2</zorder>
<zorder>mLoadGroupBox</zorder>
<zorder>splitter</zorder>
<zorder>groupBox</zorder>

0 comments on commit 16b4dfe

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