From fd9569febebec4cc84f5300ed5d4a6de10c801be Mon Sep 17 00:00:00 2001 From: Alexander Bruy Date: Wed, 3 May 2017 09:11:43 +0300 Subject: [PATCH] fix qgsgraphanalyzer.h for sipification --- python/analysis/network/qgsgraphanalyzer.sip | 2 +- src/analysis/network/qgsgraphanalyzer.h | 2 +- src/core/qgis.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/python/analysis/network/qgsgraphanalyzer.sip b/python/analysis/network/qgsgraphanalyzer.sip index c256628b582..f71062897bf 100644 --- a/python/analysis/network/qgsgraphanalyzer.sip +++ b/python/analysis/network/qgsgraphanalyzer.sip @@ -22,7 +22,7 @@ class QgsGraphAnalyzer %End public: - static SIP_PYLIST void dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector *resultTree = 0, QVector *resultCost = 0 ); + static SIP_PYLIST dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector *resultTree = 0, QVector *resultCost = 0 ); %Docstring Solve shortest path problem using Dijkstra algorithm \param source source graph diff --git a/src/analysis/network/qgsgraphanalyzer.h b/src/analysis/network/qgsgraphanalyzer.h index c47225e1cc9..90a81df0385 100644 --- a/src/analysis/network/qgsgraphanalyzer.h +++ b/src/analysis/network/qgsgraphanalyzer.h @@ -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 *resultTree = nullptr, QVector *resultCost = nullptr ); + static void SIP_PYTYPE( SIP_PYLIST ) dijkstra( const QgsGraph *source, int startVertexIdx, int criterionNum, QVector *resultTree = nullptr, QVector *resultCost = nullptr ); #ifdef SIP_RUN % MethodCode diff --git a/src/core/qgis.h b/src/core/qgis.h index e08b253a368..1fa476c6d99 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -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