Travis fixes

qgis · Aug 14, 2018 · 767a7b0 · 767a7b0
1 parent 90e764d
commit 767a7b0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in
@@ -321,7 +321,7 @@ emits dataChanged when successful
 
     virtual QStringList extraDatasets() const = 0;
 %Docstring
-Get list of additional dataset file URIs added using addDataset() calls.
+Returns list of additional dataset file URIs added using addDataset() calls.
 %End
 
     virtual int datasetGroupCount( ) const = 0;

diff --git a/python/core/auto_generated/qgsmaplayerlegend.sip.in b/python/core/auto_generated/qgsmaplayerlegend.sip.in
@@ -210,6 +210,9 @@ Default legend implementation for mesh layers
 %End
   public:
     explicit QgsDefaultMeshLayerLegend( QgsMeshLayer *ml );
+%Docstring
+Creates an instance for the given mesh layer
+%End
 
     virtual QList<QgsLayerTreeModelLegendNode *> createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer ) /Factory/;
 

diff --git a/src/core/mesh/qgsmeshdataprovider.h b/src/core/mesh/qgsmeshdataprovider.h
@@ -297,7 +297,7 @@ class CORE_EXPORT QgsMeshDatasetSourceInterface SIP_ABSTRACT
     virtual bool addDataset( const QString &uri ) = 0;
 
     /**
-     * Get list of additional dataset file URIs added using addDataset() calls.
+     * Returns list of additional dataset file URIs added using addDataset() calls.
      */
     virtual QStringList extraDatasets() const = 0;
 

diff --git a/src/core/mesh/qgsmeshlayerutils.h b/src/core/mesh/qgsmeshlayerutils.h
@@ -18,6 +18,8 @@
 #ifndef QGSMESHLAYERUTILS_H
 #define QGSMESHLAYERUTILS_H
 
+#define SIP_NO_FILE
+
 #include "qgis_core.h"
 
 class QgsMeshDataProvider;

diff --git a/src/core/qgsmaplayerlegend.h b/src/core/qgsmaplayerlegend.h
@@ -208,6 +208,7 @@ class CORE_EXPORT QgsDefaultMeshLayerLegend : public QgsMapLayerLegend
     Q_OBJECT
 
   public:
+    //! Creates an instance for the given mesh layer
     explicit QgsDefaultMeshLayerLegend( QgsMeshLayer *ml );
 
     QList<QgsLayerTreeModelLegendNode *> createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer ) SIP_FACTORY override;