[browser] Avoid always opening every file using gdal to test for

nyalldawson · nyalldawson · commit 331f590abe48 · 2019-02-07T13:53:30.000+11:00
update capabilities This is no longer required - it was previously done in order to detect if the item should expose the SetCrs capability, but that's deprecated and unused. Fixes #16807, fixes #20411, and avoids QGIS opening every file encountered in the browser even when the Data Source setting is set to the default (fast) "Check Extension" setting only. (cherry picked from commit 2c64cec)
diff --git a/src/providers/gdal/qgsgdaldataitems.cpp b/src/providers/gdal/qgsgdaldataitems.cpp
@@ -48,14 +48,6 @@ QgsGdalLayerItem::QgsGdalLayerItem( QgsDataItem *parent,
   }
   else
     setState( Populated );
-
-  GDALAllRegister();
-  gdal::dataset_unique_ptr hDS( GDALOpen( mPath.toUtf8().constData(), GA_Update ) );
-
-  if ( hDS )
-  {
-    mCapabilities |= SetCrs;
-  }
 }
 
 
diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp
@@ -53,30 +53,11 @@ QgsOgrLayerItem::QgsOgrLayerItem( QgsDataItem *parent,
   mIsSubLayer = isSubLayer;
   mToolTip = uri;
   setState( Populated ); // children are not expected
-
-  if ( mPath.endsWith( QLatin1String( ".shp" ), Qt::CaseInsensitive ) )
-  {
-    if ( OGRGetDriverCount() == 0 )
-    {
-      OGRRegisterAll();
-    }
-    gdal::dataset_unique_ptr hDataSource( GDALOpenEx( mPath.toUtf8().constData(), GDAL_OF_VECTOR | GDAL_OF_UPDATE, nullptr, nullptr, nullptr ) );
-    if ( hDataSource )
-    {
-      mCapabilities |= SetCrs;
-    }
-
-    // It it is impossible to assign a crs to an existing layer
-    // No OGR_L_SetSpatialRef : http://trac.osgeo.org/gdal/ticket/4032
-  }
 }
 
 
 bool QgsOgrLayerItem::setCrs( const QgsCoordinateReferenceSystem &crs )
 {
-  if ( !( mCapabilities & SetCrs ) )
-    return false;
-
   QString layerName = mPath.left( mPath.indexOf( QLatin1String( ".shp" ), Qt::CaseInsensitive ) );
   QString wkt = crs.toWkt();
 

Original file line number	Diff line number	Diff line change
`@@ -48,14 +48,6 @@ QgsGdalLayerItem::QgsGdalLayerItem( QgsDataItem *parent,`
`48`	`48`	`}`
`49`	`49`	`else`
`50`	`50`	`setState( Populated );`
`51`		`-`
`52`		`- GDALAllRegister();`
`53`		`- gdal::dataset_unique_ptr hDS( GDALOpen( mPath.toUtf8().constData(), GA_Update ) );`
`54`		`-`
`55`		`- if ( hDS )`
`56`		`- {`
`57`		`- mCapabilities \|= SetCrs;`
`58`		`- }`
`59`	`51`	`}`
`60`	`52`
`61`	`53`