sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-08 00:05:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

PG raster temporal: cleanup after rebase conflicts

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/auto_generated/qgsdataprovider.sip.in
View File

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

2
python/core/auto_generated/qgsvectordataprovider.sip.in
View File

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

2
python/core/auto_generated/raster/qgsrasterdataprovider.sip.in
View File

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

2
src/core/qgsdataprovider.cpp
View File

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

2
src/core/qgsdataprovider.h
View File

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

2
src/core/qgsvectordataprovider.cpp
View File

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

2
src/core/raster/qgsrasterdataprovider.cpp
View File

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