Skip to content

Commit 4689537

Browse files
committed
Fix build warning
1 parent 13614dc commit 4689537

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed

python/core/layout/qgslayoutitemhtml.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class QgsLayoutItemHtml: QgsLayoutMultiFrame
198198

199199
virtual QSizeF totalSize() const;
200200

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

204204
virtual double findNearbyPageBreak( double yPos );

python/core/layout/qgslayoutmultiframe.sip

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class QgsLayoutMultiFrame: QgsLayoutObject, QgsLayoutUndoObjectInterface
111111
:rtype: QSizeF
112112
%End
113113

114-
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
114+
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
115115
const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
116116
%Docstring
117117
Renders a portion of the multiframe's content into a render ``context``.

src/3d/poly2tri/common/utils.h

-8
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,9 @@
3232
#ifndef UTILS_H
3333
#define UTILS_H
3434

35-
// Otherwise #defines like M_PI are undeclared under Visual Studio
36-
#define _USE_MATH_DEFINES
37-
3835
#include <exception>
3936
#include <math.h>
4037

41-
// C99 removes M_PI from math.h
42-
#ifndef M_PI
43-
#define M_PI 3.14159265358979323846264338327
44-
#endif
45-
4638
namespace p2t {
4739

4840
const double PI_3div4 = 3 * M_PI / 4;

src/core/layout/qgslayoutitemhtml.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ class CORE_EXPORT QgsLayoutItemHtml: public QgsLayoutMultiFrame
204204

205205
QString displayName() const override;
206206
QSizeF totalSize() const override;
207-
void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
207+
void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
208208
const QStyleOptionGraphicsItem *itemStyle = nullptr ) override;
209209

210210
//overridden to break frames without dividing lines of text

src/core/layout/qgslayoutmultiframe.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
141141
* \param frameIndex frame number for content
142142
* \param itemStyle item style options for graphics item rendering
143143
*/
144-
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, const int frameIndex,
144+
virtual void render( QgsRenderContext &context, const QRectF &renderExtent, int frameIndex,
145145
const QStyleOptionGraphicsItem *itemStyle = nullptr ) = 0;
146146

147147
/**

tests/src/core/testqgslayoutmultiframe.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class TestMultiFrame : public QgsLayoutMultiFrame
7474
return QStringLiteral( "TestMultiFrame" );
7575
}
7676

77-
void render( QgsRenderContext &, const QRectF &, const int,
77+
void render( QgsRenderContext &, const QRectF &, int,
7878
const QStyleOptionGraphicsItem * ) override
7979
{
8080

0 commit comments

Comments
 (0)