sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enable -Wnon-virtual-dtor in pedantic mode, and remove useless virtual qualifiers in 2 final classes

Browse Source
This commit is contained in:
Even Rouault 2020-02-13 23:32:01 +01:00 committed by Nyall Dawson
parent 4422d88dfb
commit 1f10509b86
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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")

2
python/core/auto_generated/qgsfeatureiterator.sip.in
View File

@ -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

4
src/core/geometry/qgswkbptr.h
View File

@ -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

2
src/core/qgsfeatureiterator.h
View File

@ -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;