sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Also upgrade make_shared

Browse Source
This commit is contained in:
Nyall Dawson 2025-02-07 09:29:24 +10:00
parent 0ac9936b62
commit e6746f35da
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/qstringfixup.py
View File

@ -93,11 +93,11 @@ qlatin1str_single_char = re.compile(
r"""(.*)(.startsWith\(|.endsWith\(|.indexOf\(|.lastIndexOf\(|\+=) QLatin1String\( ("[^"]") \)(.*)"""
)
make_unique = re.compile(
r"""^(\s*)std::unique_ptr<\s*(.*?)\s*>(\s*.*?\s*=\s*std::make_unique<\s*(.*?)\s*>.*)$"""
make_unique_shared = re.compile(
r"""^(\s*)std::(?:unique|shared)_ptr<\s*(.*?)\s*>(\s*.*?\s*=\s*std::make_(?:unique|shared)<\s*(.*?)\s*>.*)$"""
)
make_unique2 = re.compile(
r"""^(\s*)std::unique_ptr<\s*(.*?)\s*>(?:\s*(.*?)\s*\()\s*(std::make_unique<\s*(.*?)\s*>.*?)\s*\)\s*;$"""
make_unique_shared2 = re.compile(
r"""^(\s*)std::(?:unique|shared)_ptr<\s*(.*?)\s*>(?:\s*(.*?)\s*\()\s*(std::make_(?:unique|shared)<\s*(.*?)\s*>.*?)\s*\)\s*;$"""
)
make_unique3 = re.compile(
r"""^(\s*)std::unique_ptr<\s*(.*?)\s*>(?:\s*(.*?)\s*\()\s*new\s*(.*?)\s*(\(.*\s*\))\s*\)\s*;"""
@ -235,11 +235,11 @@ while i < len(lines):
else:
break
m = make_unique.match(line)
m = make_unique_shared.match(line)
if m and m.group(2) == m.group(4):
line = m.group(1) + "auto" + m.group(3)
m = make_unique2.match(line)
m = make_unique_shared2.match(line)
if m and m.group(2) == m.group(5):
line = m.group(1) + "auto " + m.group(3) + " = " + m.group(4) + ";"

4
src/core/mesh/qgsmeshcalcutils.cpp
View File

@ -183,7 +183,7 @@ std::shared_ptr<QgsMeshMemoryDataset> QgsMeshCalcUtils::createMemoryDataset( con
{
Q_ASSERT( type != QgsMeshDatasetGroupMetadata::DataOnVolumes );
std::shared_ptr<QgsMeshMemoryDataset> ds = std::make_shared<QgsMeshMemoryDataset>();
auto ds = std::make_shared<QgsMeshMemoryDataset>();
if ( type == QgsMeshDatasetGroupMetadata::DataOnVertices )
{
ds->values.resize( mMeshLayer->dataProvider()->vertexCount() );
@ -562,7 +562,7 @@ std::shared_ptr<QgsMeshMemoryDataset> QgsMeshCalcUtils::copy(
Q_ASSERT( isValid() );
Q_ASSERT( dataset0 );
std::shared_ptr<QgsMeshMemoryDataset> output = std::make_shared<QgsMeshMemoryDataset>();
auto output = std::make_shared<QgsMeshMemoryDataset>();
output->values = dataset0->values; //deep copy
output->active = dataset0->active; //deep copy
output->time = dataset0->time;

2
src/core/providers/meshmemory/qgsmeshmemorydataprovider.cpp
View File

@ -182,7 +182,7 @@ bool QgsMeshMemoryDataProvider::splitDatasetSections( const QString &uri, QgsMes
{
if ( !success )
break;
std::shared_ptr<QgsMeshMemoryDataset> dataset = std::make_shared<QgsMeshMemoryDataset>();
auto dataset = std::make_shared<QgsMeshMemoryDataset>();
success = addDatasetValues( sections[i], dataset, datasetGroup.isScalar() );
if ( success )
success = checkDatasetValidity( dataset, datasetGroup.dataType() );

2
src/core/qgsofflineediting.cpp
View File

@ -180,7 +180,7 @@ void QgsOfflineEditing::synchronize( bool useTransaction )
remoteName.chop( remoteNameSuffix.size() );
const QgsVectorLayer::LayerOptions options { QgsProject::instance()->transformContext() }; // skip-keyword-check
std::shared_ptr<QgsVectorLayer> remoteLayer = std::make_shared<QgsVectorLayer>( remoteSource, remoteName, remoteProvider, options );
auto remoteLayer = std::make_shared<QgsVectorLayer>( remoteSource, remoteName, remoteProvider, options );
if ( ! remoteLayer->isValid() )
{

2
src/providers/arcgisrest/qgsafsshareddata.cpp
View File

@ -59,7 +59,7 @@ QgsAfsSharedData::QgsAfsSharedData( const QgsDataSourceUri &uri )
std::shared_ptr<QgsAfsSharedData> QgsAfsSharedData::clone() const
{
QgsReadWriteLocker locker( mReadWriteLock, QgsReadWriteLocker::Read );
std::shared_ptr<QgsAfsSharedData> copy = std::make_shared<QgsAfsSharedData>( mDataSource );
auto copy = std::make_shared<QgsAfsSharedData>( mDataSource );
copy->mLimitBBox = mLimitBBox;
copy->mExtent = mExtent;
copy->mGeometryType = mGeometryType;

2
src/providers/oracle/qgsoracleproviderconnection.cpp
View File

@ -1351,7 +1351,7 @@ QgsAbstractDatabaseProviderConnection::QueryResult QgsOracleProviderConnection::
if ( feedback && feedback->isCanceled() )
return QgsAbstractDatabaseProviderConnection::QueryResult();
std::shared_ptr<QgsPoolOracleConn> pconn = std::make_shared<QgsPoolOracleConn>( QgsDataSourceUri { uri() }.connectionInfo( false ) );
auto pconn = std::make_shared<QgsPoolOracleConn>( QgsDataSourceUri { uri() }.connectionInfo( false ) );
if ( !pconn->get() )
{
throw QgsProviderConnectionException( QObject::tr( "Connection failed: %1" ).arg( uri() ) );

2
tests/src/core/testqgsmeshlayerinterpolator.cpp
View File

@ -91,7 +91,7 @@ void TestQgsMeshLayerInterpolator::testExportRasterBand()
QVERIFY( block->isNoData( 10, 10 ) );
auto virtualGroup = std::make_unique<QgsMeshMemoryDatasetGroup>( QStringLiteral( "on face" ), QgsMeshDatasetGroupMetadata::DataOnFaces );
std::shared_ptr<QgsMeshMemoryDataset> dataset = std::make_shared<QgsMeshMemoryDataset>();
auto dataset = std::make_shared<QgsMeshMemoryDataset>();
dataset->values.resize( 2 );
dataset->values[0] = 12;
dataset->values[1] = 36;