Skip to content

Commit e42b9f7

Browse files
m-kuhnm-kuhn
committedOct 31, 2018
Unify parameter names
·
final-3_4_15final-3_4_1
1 parent 8a46059 commit e42b9f7

File tree

8 files changed

+13
-14
lines changed

8 files changed

+13
-14
lines changed
 

‎python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@ Evaluates the parameter with matching ``name`` to a static boolean value.
611611
%End
612612

613613
QgsFeatureSink *parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context, QString &destinationIdentifier /Out/,
614-
const QgsFields &fields, QgsWkbTypes::Type geometryType = QgsWkbTypes::NoGeometry, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(), QgsFeatureSink::SinkFlags options = 0 ) const /Factory/;
614+
const QgsFields &fields, QgsWkbTypes::Type geometryType = QgsWkbTypes::NoGeometry, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(), QgsFeatureSink::SinkFlags sinkFlags = 0 ) const /Factory/;
615615
%Docstring
616616
Evaluates the parameter with matching ``name`` to a feature sink.
617617

‎python/core/auto_generated/processing/qgsprocessingparameters.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ This function creates a new object and the caller takes responsibility for delet
605605

606606
static QgsFeatureSink *parameterAsSink( const QgsProcessingParameterDefinition *definition, const QVariant &value,
607607
const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs,
608-
QgsProcessingContext &context, QString &destinationIdentifier /Out/, QgsFeatureSink::SinkFlags options = 0 ) /Factory/;
608+
QgsProcessingContext &context, QString &destinationIdentifier /Out/, QgsFeatureSink::SinkFlags sinkFlags = 0 ) /Factory/;
609609
%Docstring
610610
Evaluates the parameter with matching ``definition`` and ``value`` to a feature sink.
611611

‎src/core/processing/qgsprocessingalgorithm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -586,9 +586,9 @@ bool QgsProcessingAlgorithm::parameterAsBool( const QVariantMap &parameters, con
586586
return QgsProcessingParameters::parameterAsBool( parameterDefinition( name ), parameters, context );
587587
}
588588

589-
QgsFeatureSink *QgsProcessingAlgorithm::parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context, QString &destinationIdentifier, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, QgsFeatureSink::SinkFlags options ) const
589+
QgsFeatureSink *QgsProcessingAlgorithm::parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context, QString &destinationIdentifier, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, QgsFeatureSink::SinkFlags sinkFlags ) const
590590
{
591-
return QgsProcessingParameters::parameterAsSink( parameterDefinition( name ), parameters, fields, geometryType, crs, context, destinationIdentifier, options );
591+
return QgsProcessingParameters::parameterAsSink( parameterDefinition( name ), parameters, fields, geometryType, crs, context, destinationIdentifier, sinkFlags );
592592
}
593593

594594
QgsProcessingFeatureSource *QgsProcessingAlgorithm::parameterAsSource( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const

‎src/core/processing/qgsprocessingalgorithm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ class CORE_EXPORT QgsProcessingAlgorithm
619619
* This function creates a new object and the caller takes responsibility for deleting the returned object.
620620
*/
621621
QgsFeatureSink *parameterAsSink( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context, QString &destinationIdentifier SIP_OUT,
622-
const QgsFields &fields, QgsWkbTypes::Type geometryType = QgsWkbTypes::NoGeometry, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(), QgsFeatureSink::SinkFlags options = nullptr ) const SIP_FACTORY;
622+
const QgsFields &fields, QgsWkbTypes::Type geometryType = QgsWkbTypes::NoGeometry, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem(), QgsFeatureSink::SinkFlags sinkFlags = nullptr ) const SIP_FACTORY;
623623

624624
/**
625625
* Evaluates the parameter with matching \a name to a feature source.

‎src/core/processing/qgsprocessingparameters.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -350,18 +350,18 @@ bool QgsProcessingParameters::parameterAsBool( const QgsProcessingParameterDefin
350350

351351
QgsFeatureSink *QgsProcessingParameters::parameterAsSink( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, const QgsFields &fields,
352352
QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs,
353-
QgsProcessingContext &context, QString &destinationIdentifier, QgsFeatureSink::SinkFlags options )
353+
QgsProcessingContext &context, QString &destinationIdentifier, QgsFeatureSink::SinkFlags sinkFlags )
354354
{
355355
QVariant val;
356356
if ( definition )
357357
{
358358
val = parameters.value( definition->name() );
359359
}
360360

361-
return parameterAsSink( definition, val, fields, geometryType, crs, context, destinationIdentifier, options );
361+
return parameterAsSink( definition, val, fields, geometryType, crs, context, destinationIdentifier, sinkFlags );
362362
}
363363

364-
QgsFeatureSink *QgsProcessingParameters::parameterAsSink( const QgsProcessingParameterDefinition *definition, const QVariant &value, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, QgsProcessingContext &context, QString &destinationIdentifier, QgsFeatureSink::SinkFlags options )
364+
QgsFeatureSink *QgsProcessingParameters::parameterAsSink( const QgsProcessingParameterDefinition *definition, const QVariant &value, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, QgsProcessingContext &context, QString &destinationIdentifier, QgsFeatureSink::SinkFlags sinkFlags )
365365
{
366366
QVariant val = value;
367367

@@ -402,7 +402,7 @@ QgsFeatureSink *QgsProcessingParameters::parameterAsSink( const QgsProcessingPar
402402
if ( dest.isEmpty() )
403403
return nullptr;
404404

405-
std::unique_ptr< QgsFeatureSink > sink( QgsProcessingUtils::createFeatureSink( dest, context, fields, geometryType, crs, createOptions, options ) );
405+
std::unique_ptr< QgsFeatureSink > sink( QgsProcessingUtils::createFeatureSink( dest, context, fields, geometryType, crs, createOptions, sinkFlags ) );
406406
destinationIdentifier = dest;
407407

408408
if ( destinationProject )
@@ -4581,4 +4581,3 @@ bool QgsProcessingParameterDistance::fromVariantMap( const QVariantMap &map )
45814581
mParentParameterName = map.value( QStringLiteral( "parent" ) ).toString();
45824582
return true;
45834583
}
4584-

‎src/core/processing/qgsprocessingparameters.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ class CORE_EXPORT QgsProcessingParameters
682682
*/
683683
static QgsFeatureSink *parameterAsSink( const QgsProcessingParameterDefinition *definition, const QVariant &value,
684684
const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs,
685-
QgsProcessingContext &context, QString &destinationIdentifier SIP_OUT, QgsFeatureSink::SinkFlags options = nullptr ) SIP_FACTORY;
685+
QgsProcessingContext &context, QString &destinationIdentifier SIP_OUT, QgsFeatureSink::SinkFlags sinkFlags = nullptr ) SIP_FACTORY;
686686

687687
/**
688688
* Evaluates the parameter with matching \a definition to a feature source.

‎src/core/processing/qgsprocessingutils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ class CORE_EXPORT QgsProcessingUtils
159159
QgsWkbTypes::Type geometryType,
160160
const QgsCoordinateReferenceSystem &crs,
161161
const QVariantMap &createOptions = QVariantMap(),
162-
QgsFeatureSink::SinkFlags options = nullptr ) SIP_FACTORY;
162+
QgsFeatureSink::SinkFlags sinkFlags = nullptr ) SIP_FACTORY;
163163
#endif
164164

165165
/**

‎src/core/qgsvectorlayerexporter.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ QgsVectorLayerExporter::QgsVectorLayerExporter( const QString &uri,
5252
const QgsCoordinateReferenceSystem &crs,
5353
bool overwrite,
5454
const QMap<QString, QVariant> &options,
55-
SinkFlags sinkOptions )
55+
SinkFlags sinkFlags )
5656
: mErrorCount( 0 )
5757
, mAttributeCount( -1 )
5858

@@ -126,7 +126,7 @@ QgsVectorLayerExporter::QgsVectorLayerExporter( const QString &uri,
126126
// that will be filled by ogr with unique values.
127127

128128
// HACK sorry
129-
if ( sinkOptions.testFlag( QgsFeatureSink::SinkFlag::RegeneratePrimaryKey ) && uri.endsWith( QLatin1String( ".gpkg" ) ) )
129+
if ( sinkFlags.testFlag( QgsFeatureSink::SinkFlag::RegeneratePrimaryKey ) && uri.endsWith( QLatin1String( ".gpkg" ) ) )
130130
{
131131
QString fidName = options.value( QStringLiteral( "FID" ), QStringLiteral( "FID" ) ).toString();
132132
int fidIdx = vectorProvider->fields().lookupField( fidName );

0 commit comments

Comments
 (0)
Please sign in to comment.