Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
PG raster temporal: cleanup after rebase conflicts
  • Loading branch information
elpaso committed Apr 6, 2020
1 parent 0cafc1c commit 198b797
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsdataprovider.sip.in
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsvectordataprovider.sip.in
Expand Up @@ -626,7 +626,7 @@ from the ``source`` provider.
.. versionadded:: 3.8.1
%End

virtual QgsVectorDataProviderTemporalCapabilities *temporalCapabilities() const;
virtual QgsVectorDataProviderTemporalCapabilities *temporalCapabilities();


signals:
Expand Down
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataprovider.cpp
Expand Up @@ -25,7 +25,7 @@ QgsDataProvider::QgsDataProvider( const QString &uri, const QgsDataProvider::Pro
{
}

QgsDataProviderTemporalCapabilities *QgsDataProvider::temporalCapabilities() const
QgsDataProviderTemporalCapabilities *QgsDataProvider::temporalCapabilities()
{
return nullptr;
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataprovider.h
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectordataprovider.cpp
Expand Up @@ -842,7 +842,7 @@ void QgsVectorDataProvider::handlePostCloneOperations( QgsVectorDataProvider * )

}

QgsVectorDataProviderTemporalCapabilities *QgsVectorDataProvider::temporalCapabilities() const
QgsVectorDataProviderTemporalCapabilities *QgsVectorDataProvider::temporalCapabilities()
{
return mTemporalCapabilities.get();
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/raster/qgsrasterdataprovider.cpp
Expand Up @@ -408,7 +408,7 @@ void QgsRasterDataProvider::setUserNoDataValue( int bandNo, const QgsRasterRange
}
}

QgsRasterDataProviderTemporalCapabilities *QgsRasterDataProvider::temporalCapabilities() const
QgsRasterDataProviderTemporalCapabilities *QgsRasterDataProvider::temporalCapabilities()
{
return mTemporalCapabilities.get();
}
Expand Down

0 comments on commit 198b797

Please sign in to comment.