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

remove get from QgsProviderRegistry::getProviderCapabilities() (followup 2e943c93)

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-10-14 13:30:22 +02:00
parent e0df5d4dd9
commit 2cef8d50f2
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/core/qgsproviderregistry.sip
View File

@ -43,7 +43,7 @@ class QgsProviderRegistry
@param providerKey identificator of the provider @param providerKey identificator of the provider
@note Added in 2.6 @note Added in 2.6
*/ */
int getProviderCapabilities( const QString& providerKey ) const; int providerCapabilities( const QString& providerKey ) const;
QWidget *selectWidget( const QString & providerKey, QWidget *selectWidget( const QString & providerKey,
QWidget * parent = 0, Qt::WindowFlags fl = 0 ); QWidget * parent = 0, Qt::WindowFlags fl = 0 );

2
src/app/qgshandlebadlayers.cpp
View File

@ -97,7 +97,7 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &layers, const QDo
QString datasource = node.namedItem( "datasource" ).toElement().text(); QString datasource = node.namedItem( "datasource" ).toElement().text();
QString provider = node.namedItem( "provider" ).toElement().text(); QString provider = node.namedItem( "provider" ).toElement().text();
QString vectorProvider = type == "vector" ? provider : tr( "none" ); 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'" ) QgsDebugMsg( QString( "name=%1 type=%2 provider=%3 datasource='%4'" )
.arg( name ) .arg( name )

13
src/core/qgsproviderregistry.cpp
View File

@ -371,18 +371,20 @@ QgsDataProvider *QgsProviderRegistry::provider( QString const & providerKey, QSt
return dataProvider; return dataProvider;
} // QgsProviderRegistry::setDataProvider } // QgsProviderRegistry::setDataProvider
int QgsProviderRegistry::getProviderCapabilities( const QString &providerKey ) const int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) const
{ {
QLibrary *library = providerLibrary( providerKey ); QLibrary *library = providerLibrary( providerKey );
if ( !library ) if ( !library )
{ {
return QgsDataProvider::NoDataCapabilities; return QgsDataProvider::NoDataCapabilities;
} }
dataCapabilities_t * dataCapabilities = ( dataCapabilities_t * ) cast_to_fptr( library->resolve( "dataCapabilities" ) ); dataCapabilities_t * dataCapabilities = ( dataCapabilities_t * ) cast_to_fptr( library->resolve( "dataCapabilities" ) );
if ( !dataCapabilities ) if ( !dataCapabilities )
{ {
return QgsDataProvider::NoDataCapabilities; return QgsDataProvider::NoDataCapabilities;
} }
return dataCapabilities(); return dataCapabilities();
} }
@ -489,12 +491,3 @@ const QgsProviderMetadata* QgsProviderRegistry::providerMetadata( const QString&
{ {
return findMetadata_( mProviders, providerKey ); return findMetadata_( mProviders, providerKey );
} }
#if 0
QgsDataProvider *
QgsProviderRegistry::openVector( QString const & dataSource, QString const & providerKey )
{
return getProvider( providerKey, dataSource );
} // QgsProviderRegistry::openVector
#endif

2
src/core/qgsproviderregistry.h
View File

@ -72,7 +72,7 @@ class CORE_EXPORT QgsProviderRegistry
@param providerKey identificator of the provider @param providerKey identificator of the provider
@note Added in 2.6 @note Added in 2.6
*/ */
int getProviderCapabilities( const QString& providerKey ) const; int providerCapabilities( const QString& providerKey ) const;
QWidget *selectWidget( const QString & providerKey, QWidget *selectWidget( const QString & providerKey,
QWidget * parent = 0, Qt::WindowFlags fl = 0 ); QWidget * parent = 0, Qt::WindowFlags fl = 0 );