Skip to content

Commit

Permalink
fix qgsgraphanalyzer.h for sipification
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy authored and 3nids committed May 4, 2017
1 parent 31cd113 commit fd9569f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion python/analysis/network/qgsgraphanalyzer.sip
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class QgsGraphAnalyzer
%End
public:

static SIP_PYLIST void dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = 0, QVector<double> *resultCost = 0 );
static SIP_PYLIST dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = 0, QVector<double> *resultCost = 0 );
%Docstring
Solve shortest path problem using Dijkstra algorithm
\param source source graph
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsgraphanalyzer.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class ANALYSIS_EXPORT QgsGraphAnalyzer
* \param resultTree array that represents shortest path tree. resultTree[ vertexIndex ] == inboundingArcIndex if vertex reachable, otherwise resultTree[ vertexIndex ] == -1
* \param resultCost array of the paths costs
*/
static SIP_PYLIST void dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = nullptr, QVector<double> *resultCost = nullptr );
static void SIP_PYTYPE( SIP_PYLIST ) dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector<int> *resultTree = nullptr, QVector<double> *resultCost = nullptr );

#ifdef SIP_RUN
% MethodCode
Expand Down
6 changes: 0 additions & 6 deletions src/core/qgis.h
Original file line number Diff line number Diff line change
Expand Up @@ -506,9 +506,3 @@ typedef unsigned long long qgssize;
* Class level annotation for abstract classes
*/
#define SIP_ABSTRACT

/*
* This is a PyObject * that is a Python list object
* http://pyqt.sourceforge.net/Docs/sip4/specification_files.html#additional-sip-types
*/
#define SIP_PYLIST

0 comments on commit fd9569f

Please sign in to comment.