use layer type enum instead of bool flags

fix use of QStringLiteral
qgis · Aug 27, 2020 · 7be25fb · 7be25fb
1 parent 5b86753
commit 7be25fb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -2259,7 +2259,7 @@ void QgsOptions::loadGdalDriverList()
   QStringList myDrivers;
   QStringList myGdalWriteDrivers;
   QMap<QString, QString> myDriversFlags, myDriversExt, myDriversLongName;
-  QMap<QString, bool> driversType; // true for raster, false for vector
+  QMap<QString, QgsMapLayerType> driversType;
 
   // make sure we save list when accept()
   mLoadedGdalDriverList = true;
@@ -2284,11 +2284,11 @@ void QgsOptions::loadGdalDriverList()
     // in GDAL 2.0 both vector and raster drivers are returned by GDALGetDriver
     if ( QString( GDALGetMetadataItem( myGdalDriver, GDAL_DCAP_RASTER, nullptr ) ) != QLatin1String( "YES" ) )
     {
-      driversType[myGdalDriverDescription] = false;
+      driversType[myGdalDriverDescription] = QgsMapLayerType::VectorLayer;
     }
     else
     {
-      driversType[myGdalDriverDescription] = true;
+      driversType[myGdalDriverDescription] = QgsMapLayerType::RasterLayer;
     }
 
     myGdalDriverDescription = GDALGetDescription( myGdalDriver );
@@ -2298,7 +2298,7 @@ void QgsOptions::loadGdalDriverList()
 
     // get driver R/W flags, adopted from GDALGeneralCmdLineProcessor()
     QString driverFlags = "";
-    if ( driversType[myGdalDriverDescription] )
+    if ( driversType[myGdalDriverDescription] == QgsMapLayerType::RasterLayer )
     {
       if ( QgsGdalUtils::supportsRasterCreate( myGdalDriver ) )
       {
@@ -2365,7 +2365,7 @@ void QgsOptions::loadGdalDriverList()
     QString myFlags = myDriversFlags[myName];
     mypItem->setText( 2, myFlags );
     mypItem->setText( 3, myDriversLongName[myName] );
-    if ( driversType[myName] )
+    if ( driversType[myName] == QgsMapLayerType::RasterLayer )
     {
       lstRasterDrivers->addTopLevelItem( mypItem );
     }

diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
@@ -1707,7 +1707,7 @@ void QgsApplication::applyGdalSkippedDrivers()
     if ( !sDeferredSkippedGdalDrivers()->contains( driverName ) )
       realDisabledDriverList << driverName;
   }
-  QString myDriverList = realDisabledDriverList.join( QStringLiteral( "," ) );
+  QString myDriverList = realDisabledDriverList.join( ',' );
   QgsDebugMsgLevel( QStringLiteral( "Gdal Skipped driver list set to:" ), 2 );
   QgsDebugMsgLevel( myDriverList, 2 );
   CPLSetConfigOption( "GDAL_SKIP", myDriverList.toUtf8() );