Skip to content

Commit

Permalink
Do not remove parameters from virtual methods which should be used in…
Browse files Browse the repository at this point in the history
… python

These methods did not actually override their parent methods but just coexisted and were never called.

Fixes compilation with SIP version: 4.19.14
  • Loading branch information
m-kuhn authored and nyalldawson committed Feb 16, 2019
1 parent ef508c0 commit 934f706
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Constructor for QgsAttributeFormEditorWidget.

~QgsAttributeFormEditorWidget();

virtual void createSearchWidgetWrappers();
virtual void createSearchWidgetWrappers( const QgsAttributeEditorContext &context = QgsAttributeEditorContext() );


void initialize( const QVariant &initialValue, bool mixedValues = false );
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Widget to show for child relations on an attribute form.
Constructor
%End

virtual void createSearchWidgetWrappers();
virtual void createSearchWidgetWrappers( const QgsAttributeEditorContext &context = QgsAttributeEditorContext() );

virtual QString currentFilterExpression() const;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsattributeformeditorwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class GUI_EXPORT QgsAttributeFormEditorWidget : public QgsAttributeFormWidget

~QgsAttributeFormEditorWidget() override;

void createSearchWidgetWrappers( const QgsAttributeEditorContext &context SIP_PYARGREMOVE = QgsAttributeEditorContext() ) override;
void createSearchWidgetWrappers( const QgsAttributeEditorContext &context = QgsAttributeEditorContext() ) override;

/**
* Resets the widget to an initial value.
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsattributeformrelationeditorwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class GUI_EXPORT QgsAttributeFormRelationEditorWidget : public QgsAttributeFormW
*/
explicit QgsAttributeFormRelationEditorWidget( QgsRelationWidgetWrapper *wrapper, QgsAttributeForm *form );

void createSearchWidgetWrappers( const QgsAttributeEditorContext &context SIP_PYARGREMOVE = QgsAttributeEditorContext() ) override;
void createSearchWidgetWrappers( const QgsAttributeEditorContext &context = QgsAttributeEditorContext() ) override;
QString currentFilterExpression() const override;

private:
Expand Down

0 comments on commit 934f706

Please sign in to comment.