Skip to content
Permalink
Browse files

Merge pull request #5799 from nyalldawson/mingw

Mingw build fixes and windows build warning fixes
  • Loading branch information
nyalldawson committed Dec 4, 2017
2 parents 32ba5bf + 4689537 commit b26c14ef04f05159a1b775c672991fa5ef690fac
@@ -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;
@@ -477,7 +477,7 @@ int main( int argc, char *argv[] )
signal( SIGXFSZ, qgisCrash );
#endif

#ifdef Q_OS_WIN
#ifdef _MSC_VER
SetUnhandledExceptionFilter( QgsCrashHandler::handle );
#endif

@@ -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;

/**
@@ -847,7 +847,7 @@ QString QgsApplication::userFullName()
//fall back to login name
if ( sUserFullName.isEmpty() )
sUserFullName = userLoginName();
#elif defined(Q_OS_ANDROID)
#elif defined(Q_OS_ANDROID) || defined(__MINGW32__)
sUserFullName = "Not available";
#else
struct passwd *p = getpwuid( getuid() );
@@ -387,6 +387,8 @@ bool QgsFeatureRequest::OrderByClause::prepare( QgsExpressionContext *context )
return mExpression.prepare( context );
}

QgsFeatureRequest::OrderBy::OrderBy() = default;

QgsFeatureRequest::OrderBy::OrderBy( const QList<QgsFeatureRequest::OrderByClause> &other )
{
Q_FOREACH ( const QgsFeatureRequest::OrderByClause &clause, other )
@@ -225,7 +225,7 @@ class CORE_EXPORT QgsFeatureRequest
/**
* Create a new empty order by
*/
CORE_EXPORT OrderBy() = default;
CORE_EXPORT OrderBy();

/**
* Create a new order by from a list of clauses
@@ -154,7 +154,7 @@ void QgsMapLayerModel::removeLayers( const QStringList &layerIds )

void QgsMapLayerModel::addLayers( const QList<QgsMapLayer *> &layers )
{
if ( layers.count( ) )
if ( !layers.empty( ) )
{
int offset = 0;
if ( mAllowEmpty )
@@ -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 b26c14e

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