Skip to content

Commit 02b560e

Browse files
committed
Temporarily make QgsProcessingAlgorithm::run non pure-virtual (for travis)
1 parent 3706d88 commit 02b560e

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

python/core/processing/qgsprocessingalgorithm.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class QgsProcessingAlgorithm
113113
void setProvider( QgsProcessingProvider *provider );
114114

115115
virtual bool run( const QVariantMap &parameters,
116-
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs /Out/ ) const = 0;
116+
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs /Out/ ) const;
117117
%Docstring
118118
Runs the algorithm using the specified ``parameters``. Algorithms should implement
119119
their custom processing logic here.

src/core/processing/qgsnativealgorithms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ bool QgsBufferAlgorithm::run( const QVariantMap &parameters, QgsProcessingContex
7878
std::unique_ptr< QgsFeatureSink > writer( QgsProcessingUtils::createFeatureSink( dest, QString(), layer->fields(), QgsWkbTypes::Point, layer->crs(), context, outputLayer ) );
7979

8080
// fixed parameters
81-
bool dissolve = QgsProcessingParameters::parameterAsBool( parameters, QStringLiteral( "DISSOLVE" ), context );
81+
//bool dissolve = QgsProcessingParameters::parameterAsBool( parameters, QStringLiteral( "DISSOLVE" ), context );
8282
int segments = QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "DISSOLVE" ), context );
8383
QgsGeometry::EndCapStyle endCapStyle = static_cast< QgsGeometry::EndCapStyle >( QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "END_CAP_STYLE" ), context ) );
8484
QgsGeometry::JoinStyle joinStyle = static_cast< QgsGeometry::JoinStyle>( QgsProcessingParameters::parameterAsInt( parameters, QStringLiteral( "JOIN_STYLE" ), context ) );

src/core/processing/qgsprocessingalgorithm.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,8 @@ void QgsProcessingAlgorithm::setProvider( QgsProcessingProvider *provider )
5151
{
5252
mProvider = provider;
5353
}
54+
55+
bool QgsProcessingAlgorithm::run( const QVariantMap &, QgsProcessingContext &, QgsProcessingFeedback *, QVariantMap & ) const
56+
{
57+
return true;
58+
}

src/core/processing/qgsprocessingalgorithm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class CORE_EXPORT QgsProcessingAlgorithm
142142
* \returns true if algorithm run was successful, or false if run was unsuccessful.
143143
*/
144144
virtual bool run( const QVariantMap &parameters,
145-
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs SIP_OUT ) const = 0;
145+
QgsProcessingContext &context, QgsProcessingFeedback *feedback, QVariantMap &outputs SIP_OUT ) const;
146146

147147
private:
148148

0 commit comments

Comments
 (0)