Add move operators to QgsEffectStack

Results in a (very slight) performance boost with symbol copies
qgis · Jul 23, 2019 · 751f154 · 751f154
1 parent 2cd5334
commit 751f154
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/python/core/auto_generated/effects/qgseffectstack.sip.in b/python/core/auto_generated/effects/qgseffectstack.sip.in
@@ -51,6 +51,7 @@ Constructor for empty QgsEffectStack.
 
     QgsEffectStack( const QgsEffectStack &other );
 
+
     explicit QgsEffectStack( const QgsPaintEffect &effect );
 %Docstring
 Creates a new QgsEffectStack effect from a single initial effect.
@@ -145,6 +146,8 @@ Returns a pointer to the effect at a specified index within the stack
 %End
 
 
+
+
   protected:
 
     virtual void draw( QgsRenderContext &context );

diff --git a/src/core/effects/qgseffectstack.cpp b/src/core/effects/qgseffectstack.cpp
@@ -31,6 +31,12 @@ QgsEffectStack::QgsEffectStack( const QgsEffectStack &other )
   }
 }
 
+QgsEffectStack::QgsEffectStack( QgsEffectStack &&other )
+  : QgsPaintEffect( other )
+{
+  std::swap( mEffectList, other.mEffectList );
+}
+
 QgsEffectStack::QgsEffectStack( const QgsPaintEffect &effect )
 {
   appendEffect( effect.clone() );
@@ -56,6 +62,13 @@ QgsEffectStack &QgsEffectStack::operator=( const QgsEffectStack &rhs )
   return *this;
 }
 
+QgsEffectStack &QgsEffectStack::operator=( QgsEffectStack &&other )
+{
+  std::swap( mEffectList, other.mEffectList );
+  mEnabled = other.enabled();
+  return *this;
+}
+
 QgsPaintEffect *QgsEffectStack::create( const QgsStringMap &map )
 {
   QgsEffectStack *effect = new QgsEffectStack();

diff --git a/src/core/effects/qgseffectstack.h b/src/core/effects/qgseffectstack.h
@@ -61,6 +61,11 @@ class CORE_EXPORT QgsEffectStack : public QgsPaintEffect
 
     QgsEffectStack( const QgsEffectStack &other );
 
+    /**
+     * Move constructor.
+     */
+    QgsEffectStack( QgsEffectStack &&other ) SIP_SKIP;
+
     /**
      * Creates a new QgsEffectStack effect from a single initial effect.
      * \param effect initial effect to add to the stack. The effect will
@@ -139,6 +144,9 @@ class CORE_EXPORT QgsEffectStack : public QgsPaintEffect
 
     QgsEffectStack &operator=( const QgsEffectStack &rhs );
 
+    QgsEffectStack &operator=( QgsEffectStack &&other ) SIP_SKIP;
+
+
   protected:
 
     void draw( QgsRenderContext &context ) override;