Merge pull request #5799 from nyalldawson/mingw

Mingw build fixes and windows build warning fixes
qgis · Dec 4, 2017 · b26c14e · b26c14e
2 parents 32ba5bf + 4689537
commit b26c14e
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 17 deletions.
diff --git a/python/core/layout/qgslayoutitemhtml.sip b/python/core/layout/qgslayoutitemhtml.sip
@@ -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 );

diff --git a/python/core/layout/qgslayoutmultiframe.sip b/python/core/layout/qgslayoutmultiframe.sip
@@ -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``.

diff --git a/src/3d/poly2tri/common/utils.h b/src/3d/poly2tri/common/utils.h
@@ -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;

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -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
 

diff --git a/src/core/layout/qgslayoutitemhtml.h b/src/core/layout/qgslayoutitemhtml.h
@@ -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

diff --git a/src/core/layout/qgslayoutmultiframe.h b/src/core/layout/qgslayoutmultiframe.h
@@ -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;
 
     /**

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -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() );

diff --git a/src/core/qgsfeaturerequest.cpp b/src/core/qgsfeaturerequest.cpp
@@ -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 )

diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h
@@ -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

diff --git a/src/core/qgsmaplayermodel.cpp b/src/core/qgsmaplayermodel.cpp
@@ -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 )

diff --git a/tests/src/core/testqgslayoutmultiframe.cpp b/tests/src/core/testqgslayoutmultiframe.cpp
@@ -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
     {