Address cppcheck warnings about operatorEqToSelf

qgis · May 29, 2020 · bf92650 · bf92650
1 parent b8b40f6
commit bf92650
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 28 deletions.
diff --git a/src/analysis/raster/qgsrastermatrix.cpp b/src/analysis/raster/qgsrastermatrix.cpp
@@ -40,13 +40,16 @@ QgsRasterMatrix::~QgsRasterMatrix()
 
 QgsRasterMatrix &QgsRasterMatrix::operator=( const QgsRasterMatrix &m )
 {
-  delete[] mData;
-  mColumns = m.nColumns();
-  mRows = m.nRows();
-  int nEntries = mColumns * mRows;
-  mData = new double[nEntries];
-  memcpy( mData, m.mData, sizeof( double ) * nEntries );
-  mNodataValue = m.nodataValue();
+  if ( this != &m )
+  {
+    delete[] mData;
+    mColumns = m.nColumns();
+    mRows = m.nRows();
+    int nEntries = mColumns * mRows;
+    mData = new double[nEntries];
+    memcpy( mData, m.mData, sizeof( double ) * nEntries );
+    mNodataValue = m.nodataValue();
+  }
   return *this;
 }
 

diff --git a/src/core/expression/qgsexpression.cpp b/src/core/expression/qgsexpression.cpp
@@ -159,13 +159,16 @@ QgsExpression::QgsExpression( const QgsExpression &other )
 
 QgsExpression &QgsExpression::operator=( const QgsExpression &other )
 {
-  if ( !d->ref.deref() )
+  if ( this != &other )
   {
-    delete d;
-  }
+    if ( !d->ref.deref() )
+    {
+      delete d;
+    }
 
-  d = other.d;
-  d->ref.ref();
+    d = other.d;
+    d->ref.ref();
+  }
   return *this;
 }
 

diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -89,14 +89,17 @@ QgsGeometry::QgsGeometry( const QgsGeometry &other )
 
 QgsGeometry &QgsGeometry::operator=( QgsGeometry const &other )
 {
-  if ( !d->ref.deref() )
+  if ( this != &other )
   {
-    delete d;
-  }
+    if ( !d->ref.deref() )
+    {
+      delete d;
+    }
 
-  mLastError = other.mLastError;
-  d = other.d;
-  d->ref.ref();
+    mLastError = other.mLastError;
+    d = other.d;
+    d->ref.ref();
+  }
   return *this;
 }
 

diff --git a/src/core/qgspropertytransformer.cpp b/src/core/qgspropertytransformer.cpp
@@ -689,12 +689,15 @@ QgsCurveTransform::QgsCurveTransform( const QgsCurveTransform &other )
 
 QgsCurveTransform &QgsCurveTransform::operator=( const QgsCurveTransform &other )
 {
-  mControlPoints = other.mControlPoints;
-  if ( other.mSecondDerivativeArray )
+  if ( this != &other )
   {
-    delete [] mSecondDerivativeArray;
-    mSecondDerivativeArray = new double[ mControlPoints.count()];
-    memcpy( mSecondDerivativeArray, other.mSecondDerivativeArray, sizeof( double ) * mControlPoints.count() );
+    mControlPoints = other.mControlPoints;
+    if ( other.mSecondDerivativeArray )
+    {
+      delete [] mSecondDerivativeArray;
+      mSecondDerivativeArray = new double[ mControlPoints.count()];
+      memcpy( mSecondDerivativeArray, other.mSecondDerivativeArray, sizeof( double ) * mControlPoints.count() );
+    }
   }
   return *this;
 }

diff --git a/src/core/qgsspatialindexkdbush.cpp b/src/core/qgsspatialindexkdbush.cpp
@@ -40,13 +40,16 @@ QgsSpatialIndexKDBush::QgsSpatialIndexKDBush( const QgsSpatialIndexKDBush &other
 
 QgsSpatialIndexKDBush &QgsSpatialIndexKDBush::operator=( const QgsSpatialIndexKDBush &other )
 {
-  if ( !d->ref.deref() )
+  if ( this != &other )
   {
-    delete d;
-  }
+    if ( !d->ref.deref() )
+    {
+      delete d;
+    }
 
-  d = other.d;
-  d->ref.ref();
+    d = other.d;
+    d->ref.ref();
+  }
   return *this;
 }