Skip to content

Commit 7b60d89

Browse files
committedMay 1, 2017
align pointer and reference in sip files batch 2
1 parent 699580d commit 7b60d89

File tree

260 files changed

+2649
-2649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+2649
-2649
lines changed
 

‎python/analysis/interpolation/Bezier3D.sip

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,35 @@ class Bezier3D : ParametricLine
88
/** Default constructor*/
99
Bezier3D();
1010
/** Constructor, par is a pointer to the parent, controlpoly a controlpolygon*/
11-
Bezier3D( ParametricLine* par, QVector<Point3D*>* controlpoly );
11+
Bezier3D( ParametricLine *par, QVector<Point3D*> *controlpoly );
1212
/** Destructor*/
1313
virtual ~Bezier3D();
1414
/** Do not use this method, since a Bezier curve does not consist of other curves*/
1515
virtual void add( ParametricLine *pl );
1616
/** Calculates the first derivative and assigns it to v*/
17-
virtual void calcFirstDer( float t, Vector3D* v );
17+
virtual void calcFirstDer( float t, Vector3D *v );
1818
/** Calculates the second derivative and assigns it to v*/
19-
virtual void calcSecDer( float t, Vector3D* v );
19+
virtual void calcSecDer( float t, Vector3D *v );
2020
//virtual Point3D calcPoint(float t);
2121
/** Calculates the point on the curve and assigns it to p*/
22-
virtual void calcPoint( float t, Point3D* p );
22+
virtual void calcPoint( float t, Point3D *p );
2323
/** Changes the order of control points*/
2424
virtual void changeDirection();
25-
//virtual void draw(QPainter* p);
26-
//virtual bool intersects(ParametricLine* pal);
25+
//virtual void draw(QPainter *p);
26+
//virtual bool intersects(ParametricLine *pal);
2727
/** Do not use this method, since a Bezier curve does not consist of other curves*/
2828
virtual void remove( int i );
2929
/** Returns a control point*/
30-
virtual const Point3D* getControlPoint( int number ) const;
30+
virtual const Point3D *getControlPoint( int number ) const;
3131
/** Returns a pointer to the control polygon*/
32-
virtual const QVector<Point3D*>* getControlPoly() const;
32+
virtual const QVector<Point3D*> *getControlPoly() const;
3333
/** Returns the degree of the curve*/
3434
virtual int getDegree() const;
3535
/** Returns the parent*/
36-
virtual ParametricLine* getParent() const;
36+
virtual ParametricLine *getParent() const;
3737
/** Sets the parent*/
38-
virtual void setParent( ParametricLine* par );
38+
virtual void setParent( ParametricLine *par );
3939
/** Sets the control polygon*/
40-
virtual void setControlPoly( QVector<Point3D*>* cp );
40+
virtual void setControlPoly( QVector<Point3D*> *cp );
4141

4242
};

‎python/analysis/interpolation/CloughTocherInterpolator.sip

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ class CloughTocherInterpolator : TriangleInterpolator
1313
/** Standard constructor*/
1414
CloughTocherInterpolator();
1515
/** Constructor with a pointer to the triangulation as argument*/
16-
CloughTocherInterpolator( NormVecDecorator* tin );
16+
CloughTocherInterpolator( NormVecDecorator *tin );
1717
/** Destructor*/
1818
virtual ~CloughTocherInterpolator();
1919
/** Calculates the normal vector and assigns it to vec (not implemented at the moment)*/
20-
virtual bool calcNormVec( double x, double y, Vector3D* result );
20+
virtual bool calcNormVec( double x, double y, Vector3D *result );
2121
/** Performs a linear interpolation in a triangle and assigns the x-,y- and z-coordinates to point*/
22-
virtual bool calcPoint( double x, double y, Point3D* result );
23-
virtual void setTriangulation( NormVecDecorator* tin );
22+
virtual bool calcPoint( double x, double y, Point3D *result );
23+
virtual void setTriangulation( NormVecDecorator *tin );
2424
};

2 commit comments

Comments
 (2)

3nids commented on May 1, 2017

@3nids
MemberAuthor

@m-kuhn seems the macos test is still failing on timeout
https://travis-ci.org/qgis/QGIS/jobs/227671702

m-kuhn commented on May 1, 2017

@m-kuhn
Member

That's expected. At least we got a message now (although it could be a bit nicer)

Please sign in to comment.