Skip to content

Commit

Permalink
Use setDataSource instead of setDataSourcePrivate
Browse files Browse the repository at this point in the history
  • Loading branch information
rldhont committed May 21, 2021
1 parent 65761a1 commit 7160110
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/core/pointcloud/qgspointcloudlayer.cpp
Expand Up @@ -49,7 +49,7 @@ QgsPointCloudLayer::QgsPointCloudLayer( const QString &uri,
{
providerFlags |= QgsDataProvider::FlagLoadDefaultStyle;
}
setDataSourcePrivate( uri, baseName, providerLib, providerOptions, providerFlags );
setDataSource( uri, baseName, providerLib, providerOptions, providerFlags );

if ( !options.skipIndexGeneration && mDataProvider && mDataProvider->isValid() )
mDataProvider.get()->generateIndex();
Expand Down Expand Up @@ -129,7 +129,7 @@ bool QgsPointCloudLayer::readXml( const QDomNode &layerNode, QgsReadWriteContext
{
flags |= QgsDataProvider::FlagTrustDataSource;
}
setDataSourcePrivate( mDataSource, mLayerName, mProviderKey, providerOptions, flags );
setDataSource( mDataSource, mLayerName, mProviderKey, providerOptions, flags );
}

if ( !isValid() )
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterlayer.cpp
Expand Up @@ -132,7 +132,7 @@ QgsRasterLayer::QgsRasterLayer( const QString &uri,
{
providerFlags |= QgsDataProvider::FlagLoadDefaultStyle;
}
setDataSourcePrivate( uri, baseName, providerKey, providerOptions, providerFlags );
setDataSource( uri, baseName, providerKey, providerOptions, providerFlags );

if ( isValid() )
{
Expand Down
3 changes: 1 addition & 2 deletions src/core/vector/qgsvectorlayer.cpp
Expand Up @@ -188,8 +188,7 @@ QgsVectorLayer::QgsVectorLayer( const QString &vectorLayerPath,
{
providerFlags |= QgsDataProvider::FlagLoadDefaultStyle;
}
setDataSourcePrivate( vectorLayerPath, baseName, providerKey, providerOptions, providerFlags );
emit dataSourceChanged();
setDataSource( vectorLayerPath, baseName, providerKey, providerOptions, providerFlags );
}

for ( const QgsField &field : std::as_const( mFields ) )
Expand Down

0 comments on commit 7160110

Please sign in to comment.