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

Add missing overrides

Browse Source
This commit is contained in:
Nyall Dawson 2015-05-27 16:18:34 +10:00
parent b1dd253fc5
commit c729a753c5
16 changed files with 242 additions and 242 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/core/geometry/qgscircularstringv2.h
View File

@ -27,50 +27,50 @@ class CORE_EXPORT QgsCircularStringV2: public QgsCurveV2
QgsCircularStringV2();
~QgsCircularStringV2();
virtual QString geometryType() const { return "CircularString"; }
virtual int dimension() const { return 1; }
virtual QgsAbstractGeometryV2* clone() const;
virtual void clear();
virtual QString geometryType() const override { return "CircularString"; }
virtual int dimension() const override { return 1; }
virtual QgsAbstractGeometryV2* clone() const override;
virtual void clear() override;
virtual QgsRectangle calculateBoundingBox() const;
virtual QgsRectangle calculateBoundingBox() const override;
virtual bool fromWkb( const unsigned char * wkb );
virtual bool fromWkt( const QString& wkt );
virtual bool fromWkb( const unsigned char * wkb ) override;
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
int numPoints() const;
int numPoints() const override;
QgsPointV2 pointN( int i ) const;
void points( QList<QgsPointV2>& pts ) const;
void points( QList<QgsPointV2>& pts ) const override;
void setPoints( const QList<QgsPointV2>& points );
//curve interface
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual QgsLineStringV2* curveToLine() const;
virtual double length() const override;
virtual QgsPointV2 startPoint() const override;
virtual QgsPointV2 endPoint() const override;
virtual QgsLineStringV2* curveToLine() const override;
void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
void clip( const QgsRectangle& rect );
void addToPainterPath( QPainterPath& path ) const;
void drawAsPolygon( QPainter& p ) const;
void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
void clip( const QgsRectangle& rect ) override;
void addToPainterPath( QPainterPath& path ) const override;
void drawAsPolygon( QPainter& p ) const override;
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex );
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position );
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override;
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const override;
void sumUpArea( double& sum ) const;
void sumUpArea( double& sum ) const override;
private:
QVector<double> mX;

60
src/core/geometry/qgscompoundcurvev2.h
View File

@ -28,30 +28,30 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2
QgsCompoundCurveV2& operator=( const QgsCompoundCurveV2& curve );
~QgsCompoundCurveV2();
virtual QString geometryType() const { return "CompoundCurve"; }
virtual int dimension() const { return 1; }
virtual QgsAbstractGeometryV2* clone() const;
virtual void clear();
virtual QString geometryType() const override { return "CompoundCurve"; }
virtual int dimension() const override { return 1; }
virtual QgsAbstractGeometryV2* clone() const override;
virtual void clear() override;
virtual QgsRectangle calculateBoundingBox() const;
virtual QgsRectangle calculateBoundingBox() const override;
virtual bool fromWkb( const unsigned char* wkb );
virtual bool fromWkt( const QString& wkt );
virtual bool fromWkb( const unsigned char* wkb ) override;
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
//curve interface
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual void points( QList<QgsPointV2>& pts ) const;
virtual int numPoints() const;
virtual QgsLineStringV2* curveToLine() const;
virtual double length() const override;
virtual QgsPointV2 startPoint() const override;
virtual QgsPointV2 endPoint() const override;
virtual void points( QList<QgsPointV2>& pts ) const override;
virtual int numPoints() const override;
virtual QgsLineStringV2* curveToLine() const override;
int nCurves() const { return mCurves.size(); }
const QgsCurveV2* curveAt( int i ) const;
@ -60,20 +60,20 @@ class CORE_EXPORT QgsCompoundCurveV2: public QgsCurveV2
void removeCurve( int i );
void addVertex( const QgsPointV2& pt );
void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
void addToPainterPath( QPainterPath& path ) const;
void drawAsPolygon( QPainter& p ) const;
void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
void addToPainterPath( QPainterPath& path ) const override;
void drawAsPolygon( QPainter& p ) const override;
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex );
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position );
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override;
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override;
virtual double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const;
virtual double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const override;
void sumUpArea( double& sum ) const;
void sumUpArea( double& sum ) const override;
/**Appends first point if not already closed*/
void close();

54
src/core/geometry/qgscurvepolygonv2.h
View File

@ -30,29 +30,29 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2
QgsCurvePolygonV2& operator=( const QgsCurvePolygonV2& p );
~QgsCurvePolygonV2();
virtual QString geometryType() const { return "CurvePolygon"; }
virtual int dimension() const { return 2; }
virtual QgsAbstractGeometryV2* clone() const;
void clear();
virtual QString geometryType() const override { return "CurvePolygon"; }
virtual int dimension() const override { return 2; }
virtual QgsAbstractGeometryV2* clone() const override;
void clear() override;
virtual QgsRectangle calculateBoundingBox() const;
virtual bool fromWkb( const unsigned char* wkb );
virtual bool fromWkt( const QString& wkt );
virtual QgsRectangle calculateBoundingBox() const override;
virtual bool fromWkb( const unsigned char* wkb ) override;
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
//surface interface
virtual double area() const;
virtual double length() const;
QgsPointV2 centroid() const;
QgsPointV2 pointOnSurface() const;
QgsPolygonV2* surfaceToPolygon() const;
virtual double area() const override;
virtual double length() const override;
QgsPointV2 centroid() const override;
QgsPointV2 pointOnSurface() const override;
QgsPolygonV2* surfaceToPolygon() const override;
//curve polygon interface
int numInteriorRings() const;
@ -68,17 +68,17 @@ class CORE_EXPORT QgsCurvePolygonV2: public QgsSurfaceV2
/**Removes ring. Exterior ring is 0, first interior ring 1, ...*/
bool removeInteriorRing( int nr );
virtual void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
virtual void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex );
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position );
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override;
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const override;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override;
protected:

8
src/core/geometry/qgscurvev2.h
View File

@ -40,11 +40,11 @@ class CORE_EXPORT QgsCurveV2: public QgsAbstractGeometryV2
virtual void points( QList<QgsPointV2>& pt ) const = 0;
virtual int numPoints() const = 0;
virtual double area() const;
virtual void sumUpArea( double& sum ) const = 0;
virtual double area() const override;
virtual void sumUpArea( double& sum ) const = 0;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const;
virtual bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const override;
virtual bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override;
virtual bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const = 0;
};

50
src/core/geometry/qgsgeometrycollectionv2.h
View File

@ -27,48 +27,48 @@ class CORE_EXPORT QgsGeometryCollectionV2: public QgsAbstractGeometryV2
QgsGeometryCollectionV2& operator=( const QgsGeometryCollectionV2& c );
virtual ~QgsGeometryCollectionV2();
virtual QgsAbstractGeometryV2* clone() const;
virtual QgsAbstractGeometryV2* clone() const override;
int numGeometries() const;
const QgsAbstractGeometryV2* geometryN( int n ) const;
QgsAbstractGeometryV2* geometryN( int n );
//methods inherited from QgsAbstractGeometry
virtual int dimension() const;
virtual QString geometryType() const { return "GeometryCollection"; }
virtual void clear();
virtual int dimension() const override;
virtual QString geometryType() const override { return "GeometryCollection"; }
virtual void clear() override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool removeGeometry( int nr );
virtual void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
virtual void clip( const QgsRectangle& rect );
virtual void draw( QPainter& p ) const;
virtual void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
virtual void clip( const QgsRectangle& rect ) override;
virtual void draw( QPainter& p ) const override;
bool fromWkb( const unsigned char * wkb );
virtual bool fromWkt( const QString& wkt );
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
bool fromWkb( const unsigned char * wkb ) override;
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
virtual QgsRectangle calculateBoundingBox() const;
virtual QgsRectangle calculateBoundingBox() const override;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const;
virtual double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const override;
virtual double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override;
//low-level editing
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex );
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position );
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override;
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override;
virtual double length() const;
virtual double area() const;
virtual double length() const override;
virtual double area() const override;
protected:
QVector< QgsAbstractGeometryV2* > mGeometries;

56
src/core/geometry/qgsgeos.h
View File

@ -31,33 +31,33 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine
~QgsGeos();
/**Removes caches*/
void geometryChanged();
void prepareGeometry();
void geometryChanged() override;
void prepareGeometry() override;
QgsAbstractGeometryV2* intersection( const QgsAbstractGeometryV2& geom ) const;
QgsAbstractGeometryV2* difference( const QgsAbstractGeometryV2& geom ) const;
QgsAbstractGeometryV2* combine( const QgsAbstractGeometryV2& geom ) const ;
QgsAbstractGeometryV2* combine( const QList< const QgsAbstractGeometryV2* > ) const;
QgsAbstractGeometryV2* symDifference( const QgsAbstractGeometryV2& geom ) const;
QgsAbstractGeometryV2* buffer( double distance, int segments ) const;
QgsAbstractGeometryV2* simplify( double tolerance ) const;
QgsAbstractGeometryV2* interpolate( double distance ) const;
bool centroid( QgsPointV2& pt ) const;
bool pointOnSurface( QgsPointV2& pt ) const;
QgsAbstractGeometryV2* convexHull() const;
double distance( const QgsAbstractGeometryV2& geom ) const;
bool intersects( const QgsAbstractGeometryV2& geom ) const;
bool touches( const QgsAbstractGeometryV2& geom ) const;
bool crosses( const QgsAbstractGeometryV2& geom ) const;
bool within( const QgsAbstractGeometryV2& geom ) const;
bool overlaps( const QgsAbstractGeometryV2& geom ) const;
bool contains( const QgsAbstractGeometryV2& geom ) const;
bool disjoint( const QgsAbstractGeometryV2& geom ) const;
double area() const;
double length() const;
bool isValid() const;
bool isEqual( const QgsAbstractGeometryV2& geom ) const;
bool isEmpty() const;
QgsAbstractGeometryV2* intersection( const QgsAbstractGeometryV2& geom ) const override;
QgsAbstractGeometryV2* difference( const QgsAbstractGeometryV2& geom ) const override;
QgsAbstractGeometryV2* combine( const QgsAbstractGeometryV2& geom ) const override;
QgsAbstractGeometryV2* combine( const QList< const QgsAbstractGeometryV2* > ) const override;
QgsAbstractGeometryV2* symDifference( const QgsAbstractGeometryV2& geom ) const override;
QgsAbstractGeometryV2* buffer( double distance, int segments ) const override;
QgsAbstractGeometryV2* simplify( double tolerance ) const override;
QgsAbstractGeometryV2* interpolate( double distance ) const override;
bool centroid( QgsPointV2& pt ) const override;
bool pointOnSurface( QgsPointV2& pt ) const override;
QgsAbstractGeometryV2* convexHull() const override;
double distance( const QgsAbstractGeometryV2& geom ) const override;
bool intersects( const QgsAbstractGeometryV2& geom ) const override;
bool touches( const QgsAbstractGeometryV2& geom ) const override;
bool crosses( const QgsAbstractGeometryV2& geom ) const override;
bool within( const QgsAbstractGeometryV2& geom ) const override;
bool overlaps( const QgsAbstractGeometryV2& geom ) const override;
bool contains( const QgsAbstractGeometryV2& geom ) const override;
bool disjoint( const QgsAbstractGeometryV2& geom ) const override;
double area() const override;
double length() const override;
bool isValid() const override;
bool isEqual( const QgsAbstractGeometryV2& geom ) const override;
bool isEmpty() const override;
/**Splits this geometry according to a given line.
@param splitLine the line that splits the geometry
@ -68,9 +68,9 @@ class CORE_EXPORT QgsGeos: public QgsGeometryEngine
int splitGeometry( const QgsLineStringV2& splitLine,
QList<QgsAbstractGeometryV2*>& newGeometries,
bool topological,
QList<QgsPointV2> &topologyTestPoints ) const;
QList<QgsPointV2> &topologyTestPoints ) const override;
QgsAbstractGeometryV2* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit ) const;
QgsAbstractGeometryV2* offsetCurve( double distance, int segments, int joinStyle, double mitreLimit ) const override;
QgsAbstractGeometryV2* reshapeGeometry( const QgsLineStringV2& reshapeWithLine, int* errorCode ) const;
static QgsAbstractGeometryV2* fromGeos( const GEOSGeometry* geos );

58
src/core/geometry/qgslinestringv2.h
View File

@ -28,53 +28,53 @@ class CORE_EXPORT QgsLineStringV2: public QgsCurveV2
QgsLineStringV2();
~QgsLineStringV2();
virtual QString geometryType() const { return "LineString"; }
virtual int dimension() const { return 1; }
virtual QgsAbstractGeometryV2* clone() const;
virtual void clear();
virtual QString geometryType() const override { return "LineString"; }
virtual int dimension() const override { return 1; }
virtual QgsAbstractGeometryV2* clone() const override;
virtual void clear() override;
virtual bool fromWkb( const unsigned char* wkb );
virtual bool fromWkb( const unsigned char* wkb ) override;
void fromWkbPoints( QgsWKBTypes::Type type, const QgsConstWkbPtr& wkb );
virtual bool fromWkt( const QString& wkt );
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
//curve interface
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual QgsLineStringV2* curveToLine() const;
virtual double length() const override;
virtual QgsPointV2 startPoint() const override;
virtual QgsPointV2 endPoint() const override;
virtual QgsLineStringV2* curveToLine() const override;
int numPoints() const;
int numPoints() const override;
QgsPointV2 pointN( int i ) const;
void points( QList<QgsPointV2>& pt ) const;
void points( QList<QgsPointV2>& pt ) const override;
void setPoints( const QList<QgsPointV2>& points );
void append( const QgsLineStringV2* line );
void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
void addToPainterPath( QPainterPath& path ) const;
void drawAsPolygon( QPainter& p ) const;
void addToPainterPath( QPainterPath& path ) const override;
void drawAsPolygon( QPainter& p ) const override;
const QPolygonF& qPolygonF() const { return mCoords; }
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex );
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position );
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override;
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override;
void addVertex( const QgsPointV2& pt );
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool pointAt( int i, QgsPointV2& vertex, QgsVertexId::VertexType& type ) const override;
void sumUpArea( double& sum ) const;
void sumUpArea( double& sum ) const override;
/**Appends first point if not already closed*/
void close();

14
src/core/geometry/qgsmulticurvev2.h
View File

@ -21,21 +21,21 @@ email : marco.hugentobler at sourcepole dot com
class CORE_EXPORT QgsMultiCurveV2: public QgsGeometryCollectionV2
{
public:
virtual QString geometryType() const { return "MultiCurve"; }
QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "MultiCurve"; }
QgsAbstractGeometryV2* clone() const override;
bool fromWkt( const QString& wkt );
bool fromWkt( const QString& wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
};
#endif // QGSMULTICURVEV2_H

14
src/core/geometry/qgsmultilinestringv2.h
View File

@ -21,21 +21,21 @@ email : marco.hugentobler at sourcepole dot com
class CORE_EXPORT QgsMultiLineStringV2: public QgsGeometryCollectionV2
{
public:
virtual QString geometryType() const { return "MultiLineString"; }
QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "MultiLineString"; }
QgsAbstractGeometryV2* clone() const override;
bool fromWkt( const QString& wkt );
bool fromWkt( const QString& wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
};
#endif // QGSMULTILINESTRINGV2_H

14
src/core/geometry/qgsmultipointv2.h
View File

@ -21,21 +21,21 @@ email : marco.hugentobler at sourcepole dot com
class CORE_EXPORT QgsMultiPointV2: public QgsGeometryCollectionV2
{
public:
virtual QString geometryType() const { return "MultiPoint"; }
QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "MultiPoint"; }
QgsAbstractGeometryV2* clone() const override;
bool fromWkt( const QString& wkt );
bool fromWkt( const QString& wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
};
#endif // QGSMULTIPOINTV2_H

14
src/core/geometry/qgsmultipolygonv2.h
View File

@ -21,21 +21,21 @@ email : marco.hugentobler at sourcepole dot com
class CORE_EXPORT QgsMultiPolygonV2: public QgsGeometryCollectionV2
{
public:
virtual QString geometryType() const { return "MultiPolygon"; }
QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "MultiPolygon"; }
QgsAbstractGeometryV2* clone() const override;
bool fromWkt( const QString& wkt );
bool fromWkt( const QString& wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
};
#endif // QGSMULTIPOLYGONV2_H

14
src/core/geometry/qgsmultisurfacev2.h
View File

@ -21,21 +21,21 @@ email : marco.hugentobler at sourcepole dot com
class CORE_EXPORT QgsMultiSurfaceV2: public QgsGeometryCollectionV2
{
public:
virtual QString geometryType() const { return "MultiSurface"; }
QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "MultiSurface"; }
QgsAbstractGeometryV2* clone() const override;
bool fromWkt( const QString& wkt );
bool fromWkt( const QString& wkt ) override;
// inherited: int wkbSize() const;
// inherited: unsigned char* asWkb( int& binarySize ) const;
// inherited: QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
/**Adds a geometry and takes ownership. Returns true in case of success*/
virtual bool addGeometry( QgsAbstractGeometryV2* g );
virtual bool addGeometry( QgsAbstractGeometryV2* g ) override;
};
#endif // QGSMULTISURFACEV2_H

44
src/core/geometry/qgspointv2.h
View File

@ -29,8 +29,8 @@ class CORE_EXPORT QgsPointV2: public QgsAbstractGeometryV2
bool operator==( const QgsPointV2& pt ) const;
bool operator!=( const QgsPointV2& pt ) const;
virtual QgsAbstractGeometryV2* clone() const;
void clear();
virtual QgsAbstractGeometryV2* clone() const override;
void clear() override;
double x() const { return mX; }
double y() const { return mY; }
@ -42,37 +42,37 @@ class CORE_EXPORT QgsPointV2: public QgsAbstractGeometryV2
void setZ( double z ) { mZ = z; }
void setM( double m ) { mM = m; }
virtual QString geometryType() const { return "Point"; }
virtual QString geometryType() const override { return "Point"; }
//implementation of inherited methods
virtual int dimension() const { return 0; }
virtual int dimension() const override { return 0; }
virtual bool fromWkb( const unsigned char* wkb );
virtual bool fromWkt( const QString& wkt );
virtual bool fromWkb( const unsigned char* wkb ) override;
virtual bool fromWkt( const QString& wkt ) override;
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
QString asWkt( int precision = 17 ) const;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
QString asJSON( int precision = 17 ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
QString asWkt( int precision = 17 ) const override;
QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const override;
QString asJSON( int precision = 17 ) const override;
virtual QgsRectangle calculateBoundingBox() const { return QgsRectangle( mX, mY, mX, mY );}
virtual QgsRectangle calculateBoundingBox() const override { return QgsRectangle( mX, mY, mX, mY );}
void draw( QPainter& p ) const;
void transform( const QgsCoordinateTransform& ct );
void transform( const QTransform& t );
void draw( QPainter& p ) const override;
void transform( const QgsCoordinateTransform& ct ) override;
void transform( const QTransform& t ) override;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const;
virtual void coordinateSequence( QList< QList< QList< QgsPointV2 > > >& coord ) const override;
//low-level editing
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) { Q_UNUSED( position ); Q_UNUSED( vertex ); return false; }
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos );
virtual bool deleteVertex( const QgsVertexId& position ) { Q_UNUSED( position ); return false; }
virtual bool insertVertex( const QgsVertexId& position, const QgsPointV2& vertex ) override { Q_UNUSED( position ); Q_UNUSED( vertex ); return false; }
virtual bool moveVertex( const QgsVertexId& position, const QgsPointV2& newPos ) override;
virtual bool deleteVertex( const QgsVertexId& position ) override { Q_UNUSED( position ); return false; }
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const;
double closestSegment( const QgsPointV2& pt, QgsPointV2& segmentPt, QgsVertexId& vertexAfter, bool* leftOf, double epsilon ) const override;
bool nextVertex( QgsVertexId& id, QgsPointV2& vertex ) const override;
private:
double mX;

12
src/core/geometry/qgspolygonv2.h
View File

@ -23,19 +23,19 @@
class CORE_EXPORT QgsPolygonV2: public QgsCurvePolygonV2
{
public:
virtual QString geometryType() const { return "Polygon"; }
virtual QgsAbstractGeometryV2* clone() const;
virtual QString geometryType() const override { return "Polygon"; }
virtual QgsAbstractGeometryV2* clone() const override;
virtual bool fromWkb( const unsigned char* wkb );
virtual bool fromWkb( const unsigned char* wkb ) override;
// inherited: bool fromWkt( const QString &wkt );
int wkbSize() const;
unsigned char* asWkb( int& binarySize ) const;
int wkbSize() const override;
unsigned char* asWkb( int& binarySize ) const override;
// inherited: QString asWkt( int precision = 17 ) const;
// inherited: QDomElement asGML2( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
// inherited: QDomElement asGML3( QDomDocument& doc, int precision = 17, const QString& ns = "gml" ) const;
// inherited: QString asJSON( int precision = 17 ) const;
QgsPolygonV2* surfaceToPolygon() const;
QgsPolygonV2* surfaceToPolygon() const override;
};
#endif // QGSPOLYGONV2_H

8
src/gui/raster/qwt5_histogram_item.h
View File

@ -43,14 +43,14 @@ class HistogramItem: public QwtPlotItem
void setPen( const QPen& pen );
QPen pen() const;
virtual QwtDoubleRect boundingRect() const;
virtual QwtDoubleRect boundingRect() const override;
virtual int rtti() const;
virtual int rtti() const override;
virtual void draw( QPainter *, const QwtScaleMap &xMap,
const QwtScaleMap &yMap, const QRect & ) const;
const QwtScaleMap &yMap, const QRect & ) const override;
virtual void updateLegend( QwtLegend * ) const;
virtual void updateLegend( QwtLegend * ) const override;
void setBaseline( double reference );
double baseline() const;

2
src/providers/postgres/qgspostgresfeatureiterator.h
View File

@ -86,7 +86,7 @@ class QgsPostgresFeatureIterator : public QgsAbstractFeatureIteratorFromSource<Q
virtual bool fetchFeature( QgsFeature& feature ) override;
//! fetch next feature filter expression
bool nextFeatureFilterExpression( QgsFeature& f );
bool nextFeatureFilterExpression( QgsFeature& f ) override;
//! Setup the simplification of geometries to fetch using the specified simplify method
virtual bool prepareSimplification( const QgsSimplifyMethod& simplifyMethod ) override;