fix windows build including some warnings

qgis · Aug 17, 2019 · 19220b9 · 19220b9
1 parent 8b4cecb
commit 19220b9
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 22 deletions.
diff --git a/python/core/auto_generated/qgsabstractdatabaseproviderconnection.sip.in b/python/core/auto_generated/qgsabstractdatabaseproviderconnection.sip.in
@@ -384,7 +384,7 @@ Raises a QgsProviderConnectionException if any errors are encountered.
 
 
 
-    virtual QStringList schemas( ) const throw( QgsProviderConnectionException );
+    virtual QStringList schemas() const throw( QgsProviderConnectionException );
 %Docstring
 Returns information about the existing schemas.
 Raises a QgsProviderConnectionException if any errors are encountered.

diff --git a/src/app/layout/qgsreportsectionmodel.cpp b/src/app/layout/qgsreportsectionmodel.cpp
@@ -110,7 +110,9 @@ QVariant QgsReportSectionModel::data( const QModelIndex &index, int role ) const
       return QVariant();
   }
 
+#ifndef _MSC_VER
   return QVariant();
+#endif
 }
 
 QVariant QgsReportSectionModel::headerData( int section, Qt::Orientation orientation, int role ) const

diff --git a/src/core/providers/gdal/qgsgdaldataitems.h b/src/core/providers/gdal/qgsgdaldataitems.h
@@ -25,6 +25,7 @@
 ///@cond PRIVATE
 #define SIP_NO_FILE
 
+Q_NOWARN_DEPRECATED_PUSH  // setCrs is deprecated
 class CORE_EXPORT QgsGdalLayerItem : public QgsLayerItem
 {
     Q_OBJECT
@@ -44,6 +45,7 @@ class CORE_EXPORT QgsGdalLayerItem : public QgsLayerItem
 
     QString layerName() const override;
 };
+Q_NOWARN_DEPRECATED_POP
 
 //! Provider for GDAL root data item
 class QgsGdalDataItemProvider : public QgsDataItemProvider

diff --git a/src/core/qgsabstractdatabaseproviderconnection.cpp b/src/core/qgsabstractdatabaseproviderconnection.cpp
@@ -37,7 +37,7 @@ QgsAbstractDatabaseProviderConnection::Capabilities QgsAbstractDatabaseProviderC
 ///@cond PRIVATE
 void QgsAbstractDatabaseProviderConnection::checkCapability( QgsAbstractDatabaseProviderConnection::Capability capability ) const
 {
-  if ( ! mCapabilities & capability )
+  if ( ! mCapabilities.testFlag( capability ) )
   {
     static QMetaEnum metaEnum = QMetaEnum::fromType<QgsAbstractDatabaseProviderConnection::Capability>();
     const QString capName { metaEnum.valueToKey( capability ) };

diff --git a/src/core/qgsabstractdatabaseproviderconnection.h b/src/core/qgsabstractdatabaseproviderconnection.h
@@ -74,7 +74,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
      * can contain multiple geometry types and/or CRSs, a clone of the property
      * for the individual geometry type/CRS can be retrieved with at(i)
      */
-    struct TableProperty
+    struct CORE_EXPORT TableProperty
     {
 
 #ifdef SIP_RUN
@@ -89,7 +89,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
          * The GeometryColumnType struct represents the combination
          * of geometry type and CRS for the table geometry column.
          */
-        struct GeometryColumnType
+        struct CORE_EXPORT GeometryColumnType
         {
 #ifdef SIP_RUN
           SIP_PYOBJECT __repr__();
@@ -428,7 +428,7 @@ class CORE_EXPORT QgsAbstractDatabaseProviderConnection : public QgsAbstractProv
      * Raises a QgsProviderConnectionException if any errors are encountered.
      * \throws QgsProviderConnectionException
      */
-    virtual QStringList schemas( ) const SIP_THROW( QgsProviderConnectionException );
+    virtual QStringList schemas() const SIP_THROW( QgsProviderConnectionException );
 
   protected:
 

diff --git a/src/core/qgsattributes.cpp b/src/core/qgsattributes.cpp
@@ -33,7 +33,7 @@ QgsAttributeMap QgsAttributes::toMap() const
 uint qHash( const QgsAttributes &attributes )
 {
   if ( attributes.isEmpty() )
-    return ~0;
+    return std::numeric_limits<uint>::max();
   else
     return qHash( attributes.at( 0 ) );
 }
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -821,6 +821,7 @@ class CORE_EXPORT QgsProjectHomeItem : public QgsDirectoryItem
  * A directory item showing the a single favorite directory.
  * \since QGIS 3.0
 */
+Q_NOWARN_DEPRECATED_PUSH  // rename is deprecated
 class CORE_EXPORT QgsFavoriteItem : public QgsDirectoryItem
 {
     Q_OBJECT
@@ -835,6 +836,7 @@ class CORE_EXPORT QgsFavoriteItem : public QgsDirectoryItem
 
     QgsFavoritesItem *mFavorites = nullptr;
 };
+Q_NOWARN_DEPRECATED_POP
 
 #endif
 ///@endcond

diff --git a/src/core/qgslabelingengine.cpp b/src/core/qgslabelingengine.cpp
@@ -223,7 +223,7 @@ void QgsLabelingEngine::processProvider( QgsAbstractLabelProvider *provider, Qgs
   l->setCentroidInside( flags.testFlag( QgsAbstractLabelProvider::CentroidMustBeInside ) );
 
   // set how to show upside-down labels
-  pal::Layer::UpsideDownLabels upsdnlabels;
+  pal::Layer::UpsideDownLabels upsdnlabels = pal::Layer::ShowAll;
   switch ( provider->upsidedownLabels() )
   {
     case QgsPalLayerSettings::Upright:

diff --git a/src/core/qgssettings.h b/src/core/qgssettings.h
@@ -329,7 +329,7 @@ class CORE_EXPORT QgsSettings : public QObject
         QgsDebugMsg( QStringLiteral( "Invalid metaenum. Enum probably misses Q_ENUM or Q_FLAG declaration." ) );
       }
 
-      T v;
+      T v = defaultValue;
       bool ok = false;
 
       if ( metaEnum.isValid() )

diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.cpp
@@ -904,7 +904,7 @@ void QgsGraduatedSymbolRendererWidget::classifyGraduated()
     return;
   }
 
-  QgsGraduatedSymbolRenderer::Mode mode;
+  QgsGraduatedSymbolRenderer::Mode mode = QgsGraduatedSymbolRenderer::Quantile;
   bool useSymmetricMode = false;
   bool astride = false;
 

diff --git a/src/providers/oracle/qgsoracledataitems.h b/src/providers/oracle/qgsoracledataitems.h
@@ -103,6 +103,7 @@ class QgsOracleOwnerItem : public QgsDataCollectionItem
     void addLayer( const QgsOracleLayerProperty &layerProperty );
 };
 
+Q_NOWARN_DEPRECATED_PUSH // deleteLayer deprecated
 class QgsOracleLayerItem : public QgsLayerItem
 {
     Q_OBJECT
@@ -120,6 +121,7 @@ class QgsOracleLayerItem : public QgsLayerItem
   private:
     QgsOracleLayerProperty mLayerProperty;
 };
+Q_NOWARN_DEPRECATED_POP
 
 //! Provider for ORACLE root data item
 class QgsOracleDataItemProvider : public QgsDataItemProvider

diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -88,33 +88,33 @@ struct QgsPostgresLayerProperty
   // TODO: rename this !
   int size() const { Q_ASSERT( types.size() == srids.size() ); return types.size(); }
 
-  QString   defaultName() const
+  QString defaultName() const
   {
     QString n = tableName;
     if ( nSpCols > 1 ) n += '.' + geometryColName;
     return n;
   }
 
-  QgsPostgresLayerProperty at( unsigned int i ) const
+  QgsPostgresLayerProperty at( int i ) const
   {
     QgsPostgresLayerProperty property;
 
     Q_ASSERT( i >= 0 && i < size() );
 
     property.types << types[ i ];
     property.srids << srids[ i ];
-    property.schemaName      = schemaName;
-    property.tableName       = tableName;
-    property.geometryColName = geometryColName;
-    property.geometryColType = geometryColType;
-    property.pkCols          = pkCols;
-    property.nSpCols         = nSpCols;
-    property.sql             = sql;
-    property.relKind         = relKind;
-    property.isView          = isView;
-    property.isRaster        = isRaster;
+    property.schemaName         = schemaName;
+    property.tableName          = tableName;
+    property.geometryColName    = geometryColName;
+    property.geometryColType    = geometryColType;
+    property.pkCols             = pkCols;
+    property.nSpCols            = nSpCols;
+    property.sql                = sql;
+    property.relKind            = relKind;
+    property.isView             = isView;
+    property.isRaster           = isRaster;
     property.isMaterializedView = isMaterializedView;
-    property.tableComment    = tableComment;
+    property.tableComment       = tableComment;
 
     return property;
   }