Implement move assignment operator for QgsExpressionContext

nyalldawson · nyalldawson · commit 2d191f66a069 · 2016-08-15T12:00:11.000+10:00
diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -217,6 +217,21 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext& other )
   mCachedValues = other.mCachedValues;
 }
 
+QgsExpressionContext& QgsExpressionContext::operator=( QgsExpressionContext && other )
+{
+  if ( this != &other )
+  {
+    qDeleteAll( mStack );
+    // move the stack over
+    mStack = other.mStack;
+    other.mStack.clear();
+
+    mHighlightedVariables = other.mHighlightedVariables;
+    mCachedValues = other.mCachedValues;
+  }
+  return *this;
+}
+
 QgsExpressionContext& QgsExpressionContext::operator=( const QgsExpressionContext & other )
 {
   qDeleteAll( mStack );
diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h
@@ -259,6 +259,8 @@ class CORE_EXPORT QgsExpressionContext
 
     QgsExpressionContext& operator=( const QgsExpressionContext& other );
 
+    QgsExpressionContext& operator=( QgsExpressionContext && other );
+
     ~QgsExpressionContext();
 
     /** Check whether a variable is specified by any scope within the context.
