fix windows build and some warnings

(cherry picked from commit a5ac126)
qgis · Feb 16, 2021 · fcdc66aa2824364bd3923d71adae5f44c436935e · fcdc66a
1 parent b230f28
commit fcdc66aa2824364bd3923d71adae5f44c436935e
Unified Split

Showing with 4 additions and 6 deletions.

+2 −2 src/3d/terrain/qgsterraindownloader.h

+2 −2 src/core/qgsdatabasetablemodel.cpp

+0 −2 src/providers/wms/qgswmscapabilities.cpp
diff --git a/src/3d/terrain/qgsterraindownloader.h b/src/3d/terrain/qgsterraindownloader.h
@@ -59,12 +59,12 @@ class _3D_EXPORT QgsTerrainDownloader
     ~QgsTerrainDownloader();
 
     //! Definition of data source for terrain tiles (assuming "terrarium" data encoding with usual XYZ tiling scheme)
-    typedef struct
+    struct DataSource
     {
       QString uri;  //!< HTTP(S) template for XYZ tiles requests (e.g. http://example.com/{z}/{x}/{y}.png)
       int zMin = 0;  //!< Minimum zoom level (Z) with valid data
       int zMax = 0;  //!< Maximum zoom level (Z) with valid data
-    } DataSource;
+    };
 
     //! Returns the data source used by default
     static DataSource defaultDataSource();

diff --git a/src/core/qgsdatabasetablemodel.cpp b/src/core/qgsdatabasetablemodel.cpp
@@ -122,11 +122,11 @@ QVariant QgsDatabaseTableModel::data( const QModelIndex &index, int role ) const
           {
             return QgsLayerItem::iconPoint();
           }
-          case QgsWkbTypes::PolygonGeometry :
+          case QgsWkbTypes::PolygonGeometry:
           {
             return QgsLayerItem::iconPolygon();
           }
-          case QgsWkbTypes::LineGeometry :
+          case QgsWkbTypes::LineGeometry:
           {
             return QgsLayerItem::iconLine();
           }

diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -453,8 +453,6 @@ QDateTime QgsWmsSettings::parseWmstDateTimes( QString item )
   // Standard item will have YYYY-MM-DDTHH:mm:ss.SSSZ
   //  format a Qt::ISODateWithMs
 
-  QString format = "yyyy-MM-ddTHH:mm:ss.SSSZ";
-
   // Check if it does not have time part
   if ( !item.contains( 'T' ) )
     return QDateTime::fromString( item, "yyyy-MM-dd" );