Fix Sip coverage test on Debian nightlies

qgis · Jan 8, 2016 · 44bf78f · 44bf78f
1 parent 06743ef
commit 44bf78f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/python/core/qgsdataitem.sip b/python/core/qgsdataitem.sip
@@ -317,6 +317,14 @@ class QgsDirectoryItem : QgsDataCollectionItem
     };
 
     QgsDirectoryItem( QgsDataItem* parent, const QString& name, const QString& path );
+
+    /** Constructor.
+     * @param parent
+     * @param name directory name
+     * @param dirPath path to directory in file system
+     * @param path item path in the tree, it may be dirPath or dirPath with some prefix, e.g. favourites: */
+    QgsDirectoryItem( QgsDataItem* parent, const QString& name, const QString& dirPath, const QString& path );
+
     ~QgsDirectoryItem();
 
     virtual void setState( State state );

diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp
@@ -38,6 +38,9 @@
 
 #include "qgsauthmanager.h"
 
+//not part of public API
+///@cond
+//! @note not available in Python bindings
 class QgsNetworkProxyFactory : public QNetworkProxyFactory
 {
   public:
@@ -92,6 +95,8 @@ class QgsNetworkProxyFactory : public QNetworkProxyFactory
     }
 };
 
+///@endcond
+
 //
 // Static calls to enforce singleton behaviour
 //

diff --git a/src/core/qgspluginlayer.cpp b/src/core/qgspluginlayer.cpp
@@ -42,6 +42,7 @@ QgsLegendSymbologyList QgsPluginLayer::legendSymbologyItems( const QSize& iconSi
 /** Fallback layer renderer implementation for layer that do not support map renderer yet.
  *
  * @note added in 2.4
+ * @note not available in Python bindings
  */
 class QgsPluginLayerRenderer : public QgsMapLayerRenderer
 {

diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -56,7 +56,9 @@ static const double POINT_LOC_EPSILON = 1e-12;
 ////////////////////////////////////////////////////////////////////////////
 
 
-/** Helper class for bulk loading of R-trees. */
+/** Helper class for bulk loading of R-trees.
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_Stream : public IDataStream
 {
   public:
@@ -78,7 +80,9 @@ class QgsPointLocator_Stream : public IDataStream
 ////////////////////////////////////////////////////////////////////////////
 
 
-/** Helper class used when traversing the index looking for vertices - builds a list of matches. */
+/** Helper class used when traversing the index looking for vertices - builds a list of matches.
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_VisitorNearestVertex : public IVisitor
 {
   public:
@@ -116,7 +120,9 @@ class QgsPointLocator_VisitorNearestVertex : public IVisitor
 ////////////////////////////////////////////////////////////////////////////
 
 
-/** Helper class used when traversing the index looking for edges - builds a list of matches. */
+/** Helper class used when traversing the index looking for edges - builds a list of matches.
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_VisitorNearestEdge : public IVisitor
 {
   public:
@@ -159,7 +165,9 @@ class QgsPointLocator_VisitorNearestEdge : public IVisitor
 ////////////////////////////////////////////////////////////////////////////
 
 
-/** Helper class used when traversing the index with areas - builds a list of matches. */
+/** Helper class used when traversing the index with areas - builds a list of matches.
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_VisitorArea : public IVisitor
 {
   public:
@@ -487,7 +495,9 @@ static QgsPointLocator::MatchList _geometrySegmentsInRect( QgsGeometry* geom, co
   return lst;
 }
 
-/** Helper class used when traversing the index looking for edges - builds a list of matches. */
+/** Helper class used when traversing the index looking for edges - builds a list of matches.
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_VisitorEdgesInRect : public IVisitor
 {
   public:
@@ -524,7 +534,9 @@ class QgsPointLocator_VisitorEdgesInRect : public IVisitor
 ////////////////////////////////////////////////////////////////////////////
 #include <QStack>
 
-/** Helper class to dump the R-index nodes and their content */
+/** Helper class to dump the R-index nodes and their content
+ * @note not available in Python bindings
+*/
 class QgsPointLocator_DumpTree : public SpatialIndex::IQueryStrategy
 {
   private: