PG raster temporal: cleanup after rebase conflicts

This commit is contained in:
Alessandro Pasotti 2020-04-03 15:59:43 +02:00
parent 0cafc1ce83
commit 198b797586
7 changed files with 7 additions and 7 deletions

View File

@ -128,7 +128,7 @@ Gets the data source specification.
.. versionadded:: 3.0 .. versionadded:: 3.0
%End %End
virtual QgsDataProviderTemporalCapabilities *temporalCapabilities() const; virtual QgsDataProviderTemporalCapabilities *temporalCapabilities();
%Docstring %Docstring
Returns the provider's temporal capabilities. Returns the provider's temporal capabilities.

View File

@ -626,7 +626,7 @@ from the ``source`` provider.
.. versionadded:: 3.8.1 .. versionadded:: 3.8.1
%End %End
virtual QgsVectorDataProviderTemporalCapabilities *temporalCapabilities() const; virtual QgsVectorDataProviderTemporalCapabilities *temporalCapabilities();
signals: signals:

View File

@ -200,7 +200,7 @@ Returns the sublayers of this layer - useful for providers that manage
their own layers, such as WMS their own layers, such as WMS
%End %End
virtual QgsRasterDataProviderTemporalCapabilities *temporalCapabilities() const; virtual QgsRasterDataProviderTemporalCapabilities *temporalCapabilities();
virtual bool supportsLegendGraphic() const; virtual bool supportsLegendGraphic() const;

View File

@ -25,7 +25,7 @@ QgsDataProvider::QgsDataProvider( const QString &uri, const QgsDataProvider::Pro
{ {
} }
QgsDataProviderTemporalCapabilities *QgsDataProvider::temporalCapabilities() const QgsDataProviderTemporalCapabilities *QgsDataProvider::temporalCapabilities()
{ {
return nullptr; return nullptr;
} }

View File

@ -189,7 +189,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
* *
* \since QGIS 3.14 * \since QGIS 3.14
*/ */
virtual QgsDataProviderTemporalCapabilities *temporalCapabilities() const; virtual QgsDataProviderTemporalCapabilities *temporalCapabilities();
/** /**
* Returns the provider's temporal capabilities. * Returns the provider's temporal capabilities.

View File

@ -842,7 +842,7 @@ void QgsVectorDataProvider::handlePostCloneOperations( QgsVectorDataProvider * )
} }
QgsVectorDataProviderTemporalCapabilities *QgsVectorDataProvider::temporalCapabilities() const QgsVectorDataProviderTemporalCapabilities *QgsVectorDataProvider::temporalCapabilities()
{ {
return mTemporalCapabilities.get(); return mTemporalCapabilities.get();
} }

View File

@ -408,7 +408,7 @@ void QgsRasterDataProvider::setUserNoDataValue( int bandNo, const QgsRasterRange
} }
} }
QgsRasterDataProviderTemporalCapabilities *QgsRasterDataProvider::temporalCapabilities() const QgsRasterDataProviderTemporalCapabilities *QgsRasterDataProvider::temporalCapabilities()
{ {
return mTemporalCapabilities.get(); return mTemporalCapabilities.get();
} }