From 2cef8d50f2cf1cb53b33b75bc57d137b331bbf20 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 14 Oct 2014 13:30:22 +0200 Subject: [PATCH] remove get from QgsProviderRegistry::getProviderCapabilities() (followup 2e943c93) --- python/core/qgsproviderregistry.sip | 2 +- src/app/qgshandlebadlayers.cpp | 2 +- src/core/qgsproviderregistry.cpp | 13 +++---------- src/core/qgsproviderregistry.h | 2 +- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/python/core/qgsproviderregistry.sip b/python/core/qgsproviderregistry.sip index 595c89ff0fa..30b21eafdba 100644 --- a/python/core/qgsproviderregistry.sip +++ b/python/core/qgsproviderregistry.sip @@ -43,7 +43,7 @@ class QgsProviderRegistry @param providerKey identificator of the provider @note Added in 2.6 */ - int getProviderCapabilities( const QString& providerKey ) const; + int providerCapabilities( const QString& providerKey ) const; QWidget *selectWidget( const QString & providerKey, QWidget * parent = 0, Qt::WindowFlags fl = 0 ); diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp index acf5427201d..7d4f54971e2 100644 --- a/src/app/qgshandlebadlayers.cpp +++ b/src/app/qgshandlebadlayers.cpp @@ -97,7 +97,7 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList &layers, const QDo QString datasource = node.namedItem( "datasource" ).toElement().text(); QString provider = node.namedItem( "provider" ).toElement().text(); QString vectorProvider = type == "vector" ? provider : tr( "none" ); - bool providerFileBased = ( QgsProviderRegistry::instance()->getProviderCapabilities( provider ) & QgsDataProvider::File ) != 0; + bool providerFileBased = ( QgsProviderRegistry::instance()->providerCapabilities( provider ) & QgsDataProvider::File ) != 0; QgsDebugMsg( QString( "name=%1 type=%2 provider=%3 datasource='%4'" ) .arg( name ) diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp index fbdc617aa31..b07fe139210 100644 --- a/src/core/qgsproviderregistry.cpp +++ b/src/core/qgsproviderregistry.cpp @@ -371,18 +371,20 @@ QgsDataProvider *QgsProviderRegistry::provider( QString const & providerKey, QSt return dataProvider; } // QgsProviderRegistry::setDataProvider -int QgsProviderRegistry::getProviderCapabilities( const QString &providerKey ) const +int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) const { QLibrary *library = providerLibrary( providerKey ); if ( !library ) { return QgsDataProvider::NoDataCapabilities; } + dataCapabilities_t * dataCapabilities = ( dataCapabilities_t * ) cast_to_fptr( library->resolve( "dataCapabilities" ) ); if ( !dataCapabilities ) { return QgsDataProvider::NoDataCapabilities; } + return dataCapabilities(); } @@ -489,12 +491,3 @@ const QgsProviderMetadata* QgsProviderRegistry::providerMetadata( const QString& { return findMetadata_( mProviders, providerKey ); } - - -#if 0 -QgsDataProvider * -QgsProviderRegistry::openVector( QString const & dataSource, QString const & providerKey ) -{ - return getProvider( providerKey, dataSource ); -} // QgsProviderRegistry::openVector -#endif diff --git a/src/core/qgsproviderregistry.h b/src/core/qgsproviderregistry.h index e69d97a0b0d..6933507376a 100644 --- a/src/core/qgsproviderregistry.h +++ b/src/core/qgsproviderregistry.h @@ -72,7 +72,7 @@ class CORE_EXPORT QgsProviderRegistry @param providerKey identificator of the provider @note Added in 2.6 */ - int getProviderCapabilities( const QString& providerKey ) const; + int providerCapabilities( const QString& providerKey ) const; QWidget *selectWidget( const QString & providerKey, QWidget * parent = 0, Qt::WindowFlags fl = 0 );