Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
prepare-commit.sh: remove trailing blanks from python files
  • Loading branch information
jef-n committed Jan 12, 2013
1 parent 0a707fb commit ac29c5b
Show file tree
Hide file tree
Showing 16 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion python/analysis/network/qgsarcproperter.sip
Expand Up @@ -29,7 +29,7 @@ class QgsArcProperter
* default constructor
*/
QgsArcProperter();

/**
* QgsGraphDirector call this method for fetching attribute from source layer
* \return required attributes list
Expand Down
2 changes: 1 addition & 1 deletion python/analysis/network/qgsdistancearcproperter.sip
Expand Up @@ -4,7 +4,7 @@ class QgsDistanceArcProperter : QgsArcProperter
%TypeHeaderCode
#include <qgsdistancearcproperter.h>
%End

public:
virtual QVariant property( double distance, const QgsFeature& ) const;
};
Expand Down
12 changes: 6 additions & 6 deletions python/analysis/network/qgsgraphanalyzer.sip
Expand Up @@ -3,7 +3,7 @@ class QgsGraphAnalyzer
%TypeHeaderCode
#include <qgsgraphanalyzer.h>
%End

public:
/**
* solve shortest path problem using dijkstra algorithm
Expand All @@ -17,8 +17,8 @@ class QgsGraphAnalyzer
%MethodCode
QVector< int > treeResult;
QVector< double > costResult;
QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );
QgsGraphAnalyzer::dijkstra( a0, a1, a2, &treeResult, &costResult );

PyObject *l1 = PyList_New( treeResult.size() );
if ( l1 == NULL )
{
Expand All @@ -31,13 +31,13 @@ class QgsGraphAnalyzer
}
int i;
for ( i = 0; i < costResult.size(); ++i )
{
{
PyObject *Int = PyInt_FromLong( treeResult[i] );
PyList_SET_ITEM( l1, i, Int );
PyObject *Float = PyFloat_FromDouble( costResult[i] );
PyList_SET_ITEM( l2, i, Float );
PyList_SET_ITEM( l2, i, Float );
}

sipRes = PyTuple_New( 2 );
PyTuple_SET_ITEM( sipRes, 0, l1 );
PyTuple_SET_ITEM( sipRes, 1, l2 );
Expand Down
8 changes: 4 additions & 4 deletions python/analysis/network/qgsgraphbuilderintr.sip
Expand Up @@ -24,20 +24,20 @@ class QgsGraphBuilderInterface
/**
* QgsGraphBuilderInterface constructor
* @param crs Coordinate reference system for new graph vertex
* @param ctfEnabled enable coordinate transform from source graph CRS to CRS graph
* @param ctfEnabled enable coordinate transform from source graph CRS to CRS graph
* @param topologyTolerance sqrt distance between source point as one graph vertex
* @param ellipsoidID ellipsoid for edge measurement
*/
QgsGraphBuilderInterface( const QgsCoordinateReferenceSystem& crs, bool ctfEnabled = true, double topologyTolerance = 0.0, const QString& ellipsoidID = "WGS84" );

QgsCoordinateReferenceSystem& destinationCrs();

//! get coordinate transformation enabled
bool coordinateTransformationEnabled();

//! get topology tolerance
double topologyTolerance();

//! get measurement tool
QgsDistanceArea* distanceArea();

Expand All @@ -59,5 +59,5 @@ class QgsGraphBuilderInterface
* @note pt1id, pt1 and pt2id, pt2 is a redundant interface. You can use vertex coordinates or their identificators.
*/
virtual void addArc( int pt1id, const QgsPoint& pt1, int pt2id, const QgsPoint& pt2, const QVector< QVariant >& properties );

};
6 changes: 3 additions & 3 deletions python/analysis/network/qgsgraphdirector.sip
Expand Up @@ -20,7 +20,7 @@ class QgsGraphDirector : QObject
sipClass = NULL;
%End


signals:
void buildProgress( int, int ) const;
void buildMessage( QString ) const;
Expand All @@ -43,9 +43,9 @@ class QgsGraphDirector : QObject
virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint> &tiedPoints /Out/ );

void addProperter( QgsArcProperter* prop /Transfer/ ) ;

/**
* return Director name
*/
Expand Down
8 changes: 4 additions & 4 deletions python/core/qgspoint.sip
@@ -1,6 +1,6 @@


class QgsPoint
class QgsPoint
{

%TypeHeaderCode
Expand All @@ -11,7 +11,7 @@ class QgsPoint
public:
/// Default constructor
QgsPoint();

/*! Create a point from another point */
QgsPoint( const QgsPoint& p );

Expand All @@ -32,7 +32,7 @@ class QgsPoint
* @param y y coordinate
*/
void setY( double y );

/*! Sets the x and y value of the point */
void set( double x, double y );

Expand Down Expand Up @@ -116,7 +116,7 @@ class QgsPoint


SIP_PYOBJECT __getitem__(int);
%MethodCode
%MethodCode
if (a0 == 0) {
sipRes = Py_BuildValue("d",sipCpp->x());
} else if (a0 == 1) {
Expand Down
2 changes: 1 addition & 1 deletion python/core/raster/qgsrasterblock.sip
Expand Up @@ -65,7 +65,7 @@ class QgsRasterBlock
bool convert( QGis::DataType destDataType );
QImage image() const;
bool setImage( const QImage * image );

static bool valueInRange( double value, const QList<QgsRasterBlock::Range> &rangeList );

};
Expand Down
12 changes: 6 additions & 6 deletions python/core/raster/qgsrasterinterface.sip
Expand Up @@ -68,10 +68,10 @@ class QgsRasterInterface

/** Returns a bitmask containing the supported capabilities */
virtual int capabilities() const;

/**
* Returns the above in friendly format.
*/
*/
QString capabilitiesString() const;

/** Returns data type for the band specified by number */
Expand Down Expand Up @@ -163,14 +163,14 @@ class QgsRasterInterface
const QgsRectangle & theExtent,
int theSampleSize,
bool theIncludeOutOfRange );
/** \brief Returns true if histogram is available (cached, already calculated), the parameters are the same as in histogram()

/** \brief Returns true if histogram is available (cached, already calculated), the parameters are the same as in histogram()
* @note theBinCount, theMinimun and theMaximum not optional in python bindings
*/
virtual bool hasHistogram( int theBandNo,
int theBinCount,
double theMinimum,
double theMaximum,
double theMinimum,
double theMaximum,
const QgsRectangle & theExtent,
int theSampleSize,
bool theIncludeOutOfRange );
Expand Down
2 changes: 1 addition & 1 deletion python/core/symbology-ng/qgsvectorcolorrampv2.sip
Expand Up @@ -17,7 +17,7 @@ class QgsVectorColorRampV2
virtual ~QgsVectorColorRampV2();

virtual int count() const = 0;

virtual double value( int index ) const = 0;

virtual QColor color( double value ) const = 0;
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsannotationitem.sip
Expand Up @@ -5,7 +5,7 @@ class QgsAnnotationItem: QgsMapCanvasItem
%TypeHeaderCode
#include <qgsannotationitem.h>
%End

public:
enum MouseMoveAction
{
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsmapcanvasitem.sip
Expand Up @@ -4,7 +4,7 @@ class QgsMapCanvasItem : QGraphicsItem
%TypeHeaderCode
#include <qgsmapcanvasitem.h>
%End

protected:

//! protected constructor: cannot be constructed directly
Expand Down
4 changes: 2 additions & 2 deletions python/gui/qgsmaptool.sip
Expand Up @@ -28,7 +28,7 @@ class QgsMapTool : QObject
%End

public:

//! virtual destructor
virtual ~QgsMapTool();

Expand Down Expand Up @@ -118,5 +118,5 @@ class QgsMapTool : QObject
//! transformation from map coordinates to screen coordinates
QPoint toCanvasCoordinates( const QgsPoint& point );


};
2 changes: 1 addition & 1 deletion python/gui/qgsmaptoolemitpoint.sip
Expand Up @@ -4,7 +4,7 @@ class QgsMapToolEmitPoint : QgsMapTool
%TypeHeaderCode
#include <qgsmaptoolemitpoint.h>
%End

public:
//! constructor
QgsMapToolEmitPoint( QgsMapCanvas* canvas );
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsquickprint.sip
@@ -1,4 +1,4 @@
/** QgsQuickPrint is a convenience class to quickly print a
/** QgsQuickPrint is a convenience class to quickly print a
preformatted map to pdf.
*/
class QgsQuickPrint : QObject
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsrasterformatsaveoptionswidget.sip
Expand Up @@ -4,7 +4,7 @@ class QgsRasterFormatSaveOptionsWidget : QWidget
%TypeHeaderCode
#include <qgsrasterformatsaveoptionswidget.h>
%End

public:

enum Type
Expand Down
2 changes: 1 addition & 1 deletion python/gui/qgsvertexmarker.sip
Expand Up @@ -6,7 +6,7 @@ class QgsVertexMarker : QgsMapCanvasItem
%End

public:

//! Icons
enum IconType
{
Expand Down

0 comments on commit ac29c5b

Please sign in to comment.