sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix build warning

Browse Source
This commit is contained in:
Nyall Dawson 2017-12-05 08:10:14 +11:00
parent 13614dc4bb
commit 4689537842
6 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/layout/qgslayoutitemhtml.sip
View File

@ -198,7 +198,7 @@ class QgsLayoutItemHtml: QgsLayoutMultiFrame
virtual QSizeF totalSize() const; 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 ); const QStyleOptionGraphicsItem *itemStyle = 0 );
virtual double findNearbyPageBreak( double yPos ); virtual double findNearbyPageBreak( double yPos );

2
python/core/layout/qgslayoutmultiframe.sip
View File

@ -111,7 +111,7 @@ class QgsLayoutMultiFrame: QgsLayoutObject, QgsLayoutUndoObjectInterface
:rtype: QSizeF :rtype: QSizeF
%End %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; const QStyleOptionGraphicsItem *itemStyle = 0 ) = 0;
%Docstring %Docstring
Renders a portion of the multiframe's content into a render ``context``. Renders a portion of the multiframe's content into a render ``context``.

8
src/3d/poly2tri/common/utils.h
View File

@ -32,17 +32,9 @@
#ifndef UTILS_H #ifndef UTILS_H
#define UTILS_H #define UTILS_H
// Otherwise #defines like M_PI are undeclared under Visual Studio
#define _USE_MATH_DEFINES
#include <exception> #include <exception>
#include <math.h> #include <math.h>
// C99 removes M_PI from math.h
#ifndef M_PI
#define M_PI 3.14159265358979323846264338327
#endif
namespace p2t { namespace p2t {
const double PI_3div4 = 3 * M_PI / 4; const double PI_3div4 = 3 * M_PI / 4;

2
src/core/layout/qgslayoutitemhtml.h
View File

@ -204,7 +204,7 @@ class CORE_EXPORT QgsLayoutItemHtml: public QgsLayoutMultiFrame
QString displayName() const override; QString displayName() const override;
QSizeF totalSize() 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; const QStyleOptionGraphicsItem *itemStyle = nullptr ) override;
//overridden to break frames without dividing lines of text //overridden to break frames without dividing lines of text

2
src/core/layout/qgslayoutmultiframe.h
View File

@ -141,7 +141,7 @@ class CORE_EXPORT QgsLayoutMultiFrame: public QgsLayoutObject, public QgsLayoutU
* \param frameIndex frame number for content * \param frameIndex frame number for content
* \param itemStyle item style options for graphics item rendering * \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; const QStyleOptionGraphicsItem *itemStyle = nullptr ) = 0;
/** /**

2
tests/src/core/testqgslayoutmultiframe.cpp
View File

@ -74,7 +74,7 @@ class TestMultiFrame : public QgsLayoutMultiFrame
return QStringLiteral( "TestMultiFrame" ); return QStringLiteral( "TestMultiFrame" );
} }
void render( QgsRenderContext &, const QRectF &, const int, void render( QgsRenderContext &, const QRectF &, int,
const QStyleOptionGraphicsItem * ) override const QStyleOptionGraphicsItem * ) override
{ {