Enable -Wnon-virtual-dtor in pedantic mode, and remove useless virtua…

…l qualifiers in 2 final classes
qgis · Feb 16, 2020 · 1f10509 · 1f10509
1 parent 4422d88
commit 1f10509
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -549,6 +549,8 @@ IF (PEDANTIC)
 
     # c++ only warnings
 
+    SET(_warnings "${_warnings} -Wnon-virtual-dtor")
+
     # unavoidable - we can't avoid these, as older, supported compilers do not support removing the redundant move
     SET(_warnings "${_warnings} -Wno-redundant-move")
 

diff --git a/python/core/auto_generated/qgsfeatureiterator.sip.in b/python/core/auto_generated/qgsfeatureiterator.sip.in
@@ -240,7 +240,7 @@ Copy constructor copies the iterator, increases ref.count
     bool rewind();
     bool close();
 
-    virtual bool isValid() const;
+    bool isValid() const;
 %Docstring
 Will return if this iterator is valid.
 An invalid iterator was probably introduced by a failed attempt to acquire a connection

diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h
@@ -169,9 +169,9 @@ class CORE_EXPORT QgsConstWkbPtr
     inline const QgsConstWkbPtr &operator>>( char &v ) const { read( v ); return *this; } SIP_SKIP
 
     //! Read a point
-    virtual const QgsConstWkbPtr &operator>>( QPointF &point ) const; SIP_SKIP
+    const QgsConstWkbPtr &operator>>( QPointF &point ) const; SIP_SKIP
     //! Read a point array
-    virtual const QgsConstWkbPtr &operator>>( QPolygonF &points ) const; SIP_SKIP
+    const QgsConstWkbPtr &operator>>( QPolygonF &points ) const; SIP_SKIP
 
     inline void operator+=( int n ) { verifyBound( n ); mP += n; } SIP_SKIP
     inline void operator-=( int n ) { mP -= n; } SIP_SKIP

diff --git a/src/core/qgsfeatureiterator.h b/src/core/qgsfeatureiterator.h
@@ -310,7 +310,7 @@ class CORE_EXPORT QgsFeatureIterator
      *
      * \since QGIS 3.0
      */
-    virtual bool isValid() const;
+    bool isValid() const;
 
     //! find out whether the iterator is still valid or closed already
     bool isClosed() const;