Fix missing members in assignment operators

qgis · Apr 17, 2023 · 6a8c909 · 6a8c909
1 parent f28ba2b
commit 6a8c909
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/src/core/maprenderer/qgsmaprendererjob.cpp b/src/core/maprenderer/qgsmaprendererjob.cpp
@@ -91,6 +91,9 @@ LayerRenderJob &LayerRenderJob::operator=( LayerRenderJob &&other )
 
   maskRequiresLayerRasterization = other.maskRequiresLayerRasterization;
 
+  elevationMap = other.elevationMap;
+  maskPainter = std::move( other.maskPainter );
+
   return *this;
 }
 

diff --git a/src/core/mesh/qgsmeshtracerenderer.cpp b/src/core/mesh/qgsmeshtracerenderer.cpp
@@ -1298,6 +1298,7 @@ QgsMeshParticleTracesField &QgsMeshParticleTracesField::operator=( const QgsMesh
 {
   QgsMeshStreamField::operator=( other );
   mTimeField = other.mTimeField;
+  mMagnitudeField = other.mMagnitudeField;
   mDirectionField = other.mDirectionField;
   mParticles = other.mParticles;
   mStumpImage = other.mStumpImage;

diff --git a/src/core/qgsexpressioncontext.cpp b/src/core/qgsexpressioncontext.cpp
@@ -321,6 +321,7 @@ QgsExpressionContext::QgsExpressionContext( const QgsExpressionContext &other )
   mLoadLayerFunction = std::make_unique< LoadLayerFunction >();
 }
 
+// cppcheck-suppress operatorEqVarError
 QgsExpressionContext &QgsExpressionContext::operator=( QgsExpressionContext &&other ) noexcept
 {
   if ( this != &other )

diff --git a/src/core/qgssqlstatement.cpp b/src/core/qgssqlstatement.cpp
@@ -153,8 +153,9 @@ QgsSQLStatement &QgsSQLStatement::operator=( const QgsSQLStatement &other )
   {
     delete mRootNode;
     mParserErrorString.clear();
-    mRootNode = ::parse( other.mStatement, mParserErrorString, other.mAllowFragments );
     mStatement = other.mStatement;
+    mAllowFragments = other.mAllowFragments;
+    mRootNode = ::parse( mStatement, mParserErrorString, mAllowFragments );
   }
   return *this;
 }