Skip to content

Commit

Permalink
Fix a bunch of clazy warnings in QgsVectorFileWriter
Browse files Browse the repository at this point in the history
  • Loading branch information
@nyalldawson
nyalldawson committed Mar 29, 2021
1 parent 62ad6e3 commit 705259e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions python/core/auto_generated/qgsvectorfilewriter.sip.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,13 +455,13 @@ Create a new vector file writer.
.. versionadded:: 3.10.3
%End

static QgsVectorFileWriter::WriterError writeAsVectorFormatV2( QgsVectorLayer *layer,
static QgsVectorFileWriter::WriterError writeAsVectorFormatV2( QgsVectorLayer *layer,
const QString &fileName,
const QgsCoordinateTransformContext &transformContext,
const QgsVectorFileWriter::SaveVectorOptions &options,
QString *newFilename = 0,
QString *newLayer = 0,
QString *errorMessage /Out/ = 0 );
QString *errorMessage /Out/ = 0 ) /Deprecated/;
%Docstring
Writes a layer out to a vector file.

Expand Down
21 changes: 10 additions & 11 deletions src/core/qgsvectorfilewriter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static OGRDataSourceH myOGROpen( const char *pszName, int bUpdate, OGRSFDriverH
if ( hDS && bUpdate )
{
QString drvName = OGR_Dr_GetName( hDriver );
if ( drvName == "BNA" )
if ( drvName == QLatin1String( "BNA" ) )
{
OGR_DS_Destroy( hDS );
if ( phDriver )
Expand Down Expand Up @@ -108,7 +108,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
SymbologyExport symbologyExport,
QgsFeatureSink::SinkFlags sinkFlags,
QString *newLayer,
QgsCoordinateTransformContext transformContext,
const QgsCoordinateTransformContext &transformContext,
FieldNameSource fieldNameSource
)
: mError( NoError )
Expand Down Expand Up @@ -136,7 +136,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
const QString &layerName,
ActionOnExistingFile action,
QString *newLayer,
QgsCoordinateTransformContext transformContext,
const QgsCoordinateTransformContext &transformContext,
QgsFeatureSink::SinkFlags sinkFlags,
FieldNameSource fieldNameSource
)
Expand Down Expand Up @@ -2112,7 +2112,7 @@ class QgsVectorFileWriterMetadataContainer
QStringList()
<< QStringLiteral( "CRLF" )
<< QStringLiteral( "LF" ),
QString( "LF" ), // Default value
QStringLiteral( "LF" ), // Default value
false // Allow None
) );

Expand Down Expand Up @@ -2174,7 +2174,7 @@ class QgsVectorFileWriterMetadataContainer
layerOptions.insert( QStringLiteral( "POSTGIS_VERSION" ), new QgsVectorFileWriter::StringOption(
QObject::tr( "Can be set to 2.0 or 2.2 for PostGIS 2.0/2.2 compatibility. "
"Important to set it correctly if using non-linear geometry types" ),
QString( "2.2" ) // Default value
QStringLiteral( "2.2" ) // Default value
) );

driverMetadata.insert( QStringLiteral( "PGDUMP" ),
Expand Down Expand Up @@ -2502,7 +2502,7 @@ gdal::ogr_feature_unique_ptr QgsVectorFileWriter::createFeature( const QgsFeatur
if ( count > 0 )
{
int pos = 0;
for ( QString string : list )
for ( const QString &string : list )
{
lst[pos] = mCodec->fromUnicode( string ).data();
pos++;
Expand Down Expand Up @@ -2962,15 +2962,15 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( Pre
// Special rules for OGR layers
if ( details.providerType == QLatin1String( "ogr" ) && !details.dataSourceUri.isEmpty() )
{
QString srcFileName( details.providerUriParams.value( QLatin1String( "path" ) ).toString() );
QString srcFileName( details.providerUriParams.value( QStringLiteral( "path" ) ).toString() );
if ( QFile::exists( srcFileName ) && QFileInfo( fileName ).canonicalFilePath() == QFileInfo( srcFileName ).canonicalFilePath() )
{
// Check the layer name too if it's a GPKG/SpatiaLite/SQLite OGR driver (pay attention: camel case in layerName)
QgsDataSourceUri uri( details.dataSourceUri );
if ( !( ( options.driverName == QLatin1String( "GPKG" ) ||
options.driverName == QLatin1String( "SpatiaLite" ) ||
options.driverName == QLatin1String( "SQLite" ) ) &&
options.layerName != details.providerUriParams.value( QLatin1String( "layerName" ) ) ) )
options.layerName != details.providerUriParams.value( QStringLiteral( "layerName" ) ) ) )
{
if ( errorMessage )
*errorMessage = QObject::tr( "Cannot overwrite a OGR layer in place" );
Expand Down Expand Up @@ -3204,10 +3204,9 @@ bool QgsVectorFileWriter::deleteShapeFile( const QString &fileName )
QDir dir = fi.dir();

QStringList filter;
const char *suffixes[] = { ".shp", ".shx", ".dbf", ".prj", ".qix", ".qpj", ".cpg", ".sbn", ".sbx", ".idm", ".ind" };
for ( std::size_t i = 0; i < sizeof( suffixes ) / sizeof( *suffixes ); i++ )
for ( const char *suffix : { ".shp", ".shx", ".dbf", ".prj", ".qix", ".qpj", ".cpg", ".sbn", ".sbx", ".idm", ".ind" } )
{
filter << fi.completeBaseName() + suffixes[i];
filter << fi.completeBaseName() + suffix;
}

bool ok = true;
Expand Down
4 changes: 2 additions & 2 deletions src/core/qgsvectorfilewriter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags()
#ifndef SIP_RUN
, QString *newLayer = nullptr,
QgsCoordinateTransformContext transformContext = QgsCoordinateTransformContext(),
const QgsCoordinateTransformContext &transformContext = QgsCoordinateTransformContext(),
FieldNameSource fieldNameSource = Original
#endif
) SIP_DEPRECATED;
Expand Down Expand Up @@ -628,7 +628,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink
const QString &layerName,
QgsVectorFileWriter::ActionOnExistingFile action,
QString *newLayer = nullptr,
QgsCoordinateTransformContext transformContext = QgsCoordinateTransformContext(),
const QgsCoordinateTransformContext &transformContext = QgsCoordinateTransformContext(),
QgsFeatureSink::SinkFlags sinkFlags = QgsFeatureSink::SinkFlags(),
FieldNameSource fieldNameSource = Original
) SIP_SKIP;
Expand Down

0 comments on commit 705259e

Please sign in to comment.