fix msvc build

qgis · May 10, 2021 · f616be2 · f616be2
1 parent 15d4e87
commit f616be2
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/external/mdal/frmts/mdal_dynamic_driver.cpp b/external/mdal/frmts/mdal_dynamic_driver.cpp
@@ -6,7 +6,7 @@
 
 #include "mdal_dynamic_driver.hpp"
 #include "mdal_logger.hpp"
-#if not defined (WIN32)
+#if !defined(WIN32)
 #include <dlfcn.h>
 #endif
 #include <string.h>

diff --git a/python/core/auto_generated/settings/qgssettingsregistrycore.sip.in b/python/core/auto_generated/settings/qgssettingsregistrycore.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsSettingsRegistryCore : QgsSettingsRegistry
 {
 %Docstring(signature="appended")

diff --git a/src/3d/qgspointcloudlayerchunkloader_p.cpp b/src/3d/qgspointcloudlayerchunkloader_p.cpp
@@ -209,7 +209,7 @@ QgsAABB nodeBoundsToAABB( QgsPointCloudDataBounds nodeBounds, QgsVector3D offset
     extentMin3D = coordinateTransform.transform( extentMin3D );
     extentMax3D = coordinateTransform.transform( extentMax3D );
   }
-  catch ( QgsCsException &e )
+  catch ( QgsCsException & )
   {
     QgsDebugMsg( QStringLiteral( "Error transforming node bounds coordinate" ) );
   }

diff --git a/src/3d/symbols/qgspointcloud3dsymbol_p.cpp b/src/3d/symbols/qgspointcloud3dsymbol_p.cpp
@@ -426,7 +426,7 @@ void QgsColorRampPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex *pc,
     {
       coordinateTransform.transformInPlace( x, y, z );
     }
-    catch ( QgsCsException &e )
+    catch ( QgsCsException & )
     {
       if ( !alreadyPrintedDebug )
       {
@@ -545,7 +545,7 @@ void QgsRGBPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex *pc, const
     {
       coordinateTransform.transformInPlace( x, y, z );
     }
-    catch ( QgsCsException &e )
+    catch ( QgsCsException & )
     {
       if ( !alreadyPrintedDebug )
       {
@@ -699,7 +699,7 @@ void QgsClassificationPointCloud3DSymbolHandler::processNode( QgsPointCloudIndex
     {
       coordinateTransform.transformInPlace( x, y, z );
     }
-    catch ( QgsCsException &e )
+    catch ( QgsCsException & )
     {
       if ( !alreadyPrintedDebug )
       {

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -163,7 +163,7 @@ QgsAbstractDatabaseProviderConnection *QgsDataCollectionItem::databaseConnection
       return static_cast<QgsAbstractDatabaseProviderConnection *>( md->createConnection( databaseFilePath, {} ) );
     }
   }
-  catch ( QgsProviderConnectionException &ex )
+  catch ( QgsProviderConnectionException & )
   {
     // This is expected and it is not an error in case the provider does not implement
     // the connections API
@@ -1911,7 +1911,7 @@ QgsAbstractDatabaseProviderConnection *QgsDatabaseSchemaItem::databaseConnection
   {
     return static_cast<QgsAbstractDatabaseProviderConnection *>( md->createConnection( connectionName ) );
   }
-  catch ( QgsProviderConnectionException &ex )
+  catch ( QgsProviderConnectionException & )
   {
     // This is expected and it is not an error in case the provider does not implement
     // the connections API

diff --git a/src/core/settings/qgssettingsregistrycore.h b/src/core/settings/qgssettingsregistrycore.h
@@ -25,6 +25,14 @@
 #include "qgis.h"
 #include "qgssnappingconfig.h"
 #include "qgsgeometry.h"
+#include "qgsmaplayerproxymodel.h"
+
+template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsSnappingConfig::SnappingTypes> SIP_SKIP;
+template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsTolerance::UnitType> SIP_SKIP;
+template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsGeometry::JoinStyle> SIP_SKIP;
+template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsGeometry::EndCapStyle> SIP_SKIP;
+template class CORE_EXPORT QgsSettingsEntryEnumFlag<QgsUnitTypes::LayoutUnit> SIP_SKIP;
+template class CORE_EXPORT QgsSettingsEntryEnumFlag< class QFlags<enum QgsMapLayerProxyModel::Filter> > SIP_SKIP;
 
 /**
  * \ingroup core