Skip to content
Permalink
Browse files
Revert "Revert "Revert "Remove virtual method from class which should…
…n't be subclassed"""

This reverts commit 2a8555e.

sorry for the noise
  • Loading branch information
3nids committed Apr 24, 2017
1 parent 2a8555e commit 3652fa7e2b3454cb6fecfdfed3697736cb3f3fab
Showing with 4 additions and 0 deletions.
  1. +2 −0 python/core/qgsproperty.sip
  2. +2 −0 src/core/qgsproperty.h
@@ -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 );
@@ -201,6 +201,8 @@ class CORE_EXPORT QgsProperty
*/
QgsProperty();

virtual ~QgsProperty() = default;

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

4 comments on commit 3652fa7

@3nids

This comment has been minimized.

Copy link
Member Author

@3nids 3nids replied Apr 24, 2017

really sorry for the noise, took the wrong commit

@NathanW2

This comment has been minimized.

Copy link
Member

@NathanW2 NathanW2 replied Apr 24, 2017

@3nids

This comment has been minimized.

Copy link
Member Author

@3nids 3nids replied Apr 24, 2017

is this a permanent ban?

@NathanW2

This comment has been minimized.

Copy link
Member

@NathanW2 NathanW2 replied Apr 24, 2017

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

Please sign in to comment.