fix qgsgraphanalyzer.h for sipification

qgis · May 4, 2017 · fd9569f · fd9569f
1 parent 31cd113
commit fd9569f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git 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<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

diff --git 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<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

diff --git 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