Apply clang-tidy modernization checks

qgis · Jul 23, 2018 · 5e37e824027ce5ba54a3f310ce5b03f82a05065c · 5e37e82
1 parent 1201df5
commit 5e37e824027ce5ba54a3f310ce5b03f82a05065c
diff --git a/src/3d/qgs3dmapscene.cpp b/src/3d/qgs3dmapscene.cpp
@@ -43,8 +43,7 @@
 
 
 Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, QgsAbstract3DEngine *engine )
-  : Qt3DCore::QEntity()
-  , mMap( map )
+  : mMap( map )
   , mEngine( engine )
 {
 

diff --git a/src/3d/qgsoffscreen3dengine.h b/src/3d/qgsoffscreen3dengine.h
@@ -63,7 +63,7 @@ class _3D_EXPORT QgsOffscreen3DEngine : public QgsAbstract3DEngine
     Q_OBJECT
   public:
     QgsOffscreen3DEngine();
-    ~QgsOffscreen3DEngine();
+    ~QgsOffscreen3DEngine() override;
 
     //! Sets the size of the rendering area (in pixels)
     void setSize( const QSize &s );

diff --git a/src/3d/qgsraycastingutils_p.cpp b/src/3d/qgsraycastingutils_p.cpp
@@ -32,26 +32,21 @@ namespace QgsRayCastingUtils
 
   Ray3D::Ray3D()
     : m_direction( 0.0f, 0.0f, 1.0f )
-    , m_distance( 1.0f )
   {
   }
 
-  Ray3D::Ray3D( const QVector3D &origin, const QVector3D &direction, float distance )
+  Ray3D::Ray3D( QVector3D origin, QVector3D direction, float distance )
     : m_origin( origin )
     , m_direction( direction )
     , m_distance( distance )
   {}
 
-  Ray3D::~Ray3D()
-  {
-  }
-
   QVector3D Ray3D::origin() const
   {
     return m_origin;
   }
 
-  void Ray3D::setOrigin( const QVector3D &value )
+  void Ray3D::setOrigin( QVector3D value )
   {
     m_origin = value;
   }
@@ -61,7 +56,7 @@ namespace QgsRayCastingUtils
     return m_direction;
   }
 
-  void Ray3D::setDirection( const QVector3D &value )
+  void Ray3D::setDirection( QVector3D value )
   {
     if ( value.isNull() )
       return;
@@ -107,7 +102,7 @@ namespace QgsRayCastingUtils
     return !( *this == other );
   }
 
-  bool Ray3D::contains( const QVector3D &point ) const
+  bool Ray3D::contains( QVector3D point ) const
   {
     QVector3D ppVec( point - m_origin );
     if ( ppVec.isNull() ) // point coincides with origin
@@ -126,22 +121,22 @@ namespace QgsRayCastingUtils
     return contains( ray.origin() );
   }
 
-  float Ray3D::projectedDistance( const QVector3D &point ) const
+  float Ray3D::projectedDistance( QVector3D point ) const
   {
     Q_ASSERT( !m_direction.isNull() );
 
     return QVector3D::dotProduct( point - m_origin, m_direction ) /
            m_direction.lengthSquared();
   }
 
-  QVector3D Ray3D::project( const QVector3D &vector ) const
+  QVector3D Ray3D::project( QVector3D vector ) const
   {
     QVector3D norm = m_direction.normalized();
     return QVector3D::dotProduct( vector, norm ) * norm;
   }
 
 
-  float Ray3D::distance( const QVector3D &point ) const
+  float Ray3D::distance( QVector3D point ) const
   {
     float t = projectedDistance( point );
     return ( point - ( m_origin + t * m_direction ) ).length();
@@ -198,7 +193,7 @@ struct ray
 // https://tavianator.com/fast-branchless-raybounding-box-intersections/
 // https://tavianator.com/fast-branchless-raybounding-box-intersections-part-2-nans/
 
-bool intersection( box b, ray r )
+bool intersection( const box &b, const ray &r )
 {
   double t1 = ( b.min[0] - r.origin[0] ) * r.dir_inv[0];
   double t2 = ( b.max[0] - r.origin[0] ) * r.dir_inv[0];
@@ -253,9 +248,9 @@ namespace QgsRayCastingUtils
 // copied from intersectsSegmentTriangle() from qt3d/src/render/backend/triangleboundingvolume.cpp
 // by KDAB, licensed under the terms of LGPL
   bool rayTriangleIntersection( const Ray3D &ray,
-                                const QVector3D &a,
-                                const QVector3D &b,
-                                const QVector3D &c,
+                                QVector3D a,
+                                QVector3D b,
+                                QVector3D c,
                                 QVector3D &uvw,
                                 float &t )
   {
@@ -305,7 +300,7 @@ namespace QgsRayCastingUtils
 
 
 
-static QRect windowViewport( const QSize &area, const QRectF &relativeViewport )
+static QRect windowViewport( QSize area, const QRectF &relativeViewport )
 {
   if ( area.isValid() )
   {
@@ -320,8 +315,8 @@ static QRect windowViewport( const QSize &area, const QRectF &relativeViewport )
 }
 
 
-static QgsRayCastingUtils::Ray3D intersectionRay( const QPointF &pos, const QMatrix4x4 &viewMatrix,
-    const QMatrix4x4 &projectionMatrix, const QRect &viewport )
+static QgsRayCastingUtils::Ray3D intersectionRay( QPointF pos, const QMatrix4x4 &viewMatrix,
+    const QMatrix4x4 &projectionMatrix, QRect viewport )
 {
   // if something seems wrong slightly off with the returned intersection rays,
   // it may be the case that unproject() has hit qFuzzyIsNull() condition inside
@@ -342,8 +337,8 @@ static QgsRayCastingUtils::Ray3D intersectionRay( const QPointF &pos, const QMat
 namespace QgsRayCastingUtils
 {
 
-  Ray3D rayForViewportAndCamera( const QSize &area,
-                                 const QPointF &pos,
+  Ray3D rayForViewportAndCamera( QSize area,
+                                 QPointF pos,
                                  const QRectF &relativeViewport,
                                  const Qt3DRender::QCamera *camera )
   {

diff --git a/src/3d/qgsraycastingutils_p.h b/src/3d/qgsraycastingutils_p.h
@@ -49,27 +49,26 @@ namespace QgsRayCastingUtils
   {
     public:
       Ray3D();
-      explicit Ray3D( const QVector3D &origin, const QVector3D &direction = QVector3D( 0.0f, 0.0f, 1.0f ), float distance = 1.0f );
-      ~Ray3D();
+      explicit Ray3D( QVector3D origin, QVector3D direction = QVector3D( 0.0f, 0.0f, 1.0f ), float distance = 1.0f );
 
       QVector3D origin() const;
-      void setOrigin( const QVector3D &value );
+      void setOrigin( QVector3D value );
 
       QVector3D direction() const;
-      void setDirection( const QVector3D &value );
+      void setDirection( QVector3D value );
 
       float distance() const;
       void setDistance( float distance );
 
-      bool contains( const QVector3D &point ) const;
+      bool contains( QVector3D point ) const;
       bool contains( const Ray3D &ray ) const;
 
       QVector3D point( float t ) const;
-      float projectedDistance( const QVector3D &point ) const;
+      float projectedDistance( QVector3D point ) const;
 
-      QVector3D project( const QVector3D &vector ) const;
+      QVector3D project( QVector3D vector ) const;
 
-      float distance( const QVector3D &point ) const;
+      float distance( QVector3D point ) const;
 
       Ray3D &transform( const QMatrix4x4 &matrix );
       Ray3D transformed( const QMatrix4x4 &matrix ) const;
@@ -80,7 +79,7 @@ namespace QgsRayCastingUtils
     private:
       QVector3D m_origin;
       QVector3D m_direction;
-      float m_distance;
+      float m_distance = 1.0f;
   };
 
   /**
@@ -111,9 +110,9 @@ namespace QgsRayCastingUtils
    * \since QGIS 3.4
    */
   bool rayTriangleIntersection( const Ray3D &ray,
-                                const QVector3D &a,
-                                const QVector3D &b,
-                                const QVector3D &c,
+                                QVector3D a,
+                                QVector3D b,
+                                QVector3D c,
                                 QVector3D &uvw,
                                 float &t );
 

diff --git a/src/analysis/interpolation/NormVecDecorator.cpp b/src/analysis/interpolation/NormVecDecorator.cpp
@@ -33,11 +33,7 @@ NormVecDecorator::~NormVecDecorator()
 
   delete mNormVec;
   delete mPointState;
-
-  if ( mTIN )
-  {
-    delete mTIN;
-  }
+  delete mTIN;
 }
 
 int NormVecDecorator::addPoint( const QgsPoint &p )

diff --git a/src/analysis/processing/qgsalgorithmdifference.cpp b/src/analysis/processing/qgsalgorithmdifference.cpp
@@ -82,7 +82,7 @@ QVariantMap QgsDifferenceAlgorithm::processAlgorithm( const QVariantMap &paramet
 
   int count = 0;
   int total = sourceA->featureCount();
-  QgsOverlayUtils::difference( *sourceA.get(), *sourceB.get(), *sink.get(), context, feedback, count, total, QgsOverlayUtils::OutputA );
+  QgsOverlayUtils::difference( *sourceA, *sourceB, *sink, context, feedback, count, total, QgsOverlayUtils::OutputA );
 
   return outputs;
 }

diff --git a/src/analysis/processing/qgsalgorithmintersection.cpp b/src/analysis/processing/qgsalgorithmintersection.cpp
@@ -106,7 +106,7 @@ QVariantMap QgsIntersectionAlgorithm::processAlgorithm( const QVariantMap &param
   int count = 0;
   int total = sourceA->featureCount();
 
-  QgsOverlayUtils::intersection( *sourceA.get(), *sourceB.get(), *sink.get(), context, feedback, count, total, fieldIndicesA, fieldIndicesB );
+  QgsOverlayUtils::intersection( *sourceA, *sourceB, *sink, context, feedback, count, total, fieldIndicesA, fieldIndicesB );
 
   return outputs;
 }

diff --git a/src/analysis/processing/qgsalgorithmreclassifybylayer.h b/src/analysis/processing/qgsalgorithmreclassifybylayer.h
@@ -33,9 +33,9 @@ class QgsReclassifyAlgorithmBase : public QgsProcessingAlgorithm
 {
   public:
 
-    QString group() const override final;
-    QString groupId() const override final;
-    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override final;
+    QString group() const final;
+    QString groupId() const final;
+    void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) final;
 
   protected:
 
@@ -45,7 +45,7 @@ class QgsReclassifyAlgorithmBase : public QgsProcessingAlgorithm
      */
     virtual void addAlgorithmParams() = 0;
 
-    bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override final;
+    bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) final;
 
     /**
      * Prepares the reclassify algorithm subclass for execution.
@@ -60,7 +60,7 @@ class QgsReclassifyAlgorithmBase : public QgsProcessingAlgorithm
       const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ) = 0;
 
     QVariantMap processAlgorithm( const QVariantMap &parameters,
-                                  QgsProcessingContext &context, QgsProcessingFeedback *feedback ) override final;
+                                  QgsProcessingContext &context, QgsProcessingFeedback *feedback ) final;
 
     std::unique_ptr< QgsRasterInterface > mInterface;
 

diff --git a/src/analysis/processing/qgsalgorithmsymmetricaldifference.cpp b/src/analysis/processing/qgsalgorithmsymmetricaldifference.cpp
@@ -82,9 +82,9 @@ QVariantMap QgsSymmetricalDifferenceAlgorithm::processAlgorithm( const QVariantM
   int count = 0;
   int total = sourceA->featureCount() + sourceB->featureCount();
 
-  QgsOverlayUtils::difference( *sourceA.get(), *sourceB.get(), *sink.get(), context, feedback, count, total, QgsOverlayUtils::OutputAB );
+  QgsOverlayUtils::difference( *sourceA, *sourceB, *sink, context, feedback, count, total, QgsOverlayUtils::OutputAB );
 
-  QgsOverlayUtils::difference( *sourceB.get(), *sourceA.get(), *sink.get(), context, feedback, count, total, QgsOverlayUtils::OutputBA );
+  QgsOverlayUtils::difference( *sourceB, *sourceA, *sink, context, feedback, count, total, QgsOverlayUtils::OutputBA );
 
   return outputs;
 }

diff --git a/src/analysis/processing/qgsalgorithmunion.cpp b/src/analysis/processing/qgsalgorithmunion.cpp
@@ -83,7 +83,7 @@ QVariantMap QgsUnionAlgorithm::processAlgorithm( const QVariantMap &parameters,
   if ( !sourceB )
   {
     // we are doing single layer union
-    QgsOverlayUtils::resolveOverlaps( *sourceA.get(), *sink.get(), feedback );
+    QgsOverlayUtils::resolveOverlaps( *sourceA, *sink, feedback );
     return outputs;
   }
 
@@ -93,11 +93,11 @@ QVariantMap QgsUnionAlgorithm::processAlgorithm( const QVariantMap &parameters,
   int count = 0;
   int total = sourceA->featureCount() * 2 + sourceB->featureCount();
 
-  QgsOverlayUtils::intersection( *sourceA.get(), *sourceB.get(), *sink.get(), context, feedback, count, total, fieldIndicesA, fieldIndicesB );
+  QgsOverlayUtils::intersection( *sourceA, *sourceB, *sink, context, feedback, count, total, fieldIndicesA, fieldIndicesB );
 
-  QgsOverlayUtils::difference( *sourceA.get(), *sourceB.get(), *sink.get(), context, feedback, count, total, QgsOverlayUtils::OutputAB );
+  QgsOverlayUtils::difference( *sourceA, *sourceB, *sink, context, feedback, count, total, QgsOverlayUtils::OutputAB );
 
-  QgsOverlayUtils::difference( *sourceB.get(), *sourceA.get(), *sink.get(), context, feedback, count, total, QgsOverlayUtils::OutputBA );
+  QgsOverlayUtils::difference( *sourceB, *sourceA, *sink, context, feedback, count, total, QgsOverlayUtils::OutputBA );
 
   return outputs;
 }

diff --git a/src/analysis/processing/qgsalgorithmvectorize.h b/src/analysis/processing/qgsalgorithmvectorize.h
@@ -39,8 +39,8 @@ class QgsVectorizeAlgorithm : public QgsProcessingAlgorithm
     QStringList tags() const override;
     QString shortHelpString() const override;
     QgsVectorizeAlgorithm *createInstance() const override SIP_FACTORY;
-    QString group() const override final;
-    QString groupId() const override final;
+    QString group() const final;
+    QString groupId() const final;
     void initAlgorithm( const QVariantMap &configuration = QVariantMap() ) override;
 
   protected:

diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp
@@ -47,14 +47,8 @@ QgsRasterCalcNode::QgsRasterCalcNode( const QString &rasterName )
 
 QgsRasterCalcNode::~QgsRasterCalcNode()
 {
-  if ( mLeft )
-  {
-    delete mLeft;
-  }
-  if ( mRight )
-  {
-    delete mRight;
-  }
+  delete mLeft;
+  delete mRight;
 }
 
 bool QgsRasterCalcNode::calculate( QMap<QString, QgsRasterBlock * > &rasterData, QgsRasterMatrix &result, int row ) const

diff --git a/src/app/3d/qgs3danimationsettings.cpp b/src/app/3d/qgs3danimationsettings.cpp
@@ -18,10 +18,6 @@
 #include <QEasingCurve>
 #include <QDomDocument>
 
-Qgs3DAnimationSettings::Qgs3DAnimationSettings()
-{
-}
-
 float Qgs3DAnimationSettings::duration() const
 {
   return mKeyframes.isEmpty() ? 0 : mKeyframes.constLast().time;

diff --git a/src/app/3d/qgs3danimationsettings.h b/src/app/3d/qgs3danimationsettings.h
@@ -32,7 +32,7 @@ class QgsReadWriteContext;
 class Qgs3DAnimationSettings
 {
   public:
-    Qgs3DAnimationSettings();
+    Qgs3DAnimationSettings() = default;
 
     //! keyframe definition
     struct Keyframe

diff --git a/src/app/3d/qgs3danimationwidget.h b/src/app/3d/qgs3danimationwidget.h
@@ -30,7 +30,7 @@ class Qgs3DAnimationWidget : public QWidget, private Ui::Animation3DWidget
     Q_OBJECT
   public:
     explicit Qgs3DAnimationWidget( QWidget *parent = nullptr );
-    ~Qgs3DAnimationWidget();
+    ~Qgs3DAnimationWidget() override;
 
     void setCameraController( QgsCameraController *cameraController );
 

diff --git a/src/app/dwg/qgsdwgimporter.h b/src/app/dwg/qgsdwgimporter.h
@@ -57,7 +57,7 @@ class QgsDwgImporter : public DRW_Interface
 
     void addBlock( const DRW_Block &data ) override;
 
-    void setBlock( const int handle ) override;
+    void setBlock( int handle ) override;
 
     //! Called to end the current block
     void endBlock() override;

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp
@@ -1093,10 +1093,8 @@ void QgsGpsInformationWidget::populateDevices()
 
 void QgsGpsInformationWidget::createRubberBand()
 {
-  if ( mpRubberBand )
-  {
-    delete mpRubberBand;
-  }
+  delete mpRubberBand;
+
   mpRubberBand = new QgsRubberBand( mpCanvas, QgsWkbTypes::LineGeometry );
   mpRubberBand->setColor( mBtnTrackColor->color() );
   mpRubberBand->setWidth( mSpinTrackWidth->value() );

diff --git a/src/app/mesh/qgsmeshdatasetgrouptreeview.cpp b/src/app/mesh/qgsmeshdatasetgrouptreeview.cpp
@@ -87,8 +87,6 @@ QgsMeshDatasetGroupTreeModel::QgsMeshDatasetGroupTreeModel( QObject *parent )
 {
 }
 
-QgsMeshDatasetGroupTreeModel::~QgsMeshDatasetGroupTreeModel() = default;
-
 int QgsMeshDatasetGroupTreeModel::columnCount( const QModelIndex &parent ) const
 {
   if ( parent.isValid() )