Skip to content

Commit

Permalink
Fix SIP (sipify does not like inline initializers)
Browse files Browse the repository at this point in the history
  • Loading branch information
elpaso authored and nyalldawson committed Apr 17, 2019
1 parent dcf2062 commit 3d5e67e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 1 addition & 3 deletions python/core/auto_generated/qgsdataprovider.sip.in
Expand Up @@ -61,14 +61,12 @@ Abstract base class for spatial data provider implementations.
QgsCoordinateTransformContext coordinateTransformContext;
};

QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() ):
QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() );
%Docstring
Create a new dataprovider with the specified in the ``uri``.

Additional creation options are specified within the ``options`` value.
%End
mDataSourceURI( uri ),
mOptions( options );

virtual QgsCoordinateReferenceSystem crs() const = 0;
%Docstring
Expand Down
6 changes: 6 additions & 0 deletions src/core/qgsdataprovider.cpp
Expand Up @@ -17,6 +17,12 @@

QString QgsDataProvider::SUBLAYER_SEPARATOR = QString( "!!::!!" );

QgsDataProvider::QgsDataProvider( const QString &uri, const QgsDataProvider::ProviderOptions &options )
: mDataSourceURI( uri ),
mOptions( options )
{
}

void QgsDataProvider::setProviderProperty( QgsDataProvider::ProviderProperty property, const QVariant &value )
{
mProviderProperties.insert( property, value );
Expand Down
6 changes: 1 addition & 5 deletions src/core/qgsdataprovider.h
Expand Up @@ -106,11 +106,7 @@ class CORE_EXPORT QgsDataProvider : public QObject
*
* Additional creation options are specified within the \a options value.
*/
QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() ):
mDataSourceURI( uri ),
mOptions( options )
{
}
QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() );

/**
* Returns the coordinate system for the data source.
Expand Down

0 comments on commit 3d5e67e

Please sign in to comment.