Fix build

nyalldawson · nyalldawson · commit 7c6eaf3d46b8 · 2018-05-25T11:40:57.000+10:00
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
@@ -362,7 +362,7 @@ QDir QgsProviderRegistry::libraryDirectory() const
 
 
 // typedef for the QgsDataProvider class factory
-typedef QgsDataProvider *classFactoryFunction_t( const QString * );
+typedef QgsDataProvider *classFactoryFunction_t( const QString *, const QgsDataProvider::ProviderOptions &options );
 
 
 /* Copied from QgsVectorLayer::setDataProvider
@@ -426,7 +426,7 @@ QgsDataProvider *QgsProviderRegistry::createProvider( QString const &providerKey
     return nullptr;
   }
 
-  QgsDataProvider *dataProvider = classFactory( &dataSource );
+  QgsDataProvider *dataProvider = classFactory( &dataSource, options );
   if ( !dataProvider )
   {
     QgsMessageLog::logMessage( QObject::tr( "Unable to instantiate the data provider plugin %1" ).arg( lib ) );
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -212,7 +212,7 @@ void QgsRasterLayer::setDataProvider( const QString &provider )
 }
 
 // typedef for the QgsDataProvider class factory
-typedef QgsDataProvider *classFactoryFunction_t( const QString * );
+typedef QgsDataProvider *classFactoryFunction_t( const QString *, const QgsDataProvider::ProviderOptions &options );
 
 //////////////////////////////////////////////////////////
 //

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ QDir QgsProviderRegistry::libraryDirectory() const`
`362`	`362`
`363`	`363`
`364`	`364`	`// typedef for the QgsDataProvider class factory`
`365`		`-typedef QgsDataProvider classFactoryFunction_t( const QString );`
	`365`	`+typedef QgsDataProvider classFactoryFunction_t( const QString , const QgsDataProvider::ProviderOptions &options );`
`366`	`366`
`367`	`367`
`368`	`368`	`/* Copied from QgsVectorLayer::setDataProvider`
`@@ -426,7 +426,7 @@ QgsDataProvider *QgsProviderRegistry::createProvider( QString const &providerKey`
`426`	`426`	`return nullptr;`
`427`	`427`	`}`
`428`	`428`
`429`		`- QgsDataProvider *dataProvider = classFactory( &dataSource );`
	`429`	`+ QgsDataProvider *dataProvider = classFactory( &dataSource, options );`
`430`	`430`	`if ( !dataProvider )`
`431`	`431`	`{`
`432`	`432`	`QgsMessageLog::logMessage( QObject::tr( "Unable to instantiate the data provider plugin %1" ).arg( lib ) );`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ void QgsRasterLayer::setDataProvider( const QString &provider )`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`// typedef for the QgsDataProvider class factory`
`215`		`-typedef QgsDataProvider classFactoryFunction_t( const QString );`
	`215`	`+typedef QgsDataProvider classFactoryFunction_t( const QString , const QgsDataProvider::ProviderOptions &options );`
`216`	`216`
`217`	`217`	`//////////////////////////////////////////////////////////`
`218`	`218`	`//`