Skip to content
Permalink
Browse files

Fix build warning

  • Loading branch information
nyalldawson committed Dec 4, 2017
1 parent 13614dc commit 4689537842249c26aa9b26ce32f7ccdf82b87851
@@ -198,7 +198,7 @@ class QgsLayoutItemHtml: QgsLayoutMultiFrame

virtual QSizeF totalSize() const;

virtual void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
const QStyleOptionGraphicsItem *itemStyle = 0 );

virtual double findNearbyPageBreak( double yPos );
@@ -111,7 +111,7 @@ class QgsLayoutMultiFrame: QgsLayoutObject, QgsLayoutUndoObjectInterface
:rtype: QSizeF
%End

virtual void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
%Docstring
Renders a portion of the multiframe's content into a render ``context``.
@@ -32,17 +32,9 @@
#ifndef UTILS_H
#define UTILS_H

// Otherwise #defines like M_PI are undeclared under Visual Studio
#define _USE_MATH_DEFINES

#include <exception>
#include <math.h>

// C99 removes M_PI from math.h
#ifndef M_PI
#define M_PI 3.14159265358979323846264338327
#endif

namespace p2t {

const double PI_3div4 = 3 * M_PI / 4;
@@ -204,7 +204,7 @@ class CORE_EXPORT QgsLayoutItemHtml: public QgsLayoutMultiFrame

QString displayName() const override;
QSizeF totalSize() const override;
void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
const QStyleOptionGraphicsItem *itemStyle = nullptr ) override;

//overridden to break frames without dividing lines of text
@@ -141,7 +141,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
* \param frameIndex frame number for content
* \param itemStyle item style options for graphics item rendering
*/
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
const QStyleOptionGraphicsItem *itemStyle = nullptr ) = 0;

/**
@@ -74,7 +74,7 @@ class TestMultiFrame : public QgsLayoutMultiFrame
return QStringLiteral( "TestMultiFrame" );
}

void render( QgsRenderContext &, const QRectF &, const int,
void render( QgsRenderContext &, const QRectF &, int,
const QStyleOptionGraphicsItem * ) override
{

0 comments on commit 4689537

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