Fix clazy use QHash for container with pointer keys warnings

qgis · Feb 2, 2018 · 1bb0ef43e4d8b36760626bd38d7370f5289e73ae · 1bb0ef4
1 parent 1f95864
commit 1bb0ef43e4d8b36760626bd38d7370f5289e73ae
Unified Split

Showing with 5 additions and 5 deletions.

+1 −1 src/providers/gdal/qgsgdalprovider.cpp

+1 −1 src/providers/gdal/qgsgdalprovider.h

+1 −1 src/providers/ogr/qgsogrdataitems.cpp

+1 −1 src/providers/ogr/qgsogrprovider.cpp

+1 −1 src/providers/ogr/qgsogrprovider.h
diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp
@@ -68,7 +68,7 @@ static QString PROVIDER_DESCRIPTION = QStringLiteral( "GDAL provider" );
 // To avoid potential races when destroying related instances ("main" and clones)
 static QMutex gGdaProviderMutex( QMutex::Recursive );
 
-QMap< QgsGdalProvider *, QVector<QgsGdalProvider::DatasetPair> > QgsGdalProvider::mgDatasetCache;
+QHash< QgsGdalProvider *, QVector<QgsGdalProvider::DatasetPair> > QgsGdalProvider::mgDatasetCache;
 
 int QgsGdalProvider::mgDatasetCacheSize = 0;
 

diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h
@@ -266,7 +266,7 @@ class QgsGdalProvider : public QgsRasterDataProvider, QgsGdalProviderBase
     };
 
     // Dataset cache
-    static QMap< QgsGdalProvider *, QVector<DatasetPair> > mgDatasetCache;
+    static QHash< QgsGdalProvider *, QVector<DatasetPair> > mgDatasetCache;
 
     // Number of cached datasets in mgDatasetCache ( == sum(iter.value().size() )
     static int mgDatasetCacheSize;

diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -53,7 +53,7 @@ QgsOgrLayerItem::QgsOgrLayerItem( QgsDataItem *parent,
   mToolTip = uri;
   setState( Populated ); // children are not expected
 
-  if ( mPath.toLower().endsWith( QLatin1String( ".shp" ) ) )
+  if ( mPath.endsWith( QLatin1String( ".shp" ), Qt::CaseInsensitive ) )
   {
     if ( OGRGetDriverCount() == 0 )
     {

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -101,7 +101,7 @@ QMap< QgsOgrProviderUtils::DatasetIdentification,
 
 QMap< QString, int > QgsOgrProviderUtils::sMapCountOpenedDS;
 
-QMap< GDALDatasetH, bool> QgsOgrProviderUtils::sMapDSHandleToUpdateMode;
+QHash< GDALDatasetH, bool> QgsOgrProviderUtils::sMapDSHandleToUpdateMode;
 
 QMap< QString, QDateTime > QgsOgrProviderUtils::sMapDSNameToLastModifiedDate;
 

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -358,7 +358,7 @@ class QgsOgrProviderUtils
     static QMap< QString, int > sMapCountOpenedDS;
 
     //! Map a dataset handle to its update open mode (if opened with GDALOpenWrapper, only for GPKG)
-    static QMap< GDALDatasetH, bool> sMapDSHandleToUpdateMode;
+    static QHash< GDALDatasetH, bool> sMapDSHandleToUpdateMode;
 
     //! Map a dataset name to its last modified data
     static QMap< QString, QDateTime > sMapDSNameToLastModifiedDate;