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

jef-n · jef-n · commit 2cef8d50f2cf · 2014-10-14T13:30:33.000+02:00
diff --git 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
@@ -97,7 +97,7 @@ QgsHandleBadLayers::QgsHandleBadLayers( const QList<QDomNode> &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
@@ -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
@@ -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 );

Original file line number	Diff line number	Diff line change
`@@ -371,18 +371,20 @@ QgsDataProvider *QgsProviderRegistry::provider( QString const & providerKey, QSt`
`371`	`371`	`return dataProvider;`
`372`	`372`	`} // QgsProviderRegistry::setDataProvider`
`373`	`373`
`374`		`-int QgsProviderRegistry::getProviderCapabilities( const QString &providerKey ) const`
	`374`	`+int QgsProviderRegistry::providerCapabilities( const QString &providerKey ) const`
`375`	`375`	`{`
`376`	`376`	`QLibrary *library = providerLibrary( providerKey );`
`377`	`377`	`if ( !library )`
`378`	`378`	`{`
`379`	`379`	`return QgsDataProvider::NoDataCapabilities;`
`380`	`380`	`}`
	`381`	`+`
`381`	`382`	`dataCapabilities_t * dataCapabilities = ( dataCapabilities_t * ) cast_to_fptr( library->resolve( "dataCapabilities" ) );`
`382`	`383`	`if ( !dataCapabilities )`
`383`	`384`	`{`
`384`	`385`	`return QgsDataProvider::NoDataCapabilities;`
`385`	`386`	`}`
	`387`	`+`
`386`	`388`	`return dataCapabilities();`
`387`	`389`	`}`
`388`	`390`
`@@ -489,12 +491,3 @@ const QgsProviderMetadata* QgsProviderRegistry::providerMetadata( const QString&`
`489`	`491`	`{`
`490`	`492`	`return findMetadata_( mProviders, providerKey );`
`491`	`493`	`}`
`492`		`-`
`493`		`-`
`494`		`-#if 0`
`495`		`-QgsDataProvider *`
`496`		`-QgsProviderRegistry::openVector( QString const & dataSource, QString const & providerKey )`
`497`		`-{`
`498`		`- return getProvider( providerKey, dataSource );`
`499`		`-} // QgsProviderRegistry::openVector`
`500`		`-#endif`