Skip to content
Permalink
Browse files
Rename addSubLayerDetailsToSubLayerList to querySubLayerList
  • Loading branch information
nyalldawson committed Jun 28, 2021
1 parent 26d6040 commit 46a801686844599e139c6cf68915ddb0d3a93ef3
@@ -606,7 +606,7 @@ QStringList QgsOgrProvider::_subLayers( bool withFeatureCount ) const

if ( mOgrLayer && ( mIsSubLayer || layerCount() == 1 ) )
{
QgsOgrProviderUtils::addSubLayerDetailsToSubLayerList( mLayerIndex, mOgrLayer, withFeatureCount, mGDALDriverName, mIsSubLayer, mSubLayerList );
QgsOgrProviderUtils::querySubLayerList( mLayerIndex, mOgrLayer, withFeatureCount, mGDALDriverName, mIsSubLayer, mSubLayerList );
}
else
{
@@ -629,7 +629,7 @@ QStringList QgsOgrProvider::_subLayers( bool withFeatureCount ) const
if ( !layer )
continue;

QgsOgrProviderUtils::addSubLayerDetailsToSubLayerList( i, layer.get(), withFeatureCount, mGDALDriverName, mIsSubLayer, mSubLayerList );
QgsOgrProviderUtils::querySubLayerList( i, layer.get(), withFeatureCount, mGDALDriverName, mIsSubLayer, mSubLayerList );
if ( firstLayer == nullptr )
{
firstLayer = std::move( layer );
@@ -2292,7 +2292,7 @@ bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &d
!( updateMode && dsName.endsWith( QLatin1String( ".shp.zip" ), Qt::CaseInsensitive ) );
}

void QgsOgrProviderUtils::addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer, bool withFeatureCount, const QString &driverName, bool isSubLayer, QStringList &sublayerList )
void QgsOgrProviderUtils::querySubLayerList( int i, QgsOgrLayer *layer, bool withFeatureCount, const QString &driverName, bool isSubLayer, QStringList &sublayerList )
{
QString layerName = QString::fromUtf8( layer->name() );

@@ -256,7 +256,7 @@ class CORE_EXPORT QgsOgrProviderUtils
bool updateMode,
const QString &dsName );

static void addSubLayerDetailsToSubLayerList( int i, QgsOgrLayer *layer, bool withFeatureCount, const QString &driverName, bool isSubLayer, QStringList &sublayerList );
static void querySubLayerList( int i, QgsOgrLayer *layer, bool withFeatureCount, const QString &driverName, bool isSubLayer, QStringList &sublayerList );

};

0 comments on commit 46a8016

Please sign in to comment.