Skip to content

Commit

Permalink
Revert "Revert "Revert "Remove virtual method from class which should…
Browse files Browse the repository at this point in the history
…n't be subclassed"""

This reverts commit 2a8555e.

sorry for the noise
  • Loading branch information
3nids committed Apr 24, 2017
1 parent 2a8555e commit 3652fa7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions python/core/qgsproperty.sip
Expand Up @@ -80,6 +80,8 @@ class QgsProperty
};

QgsProperty();
virtual ~QgsProperty();

static QgsProperty fromExpression( const QString& expression, bool isActive = true );
static QgsProperty fromField( const QString& fieldName, bool isActive = true );
static QgsProperty fromValue( const QVariant& value, bool isActive = true );
Expand Down
2 changes: 2 additions & 0 deletions src/core/qgsproperty.h
Expand Up @@ -201,6 +201,8 @@ class CORE_EXPORT QgsProperty
*/
QgsProperty();

virtual ~QgsProperty() = default;

/**
* Returns a new ExpressionBasedProperty created from the specified expression.
*/
Expand Down

4 comments on commit 3652fa7

@3nids
Copy link
Member Author

@3nids 3nids commented on 3652fa7 Apr 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

really sorry for the noise, took the wrong commit

@NathanW2
Copy link
Member

@NathanW2 NathanW2 commented on 3652fa7 Apr 24, 2017 via email

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@3nids
Copy link
Member Author

@3nids 3nids commented on 3652fa7 Apr 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this a permanent ban?

@NathanW2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah I guess your auto sip magic makes up for the bad reverts :)

Please sign in to comment.