From 767a7b0f5c83b44537fdc7fb0bc6f4cb013a6cab Mon Sep 17 00:00:00 2001 From: Martin Dobias Date: Tue, 14 Aug 2018 19:53:27 +0200 Subject: [PATCH] Travis fixes --- python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in | 2 +- python/core/auto_generated/qgsmaplayerlegend.sip.in | 3 +++ src/core/mesh/qgsmeshdataprovider.h | 2 +- src/core/mesh/qgsmeshlayerutils.h | 2 ++ src/core/qgsmaplayerlegend.h | 1 + 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in index 05c071acc2a..bf741925740 100644 --- 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 index 49733fbb83f..b5f7e3aa20c 100644 --- 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 createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer ) /Factory/; diff --git a/src/core/mesh/qgsmeshdataprovider.h b/src/core/mesh/qgsmeshdataprovider.h index ea191cd7ccc..1a362a44ab9 100644 --- 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 index 00e1844bc02..724f616a23b 100644 --- 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 index ff7ad48c83a..217e6fd12be 100644 --- 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 createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer ) SIP_FACTORY override;